diff --git a/.prettierrc b/.prettierrc index 5ca9a13..c5f454b 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,6 +1,6 @@ { "tabWidth": 4, "singleQuote": true, - "trailingComma": "es5", + "trailingComma": "none", "printWidth": 140 } \ No newline at end of file diff --git a/package.json b/package.json index 895b961..50fe0fc 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "dependencies": { "axios": "^0.18.0", "babel-polyfill": "^6.26.0", - "element-ui": "^2.9.2", + "element-ui": "^2.11.0", "mavon-editor": "^2.6.17", "vue": "^2.6.10", "vue-cropperjs": "^3.0.0", @@ -25,4 +25,4 @@ "@vue/cli-service": "^3.2.0", "vue-template-compiler": "^2.5.21" } -} +} \ No newline at end of file diff --git a/src/components/page/BaseForm.vue b/src/components/page/BaseForm.vue index 4a726d1..9beb0dd 100644 --- a/src/components/page/BaseForm.vue +++ b/src/components/page/BaseForm.vue @@ -2,7 +2,9 @@
- 表单 + + 表单 + 基本表单
@@ -21,11 +23,21 @@ - + - - + @@ -58,84 +70,83 @@
- \ No newline at end of file diff --git a/src/components/page/BaseTable.vue b/src/components/page/BaseTable.vue index 9aa442f..6046fc9 100644 --- a/src/components/page/BaseTable.vue +++ b/src/components/page/BaseTable.vue @@ -2,12 +2,19 @@
- 基础表格 + + 基础表格 +
- 批量删除 + 批量删除 @@ -15,24 +22,40 @@ 搜索
- + - - - - - - + + +
@@ -40,7 +63,13 @@ - + @@ -48,7 +77,6 @@ - 取 消 @@ -68,165 +96,164 @@