agilebuilder-ui 1.0.90-tmp1 → 1.0.90-tmp10

package/package.json

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

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

@@ -1453,14 +1453,15 @@ const apis = {
         }
       ]
      */
-  dynamicControlTableEdit(pageContext, customRules){
-    console.log('dynamicControlTableEdit----customRules-----', customRules)
+  dynamicControlTableEdit(pageContext, customRules, listCode){
+    const gridParams = store.get(listCode)
+    console.log('dynamicControlTableEdit----customRules-----', customRules, gridParams.options.customRules)
     if(!customRules){
       return
     }
     let gridCustomRules = {}
-    if(this.options.customRules){
-      gridCustomRules = JSON.parse(JSON.stringify(this.options.customRules))
+    if(gridParams.options.customRules){
+      gridCustomRules = JSON.parse(JSON.stringify(gridParams.options.customRules))
     }
     customRules.forEach(item=>{
       const copyItem = JSON.parse(JSON.stringify(item))
@@ -1469,10 +1470,11 @@ const apis = {
       let columnRules
       if(!gridCustomRules[prop]){
         gridCustomRules[prop] = {}
-      } else {
-        // 获得当前列已有的自定义规则集合
-        columnRules = gridCustomRules[prop].rules
       }
+      console.log('dynamicControlTableEdit----gridCustomRules111-----', gridCustomRules)
+      // 获得当前列已有的自定义规则集合
+      columnRules = gridCustomRules[prop].rules
+      
       if(copyItem.rules){
         if(!columnRules){
           columnRules = []
@@ -1482,9 +1484,14 @@ const apis = {
       }
       // 当前列总的自定义规则更新
       copyItem.rules = columnRules
-      this.options.customRules[prop] = copyItem
+      // this.options.customRules[prop] = copyItem
+      if(!gridParams.options.customRules){
+        gridParams.options.customRules = {}
+      }
+      console.log('dynamicControlTableEdit----gridParams.options.customRules222-----', gridParams.options.customRules)
+      gridParams.options.customRules[prop] = copyItem
     })
-    console.log('dynamicControlTableEdit----this.options-----', this.options)
+    console.log('dynamicControlTableEdit----gridParams.options.customRules333-----', gridParams.options.customRules)
   }
 }
 export default apis

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

@@ -441,8 +441,6 @@ import { $emit } from '../../utils/gogocodeTransfer'
 import eventBus from './eventBus'
 import { isMobileBrowser } from '../../../src/utils/common-util'
 import { analysisScanValue, setScanAnalysisValue } from './scan-util.ts'
-import restfulInterfaceVue from '../../../../agilebuilder-private-lib/packages/restful-interface/src/restful-interface.vue'
-
 export default {
   name: 'DynamicInput',
   components: {
@@ -745,17 +743,17 @@ 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()
+					this.packageCustomRules(newVal)
 				},
 				{
 					immediate: true,
 					deep: true,
 				})
-    this.watch('gridOptions.customRules._all_fields',
+    this.$watch('gridOptions.customRules._all_fields',
 				(newVal, oldVal)=> {
-					this.packageCustomRules()
+					this.packageCustomRules(newVal)
 				},
 				{
 					immediate: true,
@@ -1817,21 +1815,16 @@ export default {
       this.innerValue = value
       this.blurEvent()
     },
-    packageCustomRules() {
-      if(!this.options.customRules){
+    packageCustomRules(columnRule) {
+      console.log('packageCustomRules---columnRule=', columnRule)
+      if(!columnRule){
         return
       }
-      const columnRules = this.options.customRules.filter(item=>item.name===this.column.prop || item.name === '_all_fields')
-      if(columnRules && columnRules.length > 0) {
-        for(let i = 0; i< columnRules.length; i++) {
-          const columnRule = columnRules[i]
-          if(columnRule.disabled !== undefined){
-            this.$emit('change-disabled', columnRule.disabled)
-          }
-          if(columnRule.required !== undefined){
-            this.$emit('change-required', columnRule.required)
-          }
-        }
+      if(columnRule.disabled !== undefined){
+        this.$emit('change-disabled', columnRule.disabled)
+      }
+      if(columnRule.required !== undefined){
+        this.$emit('change-required', columnRule.required)
       }
     }
   }

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
     }
@@ -481,7 +477,10 @@ export default {
       scanEnable = true
     }
     const componentId = this.listCode + '_' + this.column.prop
-    const requiredClass = this.isRequired(this.row.$editing) ? 'm-requried' : ''
+    let lineEdit
+    if (gridParams.lineEdit !== null && gridParams.lineEdit !== undefined) {
+      lineEdit = gridParams.lineEdit
+    }
     return {
       selectRow: null,
       that: this,
@@ -511,22 +510,24 @@ export default {
       componentId,
       controlConfig,
       rowLinkConfigMapping: {},
-      requiredClass
+      requiredClass: '',
+      lineEdit,
+      options
     }
   },
   computed: {
-    lineEdit() {
-      let isLineEdit = false
-      if (this.listCode) {
-        const gridParams = store.get(this.listCode)
-        if (gridParams.lineEdit !== null && gridParams.lineEdit !== undefined) {
-          isLineEdit = gridParams.lineEdit
-        } else {
-          isLineEdit = false
-        }
-      }
-      return isLineEdit
-    },
+    // lineEdit() {
+    //   let isLineEdit = false
+    //   if (this.listCode) {
+    //     const gridParams = store.get(this.listCode)
+    //     if (gridParams.lineEdit !== null && gridParams.lineEdit !== undefined) {
+    //       isLineEdit = gridParams.lineEdit
+    //     } else {
+    //       isLineEdit = false
+    //     }
+    //   }
+    //   return isLineEdit
+    // },
 
     ...mapGetters(['preventReclick'])
   },
@@ -612,6 +613,7 @@ export default {
       }
     }
     this.setScanRuleSets()
+    this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried' : ''
   },
   mounted() {
     // 监听保存时点击按钮事件线触发
@@ -971,7 +973,8 @@ export default {
       }
     },
     isRequired(editing) {
-      if (!this.isFormSubTable && this.lineEdit.editable && this.isEditable && editing && this.column.validations) {
+      console.log('isRequired---this.lineEdit=', this.lineEdit)
+      if (!this.isFormSubTable && this.lineEdit && this.lineEdit.editable && this.isEditable && editing && this.column.validations) {
         if (this.column.validations.indexOf('"required":true') > 0) {
           return true
         }

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: {