agilebuilder-ui 1.0.90-temp6 → 1.0.90-tmp2

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

@@ -441,7 +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'
-
 export default {
   name: 'DynamicInput',
   components: {
@@ -465,6 +464,7 @@ export default {
       type: Object,
       default: null
     },
+    // 下拉选选项集合
     options: {
       type: Array,
       default: null
@@ -498,6 +498,11 @@ export default {
     disabled: {
       type: Boolean,
       default: false
+    },
+    // 列表配置信息
+    gridOptions: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -707,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) {
@@ -737,6 +740,25 @@ export default {
       }
     }
     this.getDateAllowTime()
+    if(!this.gridOptions.customRules){
+      this.gridOptions.customRules = {}
+    }
+    this.watch('gridOptions.customRules.'+this.column.prop,
+				(newVal, oldVal)=> {
+					this.packageCustomRules()
+				},
+				{
+					immediate: true,
+					deep: true,
+				})
+    this.watch('gridOptions.customRules._all_fields',
+				(newVal, oldVal)=> {
+					this.packageCustomRules()
+				},
+				{
+					immediate: true,
+					deep: true,
+				})
   },
   mounted() {
     // 去掉该监听，否则导致焦点总是跳到第一个编辑框
@@ -1740,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') {
@@ -1797,6 +1814,23 @@ export default {
       this.isShowBrowserScan = false
       this.innerValue = value
       this.blurEvent()
+    },
+    packageCustomRules() {
+      if(!this.options.customRules){
+        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)
+          }
+        }
+      }
     }
   }
 }

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

@@ -4,13 +4,14 @@
     <dynamic-input
       v-if="(lineEdit.editable && isEditable && row.$editing) || isShowForm"
       v-model:value="row[column.prop]"
-      :class="isRequired(row.$editing) ? 'm-requried' : ''"
+      :class="requiredClass"
       :column="column"
       :is-sql="isSql"
       :line-edit="lineEdit"
       :list-code="listCode"
       :list-toolbar-form-data="listToolbarFormData"
       :options="column.valueSet"
+      :grid-options="options"
       :position="{
         row: rowIndex,
         prop: column.prop
@@ -28,6 +29,7 @@
       @refresPortData="refresPortData"
       @refresPortsData="refresPortsData"
       @change-disabled="changeDisabled"
+      @change-required="changeRequired"
     />
     <span v-else>
       <span v-if="column.operations" class="grid-operation-buttons">
