fix: 修复已知bug,版本升级至0.6.0

BoBoooooo · Dec 20, 2020 · 9a8be90 · 9a8be90
1 parent 8570702
commit 9a8be90
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-pro-crud",
-  "version": "0.5.5",
+  "version": "0.6.0",
   "main": "lib/ProCrud.umd.min.js",
   "files": [
     "lib",

diff --git a/packages/form-designer/src/FormDesignerDialog.vue b/packages/form-designer/src/FormDesignerDialog.vue
@@ -242,22 +242,21 @@
             :value="item.TABLE_NAME"
           ></el-option>
         </el-select>
-        <el-tooltip title="根据数据库字段初始化,默认一行两列">
           <el-button
             type="success"
             size="small"
             style="float: right;margin-top: 10px"
             @click="handleGenerateKey(true)"
             >自动生成表单</el-button
           >
-        </el-tooltip>
       </cus-dialog>
     </el-container>
   </el-dialog>
 </template>
 
 <script>
 import SvgIcon from '@/icons/SvgIcon.vue';
+import { DML } from '@/types/common';
 import Draggable from 'vuedraggable';
 import Icon from 'vue-awesome/components/Icon.vue';
 import WidgetConfig from './WidgetConfig.vue';
@@ -584,10 +583,10 @@ export default {
           let msg;
           // 根据对话框状态判断保存或编辑
           if (this.dialogStatus === STATUS.CREATE) {
-            type = this.$PROCRUD.crud.DML.INSERT;
+            type = DML.INSERT;
             msg = '添加成功';
           } else {
-            type = this.$PROCRUD.crud.DML.UPDATE;
+            type = DML.UPDATE;
             msg = '编辑成功';
           }
           let promise;
@@ -601,7 +600,6 @@ export default {
           } else {
             promise = this.$PROCRUD.crud(type, 'form', opt);
           }
-
           promise
             .then(() => {
               this.btnSaveIsLoading = false;
@@ -619,7 +617,8 @@ export default {
               this.btnSaveIsLoading = false;
             });
         })
-        .catch(() => {
+        .catch((err) => {
+          console.log(err);
           // 数据校验失败
           this.btnSaveIsLoading = false;
         });

diff --git a/packages/table-designer/src/TableDesignerDialog.vue b/packages/table-designer/src/TableDesignerDialog.vue
@@ -156,11 +156,6 @@ export default {
       // 默认必须为null用于后期判断是否传入
       default: null,
     },
-    // 远程数据方法
-    remoteFuncs: {
-      type: Object,
-      default: () => ({}),
-    },
   },
   data() {
     return {
@@ -182,6 +177,18 @@ export default {
       minColumnWidth: 140,
       // 获取表单实体
       entity: {},
+      remoteFuncs: {
+        getTablesOfDB: (resolve) => {
+          // 请求表名列表
+          this.$PROCRUD.getTables().then((res) => {
+            const options = res.data.map(item => ({
+              label: item.TABLE_NAME,
+              value: item.TABLE_NAME,
+            }));
+            resolve(options);
+          });
+        },
+      },
     };
   },
   methods: {