agilebuilder-ui 1.0.90-tmp3 → 1.0.90-tmp5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.90-tmp3",
+  "version": "1.0.90-tmp5",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/super-grid/src/apis.js

@@ -1453,7 +1453,8 @@ const apis = {
         }
       ]
      */
-  dynamicControlTableEdit(pageContext, customRules){
+  dynamicControlTableEdit(pageContext, customRules, listCode){
+    const gridParams = store.get(listCode)
     console.log('dynamicControlTableEdit----customRules-----', customRules)
     if(!customRules){
       return
@@ -1483,6 +1484,7 @@ const apis = {
       // 当前列总的自定义规则更新
       copyItem.rules = columnRules
       this.options.customRules[prop] = copyItem
+      gridParams.options.customRules[prop] = this.options.customRules[prop]
     })
     console.log('dynamicControlTableEdit----this.options-----', this.options)
   }

package/packages/super-grid/src/dynamic-input.vue

@@ -743,7 +743,7 @@ export default {
     if(!this.gridOptions.customRules){
       this.gridOptions.customRules = {}
     }
-    this.watch('gridOptions.customRules.'+this.column.prop,
+    this.$watch('gridOptions.customRules.'+this.column.prop,
 				(newVal, oldVal)=> {
 					this.packageCustomRules()
 				},
@@ -751,7 +751,7 @@ export default {
 					immediate: true,
 					deep: true,
 				})
-    this.watch('gridOptions.customRules._all_fields',
+    this.$watch('gridOptions.customRules._all_fields',
 				(newVal, oldVal)=> {
 					this.packageCustomRules()
 				},

package/packages/super-grid/src/normal-column-content.vue

@@ -457,16 +457,12 @@ export default {
     isShowForm: {
       type: Boolean,
       default: false
-    },
-    // 列表配置信息
-    options: {
-      type: Object,
-      default: null
     }
   },
   data() {
     let parentFormData
     const gridParams = store.get(this.listCode)
+    const options = gridParams.options
     if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
       parentFormData = gridParams.options.extraParam.entityMap
     }
@@ -515,7 +511,8 @@ export default {
       controlConfig,
       rowLinkConfigMapping: {},
       requiredClass: '',
-      lineEdit
+      lineEdit,
+      options
     }
   },
   computed: {

package/packages/super-grid/src/normal-column.vue

@@ -146,16 +146,12 @@ export default {
     listToolbarFormData: {
       type: Object,
       default: null
-    },
-    // 列表配置信息
-    options: {
-      type: Object,
-      default: null
     }
   },
   data() {
     let parentFormData
     const gridParams = store.get(this.listCode)
+    const options = gridParams.options
     if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
       parentFormData = gridParams.options.extraParam.entityMap
     }
@@ -169,7 +165,8 @@ export default {
       subTableCanAdd: true, // 表单子表时是否有新增权限
       isShowAdd: false, // 是否显示表头的新增按钮
       cellWidth: null,
-      parentFormData
+      parentFormData,
+      options
     }
   },
   computed: {