diff --git a/package.json b/package.json index 8bc4bd7..307bcaf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-pro-crud", - "version": "0.8.0-2", + "version": "0.8.0-5", "main": "lib/ProCrud.umd.min.js", "files": [ "lib", diff --git a/public/favicon.ico b/public/favicon.ico index df36fcf..79fe130 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/component/crud-table/src/CrudTable.vue b/src/component/crud-table/src/CrudTable.vue index 02f3274..75574d3 100644 --- a/src/component/crud-table/src/CrudTable.vue +++ b/src/component/crud-table/src/CrudTable.vue @@ -15,11 +15,11 @@

{{tableTitle}}

-
+
diff --git a/src/component/form-designer/src/FormDesigner.vue b/src/component/form-designer/src/FormDesigner.vue index 15521fd..8c8c6c9 100644 --- a/src/component/form-designer/src/FormDesigner.vue +++ b/src/component/form-designer/src/FormDesigner.vue @@ -60,14 +60,14 @@ - - - + + + - + @@ -78,7 +78,7 @@ 生成JSON 生成代码 清空 - 自动绑定 + 自动绑定 @@ -290,14 +290,14 @@ export default { methods: { // 返回当前表单设计器对象 getData() { - return { - ...this.formValues, - formJson: JSON.stringify(this.widgetForm), - }; + this.widgetForm.name = this.formValues.tableName; + this.widgetForm.position = this.formValues.position; + return this.widgetForm; }, setJSON(json) { this.widgetForm = json; - + this.$set(this.formValues, 'tableName', json.name); + this.$set(this.formValues, 'position', json.position); if (json.list.length > 0) { [this.widgetFormSelect] = json.list; } diff --git a/src/component/table-designer/src/MenuBar.vue b/src/component/table-designer/src/MenuBar.vue index a0fd49c..b715493 100644 --- a/src/component/table-designer/src/MenuBar.vue +++ b/src/component/table-designer/src/MenuBar.vue @@ -61,8 +61,6 @@ export default { return { // 选中的表名 selectedForm: null, - // 所有动态表单json - formList: [], }; }, props: { @@ -77,11 +75,11 @@ export default { type: Number, default: 140, }, - }, - created() { - this.$PROCRUD.crud(DML.SELECT, 'form').then((res) => { - this.formList = res.data.list; - }); + // formList + formList: { + type: Array, + default: () => [], + }, }, methods: { autoSetSearchOption() { diff --git a/src/component/table-designer/src/TableDesigner.vue b/src/component/table-designer/src/TableDesigner.vue index 7880261..5465868 100644 --- a/src/component/table-designer/src/TableDesigner.vue +++ b/src/component/table-designer/src/TableDesigner.vue @@ -11,127 +11,80 @@ @createDate 2020年03月02日12:12:17 -->