@@ -455,6 +457,11 @@ export default {
     isShowForm: {
       type: Boolean,
       default: false
+    },
+    // 列表配置信息
+    options: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -474,6 +481,7 @@ export default {
       scanEnable = true
     }
     const componentId = this.listCode + '_' + this.column.prop
+    const requiredClass = this.isRequired(this.row.$editing) ? 'm-requried' : ''
     return {
       selectRow: null,
       that: this,
@@ -502,68 +510,11 @@ export default {
       scanEnable,
       componentId,
       controlConfig,
-      rowLinkConfigMapping: {}
+      rowLinkConfigMapping: {},
+      requiredClass
     }
   },
   computed: {
-    filters() {
-      if (this.column.filterable) {
-        const gridParams = store.get(this.listCode)
-        const values = getColumnValues(gridParams.gridData, this.column.prop)
-        const filters = []
-        for (const value of values) {
-          filters.push({
-            text: value,
-            value
-          })
-        }
-        return filters
-      } else {
-        return null
-      }
-    },
-    filterMethod() {
-      if (this.column.filterable) {
-        return this.filterHandler
-      } else {
-        return null
-      }
-    },
-    fixed() {
-      if (
-        (this.column.fixed && this.column.fixed === 'false') ||
-        this.column.fixed === undefined ||
-        this.column.fixed === ''
-      ) {
-        return false
-      }
-      if (this.column.prop === 'operation' && this.column.fixed && this.column.fixed === 'left') {
-        // 操作列居右固定
-        return 'right'
-      }
-      return this.column.fixed
-    },
-    sortable() {
-      const gridParams = store.get(this.listCode)
-      if (
-        gridParams &&
-        gridParams.options &&
-        gridParams.options.isFormSubTable &&
-        gridParams.options.showOperationButton
-      ) {
-        return false
-      }
-      if (this.column.sortable === 'false' || this.column.sortable === false || this.column.sortable === '') {
-        return false
-      } else if (this.column.sortable === 'true' || this.column.sortable === true) {
-        return 'custom'
-      }
-      if (this.column.sortable) {
-        return 'custom'
-      } else {
-        return false
-      }
-    },
     lineEdit() {
       let isLineEdit = false
       if (this.listCode) {
@@ -1072,6 +1023,9 @@ export default {
           this.column._scanRuleSets = res
         })
       }
+    },
+    changeRequired(required) {
+      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'
@@ -140,12 +146,16 @@ 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
     }
@@ -159,8 +169,7 @@ export default {
       subTableCanAdd: true, // 表单子表时是否有新增权限
       isShowAdd: false, // 是否显示表头的新增按钮
       cellWidth: null,
-      parentFormData,
-      options
+      parentFormData
     }
   },
   computed: {
@@ -278,7 +287,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 +305,10 @@ export default {
       gridParams.options &&
       gridParams.options.showOperationButton
   },
-  mounted() {},
-  unmounted() {},
+  mounted() {
+  },
+  unmounted() {
+  },
   methods: {
     ...customFormatter,
     ...apis,
@@ -315,7 +326,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)
@@ -336,6 +347,10 @@ export default {
       return this.column.width ? this.column.width + '' : '130'
     },
     // 设置字段禁止编辑
+    fnProhibitToEdit(isEditable) {
+      this.$refs[this.column.prop].fnProhibitToEdit(isEditable)
+    },
+    // 设置字段禁止编辑
     prohibitToEdit(entity) {
       $emit(this, 'prohibitToEdit', entity)
     },
@@ -350,7 +365,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

@@ -3156,7 +3156,10 @@ export default {
     openFold(isOpen) {
       this.resizeTableHeight()
     },
-    // 设置字段禁止编辑
+    /**
+     * 设置字段禁止编辑。只能控制禁止编辑。不能控制必填
+     * @param entity 格式如：{'NAME':false,"DYM_COLUMN":true}。表示NAME字段不可编辑，DYM_COLUMN可以被编辑
+     */
     fnProhibitToEdit(entity) {
 			if (entity) {
 				if (entity.isForceUpdate) {
@@ -3174,7 +3177,10 @@ export default {
         }
       }
     },
-    // 设置字段禁止编辑
+    /**
+     * 设置字段禁止编辑。只能控制禁止编辑。不能控制必填
+     * @param entity 格式如：{'NAME':false,"DYM_COLUMN":true}。表示NAME字段不可编辑，DYM_COLUMN可以被编辑
+     */
     prohibitToEdit(entity) {
       this.fnProhibitToEdit(entity)
     },
@@ -3327,6 +3333,9 @@ export default {
     },
     closeRowForm () {
       this.showRowForm = false
+    },
+    testFunc(params){
+      console.log('testFunc-----------------params=', params)
     }
   },
   emits: [
@@ -3340,8 +3349,7 @@ export default {
     'un-edit',
     'refresMainTableFields',
     'refresh',
-    'cancel-search',
-    ,
+    'cancel-search'
   ],
 }
 </script>

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

@@ -262,6 +262,15 @@ export function isDisableEdit(prop, listCode, row) {
         isDiabled = true
       }
     }
+    if (isDiabled === false) {
+      // 表示不是禁止编辑的，继续校验自定义规则中是否是禁止编辑的
+      if(gridParams.options.customRules && gridParams.options.customRules[prop]){
+        const columnRules = gridParams.options.customRules[prop]
+        if(columnRules && columnRules.disabled){
+          isDiabled = true
+        }
+      }
+    }
   }
   return isDiabled
 }
@@ -792,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
@@ -802,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) {
@@ -827,4 +840,4 @@ export function getHeaderLable(column) {
 
 function formatHeader(column) {
   return doFormatWithValueSet(column.titleValueSetValue, column.label)
-}
+}