agilebuilder-ui 1.0.90-tmp20 → 1.0.90-tmp22

package/package.json

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

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

@@ -419,11 +419,11 @@ const apis = {
           // 不是操作列，才需要设值
           const defaultValueSet = column.defaultValue
           let defaultValue = null
-          console.log('setColumnsDefaultValue111------getDefaultValueFunc--', getDefaultValueFunc, 'column=',column,'defaultValueSet=', defaultValueSet)
+          //console.log('setColumnsDefaultValue111------getDefaultValueFunc--', getDefaultValueFunc, 'column=',column,'defaultValueSet=', defaultValueSet)
           if(getDefaultValueFunc) {
-            console.log('setColumnsDefaultValue22---getDefaultValueFunc222---')
+            //console.log('setColumnsDefaultValue22---getDefaultValueFunc222---')
             defaultValue = getDefaultValueFunc(gridParams.pageContext, defaultValueSet, null, null)
-            console.log('setColumnsDefaultValue33---defaultValue---', defaultValue)
+            //console.log('setColumnsDefaultValue33---defaultValue---', defaultValue)
             if(defaultValue === undefined) {
               defaultValue = null
             }
@@ -1494,23 +1494,31 @@ const apis = {
     // console.log('dynamicControlTableEdit----gridParams.options.customRules333-----', gridParams.options.customRules)
   },
   doLayout(hiddenColumns, listCode) {
+    if(!listCode){
+      listCode = this.code
+    }
+    const gridParams = store.get(listCode)
+    const orgHiddenColumns = gridParams.hiddenColumns
+    // console.log('doLayout----orgHiddenColumns=', orgHiddenColumns)
     if(hiddenColumns && hiddenColumns.length > 0){
-      if(!this.options.hiddenColumns){
-        this.options.hiddenColumns = []
+      let hiddenColumnsResult = orgHiddenColumns
+      if(!hiddenColumnsResult){
+        hiddenColumnsResult = []
       }
-      if(this.options.hiddenColumns.length = 0){
-        this.options.hiddenColumns = hiddenColumns
+      if(hiddenColumnsResult.length === 0){
+        hiddenColumnsResult = hiddenColumns
       } else {
         hiddenColumns.forEach(prop=>{
-          if(this.options.hiddenColumns.indexOf(prop) < 0) {
+          if(hiddenColumnsResult.indexOf(prop) < 0) {
             // 去重处理
-            this.options.hiddenColumns.push(prop)
+            hiddenColumnsResult.push(prop)
           }
         })
       }
+      // console.log('doLayout----hiddenColumnsResult=', hiddenColumnsResult)
+      this.options.hiddenColumns = hiddenColumnsResult
     } else {
-      const gridParams = store.get(listCode)
-      this.options.hiddenColumns = gridParams.options.hiddenColumns
+      this.options.hiddenColumns = orgHiddenColumns
     }
     if (this.$refs && this.$refs.superGrid) {
       this.$refs.superGrid.doLayout()

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

@@ -712,18 +712,20 @@ export default {
       this.setInputNumberConfig()
     }
     // 如果是多选文件类型，需要解析（需要设置临时字段，判断文件还是图片，图片需要预览）
-    if (this.column.valueSetOptions && this.column.componentType !== 'inputNumber') {
-      const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
-      if (valueSetOptionsObj && valueSetOptionsObj.valueSetOptions) {
-        this.valueSetOptions = valueSetOptionsObj.valueSetOptions
-      }
-      if (valueSetOptionsObj.dynamicDataSourceCode && valueSetOptionsObj.dynamicDataSourceCode !== '') {
-        this.dynamicDataSourceCode = valueSetOptionsObj.dynamicDataSourceCode
-      }
-    } else if (this.column.componentType === 'switch' && this.column.valueSetOptions) {
-      const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
-      if (valueSetOptionsObj) {
-        this.valueSetOptions = valueSetOptionsObj
+    if (this.column.valueSetOptions) {
+      if (this.column.componentType === 'switch') {
+        const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+        if (valueSetOptionsObj) {
+          this.valueSetOptions = valueSetOptionsObj
+        }
+      } else if (this.column.componentType !== 'inputNumber') {
+        const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+        if (valueSetOptionsObj && valueSetOptionsObj.valueSetOptions) {
+          this.valueSetOptions = valueSetOptionsObj.valueSetOptions
+        }
+        if (valueSetOptionsObj.dynamicDataSourceCode && valueSetOptionsObj.dynamicDataSourceCode !== '') {
+          this.dynamicDataSourceCode = valueSetOptionsObj.dynamicDataSourceCode
+        }
       }
     }
     if (this.column.orgTreeSet) {
@@ -1762,7 +1764,12 @@ export default {
     },
     getSwitchConfig(switchProp) {
       if (this.valueSetOptions && this.valueSetOptions[switchProp]) {
-        return this.valueSetOptions[switchProp]
+        const value = this.valueSetOptions[switchProp]
+        if ('true' === value || 'false' === value) {
+          return 'true' === value
+        } else {
+          return this.valueSetOptions[switchProp]
+        }
       } else {
         if (switchProp === 'activeValue') {
           if (this.dataSourceType === 'mysql') {

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

@@ -11,7 +11,7 @@
     :width="getColumnWidth()"
   >
     <template v-slot:header>
-      <span v-if="!column.customHeader" :class="{is_req: isFieldRequired()}">
+      <span v-if="!column.customHeader" :class="{ is_req: isFieldRequired() }">
         <span :title="$escapeHtml(label)" class="cell--span required__label" v-html="$escapeHtml(label)" />
       </span>
       <component
@@ -27,7 +27,7 @@
       </el-icon>
     </template>
     <template v-slot="scope">
-        <!-- :pagination="pagination" -->
+      <!-- :pagination="pagination" -->
       <NormalColumnContent
         :ref="column.prop"
         :is-sql="isSql"
@@ -63,13 +63,7 @@
 <script>
 import { CirclePlus, ZoomIn as ElIconZoomIn } from '@element-plus/icons-vue'
 import { $emit, $off, $on } from '../../utils/gogocodeTransfer'
-import {
-  getColumnValues,
-  isRequiredEdit,
-  getContentAlign,
-  getHeaderAlign,
-  getHeaderLable
-} from './utils'
+import { getColumnValues, isRequiredEdit, getContentAlign, getHeaderAlign, getHeaderLable } from './utils'
 import DynamicInput from './dynamic-input.vue'
 import store from './store'
 import customFormatter from './custom-formatter'
@@ -284,7 +278,7 @@ export default {
     }
     const align = getContentAlign(this.column, gridParams)
     if (align) {
-      this.align = gridParams.options.align
+      this.align = align
     }
     const headerAlign = getHeaderAlign(this.column, gridParams)
     if (headerAlign) {
@@ -302,10 +296,8 @@ export default {
       gridParams.options &&
       gridParams.options.showOperationButton
   },
-  mounted() {
-  },
-  unmounted() {
-  },
+  mounted() {},
+  unmounted() {},
   methods: {
     ...customFormatter,
     ...apis,
@@ -323,7 +315,7 @@ export default {
       $emit(this, 'refresPortData', port, value, index)
     },
     refresPortsData(map, index) {
-        $emit(this, 'refresPortsData', map, index)
+      $emit(this, 'refresPortsData', map, index)
     },
     refresMainTableFields(map) {
       $emit(this, 'refresMainTableFields', map)
@@ -362,7 +354,7 @@ export default {
       this.$emit('open-page', openPageParams)
     }
   },
-  emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit',]
+  emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']
 }
 </script>
 

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/packages/super-grid/src/utils.js

@@ -801,9 +801,9 @@ export function getControlConfig(column) {
   return controlConfig
 }
 
-export function getContentAlign(column, gridParams){
+export function getContentAlign(column, gridParams) {
   let align
-  if (typeof gridParams.options.align !== 'undefined') {
+  if (gridParams.options?.align && gridParams.options.align !== '') {
     align = gridParams.options.align
   } else if (column.contAlign && column.contAlign !== '') {
     align = column.contAlign
@@ -811,20 +811,16 @@ export function getContentAlign(column, gridParams){
   return align
 }
 
-export function getHeaderAlign(column, gridParams){
+export function getHeaderAlign(column, gridParams) {
   let headerAlign
-  if (typeof gridParams.options.headerAlign !== 'undefined') {
+  if (gridParams.options?.headerAlign && gridParams.options.headerAlign !== '') {
     headerAlign = gridParams.options.headerAlign
   } else if (column.titleAlign && column.titleAlign !== '') {
     headerAlign = column.titleAlign
-  } else {
-    // 如果没有配置表头对齐方式，默认使用内容对齐方式
-    headerAlign = 'left'
   }
   return headerAlign
 }
 
-
 export function getHeaderLable(column) {
   let label = column.label
   if (!column.titleValueSet) {
@@ -840,4 +836,4 @@ export function getHeaderLable(column) {
 
 function formatHeader(column) {
   return doFormatWithValueSet(column.titleValueSetValue, column.label)
-}
+}

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 === ''