agilebuilder-ui 1.0.91 → 1.0.93-temp2

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

@@ -20,6 +20,7 @@
       :additional-param-map="additionalParamMap"
       :listCode="listCode"
       :component-id="componentId"
+      :page-context="pageContext"
       @change="cellEvent('change', $event)"
       @input="cellEvent('input', $event)"
     />
@@ -742,25 +743,29 @@ export default {
       }
     }
     this.getDateAllowTime()
-    if(!this.gridOptions.customRules){
+    if (!this.gridOptions.customRules) {
       this.gridOptions.customRules = {}
     }
-    this.$watch('gridOptions.customRules.'+this.column.prop,
-				(newVal, oldVal)=> {
-					this.packageCustomRules(newVal)
-				},
-				{
-					immediate: true,
-					deep: true,
-				})
-    this.$watch('gridOptions.customRules._all_fields',
-				(newVal, oldVal)=> {
-					this.packageCustomRules(newVal)
-				},
-				{
-					immediate: true,
-					deep: true,
-				})
+    this.$watch(
+      'gridOptions.customRules.' + this.column.prop,
+      (newVal, oldVal) => {
+        this.packageCustomRules(newVal)
+      },
+      {
+        immediate: true,
+        deep: true
+      }
+    )
+    this.$watch(
+      'gridOptions.customRules._all_fields',
+      (newVal, oldVal) => {
+        this.packageCustomRules(newVal)
+      },
+      {
+        immediate: true,
+        deep: true
+      }
+    )
   },
   mounted() {
     // 去掉该监听，否则导致焦点总是跳到第一个编辑框
@@ -1551,7 +1556,14 @@ export default {
       if (prop && prop === this.column.prop) {
         // 必须手动调用一下input事件，否则不会更新组件的值
         // console.log('organizationInputEvent2---prop=', prop, 'value=', value)
-        this.callCustomEventWithParam('input', { value, row: this.row, column: this.column, prop })
+        if (this.column && this.column.events && this.column.events.length > 0) {
+          this.callCustomEventWithParam(this.column.events[eventName], {
+            value,
+            row: this.row,
+            column: this.column,
+            prop
+          })
+        }
       }
     },
     // 组织结构树文本框值清空事件
@@ -1824,13 +1836,13 @@ export default {
     },
     packageCustomRules(columnRule) {
       console.log('packageCustomRules---columnRule=', columnRule)
-      if(!columnRule){
+      if (!columnRule) {
         return
       }
-      if(columnRule.disabled !== undefined){
+      if (columnRule.disabled !== undefined) {
         this.$emit('change-disabled', columnRule.disabled)
       }
-      if(columnRule.required !== undefined){
+      if (columnRule.required !== undefined) {
         this.$emit('change-required', columnRule.required)
       }
     }

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

@@ -119,6 +119,7 @@
           :value="getCellValue(row)"
           :additional-param-map="additionalParamMap"
           :additional-settings="additionalSettings"
+          :page-context="options?.pageContext"
         />
       </span>
       <!-- 自定义格式的时候 -->
@@ -155,6 +156,7 @@
           :listCode="listCode"
           :component-id="componentId"
           :additional-settings="additionalSettings"
+          :page-context="options?.pageContext"
           @prohibitToEdit="prohibitToEdit"
           @refresh-list="refreshList"
       /></span>

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

@@ -176,6 +176,7 @@ const superGridService = {
                 gridParams.pagination = this.pagination
                 gridParams.pageContext = this.pageContext
                 gridParams.configureObj = this.configureObj
+                gridParams.hiddenColumns = this.options.hiddenColumns?JSON.parse(JSON.stringify(this.options.hiddenColumns)):[]
                 if (this.pagination) {
                   // 监控每行显示多少条变量使用
                   this.pageSize = this.pagination.pageSize

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

@@ -545,6 +545,7 @@ export default {
             if (
               hiddenColumns &&
               hiddenColumns.length > 0 &&
+              column.prop &&
               hiddenColumns.indexOf(column.prop) !== -1
             ) {
               // 如果当前字段包含在隐藏字段集合中，则不显示该字段

package/src/utils/calculator/calculator-factory.js

@@ -101,13 +101,13 @@ class TextCalculator extends CalculatorFactory {
       this.result = false
     } else {
       if (operator === 'NET') {
-        this.result = leftVale !== rightValue
+        this.result = (leftVale+'') !== (rightValue+'')
       } else if (operator === 'EQ') {
-        this.result = leftVale === rightValue
+        this.result = (leftVale+'') === (rightValue+'')
       } else if (operator === 'NOT_CONTAIN') {
-        this.result = !leftVale.includes(rightValue)
+        this.result = !(leftVale+'').includes(rightValue+'')
       } else if (operator === 'CONTAIN') {
-        this.result = leftVale.includes(rightValue)
+        this.result = (leftVale+'').includes(rightValue+'')
       } else if (operator === 'IS_NULL') {
         this.result =
           leftVale === undefined || leftVale === null || leftVale === ''