agilebuilder-ui 1.0.90-tmp185 → 1.0.90-tmp19

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

@@ -14,7 +14,6 @@
       :parent="parentFormData"
       :prop="column.prop"
       :row="row"
-      :page-context="gridOptions?.pageContext"
       :row-index="position ? position.row : null"
       :select-options="options"
       :value="innerValue"
@@ -713,20 +712,18 @@ export default {
       this.setInputNumberConfig()
     }
     // 如果是多选文件类型，需要解析（需要设置临时字段，判断文件还是图片，图片需要预览）
-    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.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.orgTreeSet) {
@@ -743,29 +740,25 @@ 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() {
     // 去掉该监听，否则导致焦点总是跳到第一个编辑框
@@ -1769,12 +1762,7 @@ export default {
     },
     getSwitchConfig(switchProp) {
       if (this.valueSetOptions && this.valueSetOptions[switchProp]) {
-        const value = this.valueSetOptions[switchProp]
-        if ('true' === value || 'false' === value) {
-          return 'true' === value
-        } else {
-          return this.valueSetOptions[switchProp]
-        }
+        return this.valueSetOptions[switchProp]
       } else {
         if (switchProp === 'activeValue') {
           if (this.dataSourceType === 'mysql') {
@@ -1829,13 +1817,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

@@ -72,20 +72,20 @@
             </template>
           </el-dropdown>
           <component
-            :is="operation.props.customControl"
-            v-else-if="operation.props.customControl"
-            v-permission="operation.props.permission"
-            :key="column.prop + '_' + rowIndex + '_' + currentPage"
-            :disabled="true"
-            :row="pageGridData[rowIndex]"
-            :entity="pageGridData[rowIndex]"
-            :prop="column.prop"
-            :parent="parentFormData"
-            :row-index="rowIndex"
-            :grid-data="gridData"
-            :page-grid-data="pageGridData"
-            :current-page="currentPage"
-            @refresh-list="refreshList"
+              :is="operation.props.customControl"
+              v-else-if="operation.props.customControl"
+              v-permission="operation.props.permission"
+              :key="column.prop+'_'+rowIndex+'_'+currentPage"
+              :disabled="true"
+              :row="pageGridData[rowIndex]"
+              :entity="pageGridData[rowIndex]"
+              :prop="column.prop"
+              :parent="parentFormData"
+              :row-index="rowIndex"
+              :grid-data="gridData"
+              :page-grid-data="pageGridData"
+              :current-page="currentPage"
+              @refresh-list="refreshList"
           />
           <row-operation
             v-else
@@ -119,7 +119,6 @@
           :value="getCellValue(row)"
           :additional-param-map="additionalParamMap"
           :additional-settings="additionalSettings"
-          :pageContext="options.pageContext"
         />
       </span>
       <!-- 自定义格式的时候 -->
@@ -156,7 +155,6 @@
           :listCode="listCode"
           :component-id="componentId"
           :additional-settings="additionalSettings"
-          :pageContext="options.pageContext"
           @prohibitToEdit="prohibitToEdit"
           @refresh-list="refreshList"
       /></span>
@@ -976,14 +974,7 @@ export default {
     },
     isRequired(editing) {
       console.log('isRequired---this.lineEdit=', this.lineEdit)
-      if (
-        !this.isFormSubTable &&
-        this.lineEdit &&
-        this.lineEdit.editable &&
-        this.isEditable &&
-        editing &&
-        this.column.validations
-      ) {
+      if (!this.isFormSubTable && this.lineEdit && this.lineEdit.editable && this.isEditable && editing && this.column.validations) {
         if (this.column.validations.indexOf('"required":true') > 0) {
           return true
         }
@@ -1037,7 +1028,7 @@ export default {
       }
     },
     changeRequired(required) {
-      this.requiredClass = required ? 'm-requried' : ''
+      this.requiredClass = required? 'm-requried' : ''
     }
   },
   emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']

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,7 +63,13 @@
 <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'
@@ -278,7 +284,7 @@ export default {
     }
     const align = getContentAlign(this.column, gridParams)
     if (align) {
-      this.align = align
+      this.align = gridParams.options.align
     }
     const headerAlign = getHeaderAlign(this.column, gridParams)
     if (headerAlign) {
@@ -296,8 +302,10 @@ export default {
       gridParams.options &&
       gridParams.options.showOperationButton
   },
-  mounted() {},
-  unmounted() {},
+  mounted() {
+  },
+  unmounted() {
+  },
   methods: {
     ...customFormatter,
     ...apis,
@@ -315,7 +323,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)
@@ -354,7 +362,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/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 (gridParams.options?.align && gridParams.options.align !== '') {
+  if (typeof gridParams.options.align !== 'undefined') {
     align = gridParams.options.align
   } else if (column.contAlign && column.contAlign !== '') {
     align = column.contAlign
@@ -811,16 +811,20 @@ export function getContentAlign(column, gridParams) {
   return align
 }
 
-export function getHeaderAlign(column, gridParams) {
+export function getHeaderAlign(column, gridParams){
   let headerAlign
-  if (gridParams.options?.headerAlign && gridParams.options.headerAlign !== '') {
+  if (typeof gridParams.options.headerAlign !== 'undefined') {
     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) {
@@ -836,4 +840,4 @@ export function getHeaderLable(column) {
 
 function formatHeader(column) {
   return doFormatWithValueSet(column.titleValueSetValue, column.label)
-}
+}