agilebuilder-ui 1.0.90-tmp18 → 1.0.90-tmp1811

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)"
     />
@@ -712,18 +713,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) {
@@ -740,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() {
     // 去掉该监听，否则导致焦点总是跳到第一个编辑框
@@ -1762,7 +1769,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') {
@@ -1817,13 +1829,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/formValidatorUtil.js

@@ -109,7 +109,6 @@ function setRules(rules, editField, listCode, customRules) {
     if(prop) {
       // 获得当前列的自定义校验规则
       const columnCustomRules = getColumnCustomRules(editField, customRules)
-      console.log('setRules---prop=', prop, 'columnCustomRules====', columnCustomRules)
       if ((columnCustomRules || editField.validations) && !isDisableEdit(prop, listCode)) {
         let validations = editField.validations? JSON.parse(editField.validations): []
         validations.forEach((item) => {
@@ -119,7 +118,6 @@ function setRules(rules, editField, listCode, customRules) {
           }
         })
         validations = validations.concat(columnCustomRules)
-        console.log('setRules---prop=', prop, 'validations====', validations)
         if (prop.indexOf('.') > 0) {
           setObjectPropRule(editField, rules, validations)
         } else {

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/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.vue

@@ -3333,9 +3333,6 @@ export default {
     },
     closeRowForm () {
       this.showRowForm = false
-    },
-    testFunc(params){
-      console.log('testFunc-----------------params=', params)
     }
   },
   emits: [

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)
-}
+}