agilebuilder-ui 1.1.36-sit5 → 1.1.36-tmp2

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

@@ -1,10 +1,10 @@
 <template>
   <!--将@click改为@mousedown.native是因为操作列保存按钮时事件和input等组件的@blur冲突，导致保存需要保存两次，因为
       @blur先于@click执行的，所以只会执行@blur，@click就失效了，@mousedown是先于@blur执行的-->
-  <span class="table-operation-row-btn" :style="myStyle">
+  <span :style="myStyle">
     <template v-if="isShowButton()">
       <el-tooltip :disabled="tooltipDisabled" :content="label" placement="top">
-        <template v-if="operationSettingData?.permission">
+        <template v-if="operationSettingData.permission">
           <component
             v-bind="operationSettingData"
             :is="isElementType"
@@ -77,13 +77,9 @@ export default {
       type: String,
       default: null,
     },
-    operation: {
-      type: Object,
-      default: () => ({}),
-    },
     operationSetting: {
       type: Object,
-      default: () => ({}),
+      default: null,
     },
     operationIndex: {
       type: Number,
@@ -96,11 +92,6 @@ export default {
     parentFormData: {
       type: Object,
       default: null
-    },
-    // 按钮绑定的事件名称
-    eventName: {
-      type: String,
-      default: null
     }
   },
   data() {
@@ -113,20 +104,19 @@ export default {
     ...mapGetters(['preventReclick']),
     // 是否是保存按钮
     isSaveRow() {
-      return ['lineEditSave', 'saveRow'].includes(this.eventName)
+      return /^\s*function\s+saveRow*\s*\(/.test((this.onClick ?? ''))
     },
     // 是否是删除按钮
     isDeleteRow() {
-      return ['lineEditDelete', 'deleteRow'].includes(this.eventName)
+      return /^\s*function\s+deleteRow*\s*\(/.test((this.onClick ?? ''))
     },
     // 是否是修改按钮
     isEditRow() {
-      return ['lineEditUpdate', 'editRow'].includes(this.eventName)
+      return /^\s*function\s+editRow*\s*\(/.test((this.onClick ?? ''))
     },
     // 是否是取消按钮
     isRestoreRow() {
-      return ['restoreEdit', 'restoreRow'].includes(this.eventName)
-      // return /^\s*function\s+restoreRow*\s*\(/.test((this.onClick ?? ''))
+      return /^\s*function\s+restoreRow*\s*\(/.test((this.onClick ?? ''))
     },
     // 前置图标
     prefixIcon() {
@@ -152,16 +142,16 @@ export default {
     },
     // 后置图标
     suffixIcon() {
-      if(['right'].includes(this.operationSetting.iconPosition)) return this.operationSetting.iconValue
+      if(['right'].includes(this.operationSettingData.iconPosition)) return this.operationSetting.iconValue
       return undefined
     },
     // 是否显示文字按钮 > 图标模式
     isTextIcon() {
       if (this.isTableBtnLinkShow) {
-        if (this.operationSetting.isTextIcon === undefined) {
+        if (this.operationSettingData.isTextIcon === undefined) {
           return this.isSaveRow || this.isDeleteRow || this.isEditRow || this.isRestoreRow
         }
-        return this.operationSetting.isTextIcon
+        return this.operationSettingData.isTextIcon
       } else {
         return false
       }
@@ -176,14 +166,14 @@ export default {
     },
     // 是否自动开启表格 按钮 转 文字按钮
     isTableBtnLinkShow() {
-      if (this.operationSetting?.text) return true
+      if (this.operationSetting.text) return true
       if (this.isTableBtnLink && this.elementType === 'el-button') {
-        return [this.operationSetting?.text, this.operationSetting?.plain, this.operationSetting?.round].every(v => v === undefined)
+        return [this.operationSetting.text, this.operationSetting.plain, this.operationSetting.round].every(v => v === undefined)
       }
       return false
     },
     operationSettingData() {
-      const dataList = { ...(this.operationSetting ?? {}) }
+      const dataList = { ...this.operationSetting }
       if (this.isTableBtnLinkShow) {
         dataList.underline = false
         delete dataList.text

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

@@ -581,15 +581,11 @@ export default {
       if (gridParams && gridParams.options && gridParams.options.rowKeyProp) {
         return gridParams.options.rowKeyProp
       } else {
-        // 使用rowDataGuId作为唯一标识，解决台账显示或不显示id。
-        // 大小写、或（子表时id还不存在问题，导致行选择和push新数据后 3行数据，
-        // 在第二行插入数据，因为key问题3、4行数据变成一样的)
-        return '$rowDataGuId'
-        // if (this.dataSourceType === 'oracle') {
-        //   return 'ID'
-        // } else {
-        //   return 'id'
-        // }
+        if (this.dataSourceType === 'oracle') {
+          return 'ID'
+        } else {
+          return 'id'
+        }
       }
     },
     filterGridData() {
@@ -634,12 +630,15 @@ export default {
     tableDatas: {
       deep: true,
       immediate: true,
-      handler(a, b) {}
+      handler(a, b) {
+        console.log('SGQ --- 表格监听数据修改============================》', a, b)
+      }
     },
     'options.SuperGrid': {
       deep: true,
       handler: function () {
         this.externalClickFlag = true
+        console.log('监听到数据改变')
         this.initSetting()
         this.initialize()
       }
@@ -715,6 +714,7 @@ export default {
       deep: true,
       handler: function () {
         this.externalClickFlag = true
+        console.log('监听到数据改变================', this.options.validateRules)
         const gridParams = store.get(this.code)
         if (gridParams && gridParams.options) {
           gridParams.options.validateRules = this.options.validateRules
@@ -746,6 +746,7 @@ export default {
     'options.extraParam.entityMap': {
       deep: true,
       handler(newValue, oldValue) {
+        console.log('watch====options.extraParam.entityMap===改变==', newValue)
         this.parentFormData = newValue
         this.$emit('change-form-data', this.parentFormData)
       }
@@ -936,6 +937,7 @@ export default {
       if (that.options.isEnableEnterEvent !== undefined && that.options.isEnableEnterEvent === false) {
         canCall = false
       }
+      console.log('super-grid-----isEnableEnterEvent=', that.options.isEnableEnterEvent, 'canCall=', canCall)
       const gridParams = store.get(that.code)
       if (canCall && gridParams.options && gridParams.options.isFormSubTable) {
         canCall = false
@@ -992,19 +994,19 @@ export default {
             tempMaxHeight = tableHeight
           }
         }
-        if (tempMaxHeight === null) {
+        if(tempMaxHeight === null){
           // 高度是null会导致页面卡死
           tempMaxHeight = undefined
         }
-        if (tempMaxHeight !== null && tempMaxHeight !== undefined && parseFloat(tempMaxHeight + '') < 100) {
+        if(tempMaxHeight !== null && tempMaxHeight !== undefined && parseFloat(tempMaxHeight+'') < 100){
           // 如果小于100时，高度给100
           tempMaxHeight = 100
         }
-        if (tempMaxHeight !== null && tempMaxHeight !== undefined) {
+        if(tempMaxHeight !== null && tempMaxHeight !== undefined){
           // 用parseFloat是因为tempMaxHeight的值有时是数字字符串
-          tempMaxHeight = parseFloat(tempMaxHeight + '')
-        }
-        if (gridParams.options && gridParams.options.isFormSubTable) {
+          tempMaxHeight = parseFloat(tempMaxHeight+'')
+        }        
+        if(gridParams.options && gridParams.options.isFormSubTable){
           // 表示表单页面子表时,不解析 显示效果了，直接使用高度就行了
           if (
             !this.basicInfo.displayEffect ||
@@ -1035,6 +1037,16 @@ export default {
             this.tableHeight = undefined
           }
         }
+        console.log(
+          'resizeTableHeight-----tempMaxHeight=',
+          tempMaxHeight,
+          'this.tableHeight=',
+          this.tableHeight,
+          'this.maxHeight=',
+          this.maxHeight,
+          'gridParams.options=',
+          gridParams.options
+        )
       })
     },
     // 回车键
@@ -1544,6 +1556,7 @@ export default {
             // 子表无记录时不需要刷新子表记录。表示是新建或修改时子表无记录，且不需要刷新子表。
             if (this.isSubTableEmpty(gridParams)) {
               // 表示是新建表单时，子表记录集合是空数组
+              console.log('子表无记录----code=', this.code, gridParams)
               const subTableData = []
               this.packageSubTableData(gridParams, subTableData)
             }
@@ -2167,7 +2180,7 @@ export default {
         } else {
           vm.fetchData(vm.getSearchParam(), isSearch, parentRowIds)
             .then((data) => {
-              // console.log('打印1====', gridParams)
+              console.log('打印1====', gridParams)
               if (
                 gridParams !== undefined &&
                 gridParams.options !== undefined &&
@@ -2175,18 +2188,18 @@ export default {
                 gridParams.options.isHiddenSearchForm === true
               ) {
                 // 查询时，是否隐藏查询区域，默认是不隐藏查询区域
-                // console.log('打印2====', vm)
+                console.log('打印2====', vm)
                 vm.showSearch = false
                 $emit(vm, 'cancel-search')
               }
-              // console.log('打印3====', vm)
-              // console.log('打印4====', vm.$refs)
+              console.log('打印3====', vm)
+              console.log('打印4====', vm.$refs)
               if (vm.$refs && vm.$refs.sf) {
-                // console.log('打印5====', vm.$refs.sf)
+                console.log('打印5====', vm.$refs.sf)
                 vm.$refs.sf.loading = false
                 vm.$refs.sf.searchComplete()
               }
-              // console.log('打印6====', vm)
+              console.log('打印6====', vm)
               // 重新计算列表高度
               this.resizeTableHeight()
               resolve(data)
@@ -2331,6 +2344,8 @@ export default {
       } else if (prop === undefined && column.children && column.children.length > 0) {
         type = 'GroupColumn'
       }
+      // console.log('%c描述-180428','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',this.myCustomFormatter);
+      // console.log('%c描述-155704','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',type);
       return type
     },
     focusOnFirstEditableInput() {
@@ -2341,6 +2356,7 @@ export default {
     },
     handleSizeChange(val) {
       if (!this.options || !this.options.isPageShow) {
+        // console.log(`每页 ${val} 条`)
         this.currentPage = 1
         this.pageSize = val
         this.pagination.pageSize = val
@@ -2823,6 +2839,7 @@ export default {
       return this.isSubTableShowPage ? this.subTableData : this.gridData
     },
     rowDblclickEvent(row, column, event) {
+      debugger
       const gridParams = store.get(this.code)
       if (gridParams.options && gridParams.options.isFormSubTable && gridParams.options.isPdfEditor) {
         // 如果是子表并且是pdf模式
@@ -2832,6 +2849,7 @@ export default {
           let canEdit = true
           const gridParams = store.get(this.code)
           if (isEditOptionFunction('beforeEdit', this.code)) {
+            debugger;
             const isSubTableShowPage = gridParams.isSubTableShowPage
             // 每页显示多少条
             const pageSize = gridParams.pagination && gridParams.pagination.pageSize
@@ -2862,6 +2880,7 @@ export default {
         }
       } else {
         if (row) {
+          debugger
           if (gridParams && gridParams.lineEdit && gridParams.lineEdit.editable && gridParams.canntEdit) {
             let index = this.gridData.findIndex(function (item) {
               return (item.id && item.id === row.id) || (item.ID && item.ID === row.ID)
@@ -2876,6 +2895,7 @@ export default {
       this.rowDblClick(row, column, event)
     },
     rowDbClickEditRow(gridParams, row) {
+      console.log('rowDbClickEditRow+++++++++++++++++++', gridParams, row)
       // 取消上一行的编辑状态
       let editRows
       if (this.isSubTableShowPage) {
@@ -3333,35 +3353,6 @@ export default {
     },
     changeOperationAddState(state) {
       eventBus.$emit('change-add-state', state)
-    },
-    scrollTo(options, yCoord) {
-      this.$refs.superGrid?.scrollTo(options, yCoord)
-    },
-    setScrollTop(top) {
-      this.$refs.superGrid?.setScrollTop(top)
-    },
-    setScrollLeft(left) {
-      this.$refs.superGrid?.setScrollLeft(left)
-    },
-    setScrollTopByRowIndex(rowIndex) {
-      if (this.$refs.superGrid) {
-        const theTableRows = this.$refs.superGrid.$el.querySelectorAll('.el-table__body tbody .el-table__row')
-        let scrollTop = 0
-        for (let i = 0; i < theTableRows.length; i++) {
-          if (i === rowIndex) {
-            break
-          }
-          scrollTop += theTableRows[i].offsetHeight
-        }
-        this.$refs.superGrid.setScrollTop(scrollTop)
-      }
-    },
-    setCurrentRowIndex(rowIndex) {
-      // 选中行
-      this.$refs.superGrid.setCurrentRow(this.tableDatas[rowIndex])
-    },
-    getSuperGridRef() {
-      return this.$refs.superGrid
     }
   },
   emits: [

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

@@ -264,14 +264,9 @@ export function isDisableEdit(prop, listCode, row) {
     }
     if (isDiabled === false) {
       // 表示不是禁止编辑的，继续校验自定义规则中是否是禁止编辑的
-      if (
-        gridParams.options.customRules &&
-        (gridParams.options.customRules[prop] || gridParams.options.customRules['_all_fields'])
-      ) {
-        const columnRules = gridParams.options.customRules[prop]
-          ? gridParams.options.customRules[prop]
-          : gridParams.options.customRules['_all_fields']
-        if (columnRules && columnRules.disabled) {
+      if(gridParams.options.customRules && (gridParams.options.customRules[prop] || gridParams.options.customRules['_all_fields'])){
+        const columnRules = gridParams.options.customRules[prop]? gridParams.options.customRules[prop]: gridParams.options.customRules['_all_fields']
+        if(columnRules && columnRules.disabled){
           isDiabled = true
         }
       }
@@ -570,6 +565,7 @@ export function getTableHeight(superGrid, listCode, pageHeight) {
     rect = superGrid.$el.getBoundingClientRect()
   }
   const totalHeight = window.innerHeight - (rect?.y ?? 0) - 110
+  console.log('rect=', rect, 'window.innerHeight=', window.innerHeight, 'totalHeight=', totalHeight)
   return totalHeight
 
   // let topDivHeight = 120
@@ -759,12 +755,9 @@ export function getDynamicDataSourceOptions(column, isSql, additionalParamMap, b
 
 // 值设置是否是动态数据源类型的数据源
 export function isDynamicDataSourceSource(column) {
-  if (column.valueSetOptions) {
+  if(column.valueSetOptions) {
     const valueSetOptionsObj = JSON.parse(column.valueSetOptions)
-    if (
-      (valueSetOptionsObj.type && valueSetOptionsObj.type === 'dynamicData') ||
-      valueSetOptionsObj.dynamicDataSourceCode
-    ) {
+    if((valueSetOptionsObj.type && valueSetOptionsObj.type === 'dynamicData') || valueSetOptionsObj.dynamicDataSourceCode){
       // 表示是动态数据源
       return true
     }
@@ -789,8 +782,10 @@ export function getLastPageNum(total, rowsPerPage) {
 // 纵向滚动条滚动最底部功能
 export function scrollYToBottom(listCode) {
   const scrollDivElement = document.querySelector('.' + listCode + ' .el-table--scrollable-y .el-table__body-wrapper')
+  console.log('scrollDivElement==', scrollDivElement)
   if (scrollDivElement && scrollDivElement !== null) {
     // 表示有滚动条，需要将滚动条滚动最底部
+    console.log('scrollDivElement==scrollDivElement.scrollHeight=', scrollDivElement.scrollHeight)
     scrollDivElement.scrollTop = scrollDivElement.scrollHeight
   }
 }

package/packages/super-icon/src/index.vue

@@ -4,7 +4,7 @@
   <i v-else-if="iconValue.indexOf('fa-') === 0" :class="'fa ' + iconValue" />
   <img
     v-else-if="iconValue.indexOf('svg-img-') === 0"
-    :src="defaultShowSvgAction + iconValue"
+    :src="defaultShowImageAction + iconValue.substring('svg-img-'.length)"
     style="width: 1em; height: 1em"
   />
   <SvgIcon v-else-if="iconValue.indexOf('svg-') === 0" :icon-class="iconValue.substring('svg-'.length)" />
@@ -39,9 +39,6 @@ const props = defineProps({
 const defaultShowImageAction = ref(
   window.$vueApp.config.globalProperties.baseAPI + '/component/super-form/show-image?serverPath='
 )
-const defaultShowSvgAction = ref(
-  window.$vueApp.config.globalProperties.baseAPI + '/component/super-form/show-svg?svgName='
-)
 </script>
 <style lang="scss" scoped>
 .super-icon {

package/packages/workgroup-tree/src/workgroup-tree.vue

@@ -1,127 +1,120 @@
 <template>
-  <div>
-    <WorkgroupMobileTree
-      v-if="isMobile"
-      ref="workgroupTree"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :branch-info="branchInfo"
-      :multiple="multiple"
-      :search-field="searchField"
-      :select-workgroup-info="selectWorkgroupInfo"
-      :limit-filter-column="limitFilterColumn"
-      :separator="separator"
-      @close="result"
-    />
-    <el-dialog
-      v-else
-      :close-on-click-modal="false"
-      :title="myTitle"
-      :width="multiple ? '60%' : '40%'"
-      append-to-body
-      class="user-tree"
-      model-value
-      @close="$emit('close')"
-      @closed="$emit('closed')"
-      @open="$emit('open')"
-      @opend="$emit('opend')"
-    >
-      <inline-workgroup-tree
-        ref="workgroupTree"
-        :branch-info="branchInfo"
-        :limit-filter-column="limitFilterColumn"
-        :multiple="multiple"
-        @result="result"
-      />
-      <template v-slot:footer>
-        <div class="dialog-footer">
-          <el-button class="button--default" size="default" @click="$emit('close')">
-            {{ $t('imatrixUIPublicModel.cancel') }}
-          </el-button>
-          <el-button size="default" type="primary" @click="selectWorkgroup">
-            {{ $t('imatrixUIPublicModel.sure') }}
-          </el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
+	<div>
+		<WorkgroupMobileTree
+			v-if="isMobile"
+			ref="workgroupTree"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:branch-info="branchInfo"
+			:multiple="multiple"
+			:search-field="searchField"
+			:select-workgroup-info="selectWorkgroupInfo"
+			:separator="separator"
+			@close="result"
+		/>
+		<el-dialog
+		v-else
+				:close-on-click-modal="false"
+				:title="myTitle"
+				:width="multiple ? '60%' : '40%'"
+				append-to-body
+				class="user-tree"
+				model-value
+				@close="$emit('close')"
+				@closed="$emit('closed')"
+				@open="$emit('open')"
+				@opend="$emit('opend')"
+		>
+			<inline-workgroup-tree
+					ref="workgroupTree"
+					:branch-info="branchInfo"
+					:multiple="multiple"
+					@result="result"
+			/>
+			<template v-slot:footer>
+				<div class="dialog-footer">
+					<el-button class="button--default" size="default" @click="$emit('close')">
+						{{ $t('imatrixUIPublicModel.cancel') }}
+					</el-button>
+					<el-button size="default" type="primary" @click="selectWorkgroup">
+						{{ $t('imatrixUIPublicModel.sure') }}
+					</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { $emit } from '../../utils/gogocodeTransfer'
+import {$emit} from '../../utils/gogocodeTransfer'
 import InlineWorkgroupTree from '../../workgroup-tree-inline/src/workgroup-tree-inline.vue'
 import WorkgroupMobileTree from '../../workgroup-tree-mobile/src/workgroup-tree-app.vue'
-import { isMobileBrowser } from '../../../src/utils/common-util'
+import {isMobileBrowser} from '../../../src/utils/common-util'
 
 export default {
-  name: 'WorkgroupTree',
-  components: {
-    InlineWorkgroupTree,
-    WorkgroupMobileTree
-  },
-  props: {
-    // 是否是多选树，默认是true
-    multiple: {
-      type: Boolean,
-      default: true
-    },
-    // 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
-    branchInfo: {
-      type: Array,
-      default: null
-    },
-    // 弹框的标题
-    title: {
-      type: String,
-      default: null
-    },
-    // 弹框的宽度
-    width: {
-      type: String,
-      default: '60%'
-    },
-    // 多选部门树时，已选择部门id或部门名称或编码集合，多个之间以逗号隔开
-    selectWorkgroupInfo: {
-      type: [String, Number],
-      default: null
-    },
-    // 移除部门时，部门属性名称：id、name、code，默认是id
-    searchField: {
-      type: String,
-      default: 'code'
-    },
-    // 多选树时结果之间的分隔符，默认是逗号分隔
-    separator: {
-      type: String,
-      default: ','
-    },
-    // 根据变量限制部门时，根据部门表的哪个字段进行过滤，默认是code
-    limitFilterColumn: {
-      type: String,
-      default: 'code'
-    }
-  },
-  data() {
-    let myTitle = this.$t('imatrixUIMessage.pleaseSelectATeam')
-    if (this.title) {
-      myTitle = this.title
-    }
-    const isMobile = isMobileBrowser()
-    return {
-      myTitle,
-      isMobile
-    }
-  },
-  methods: {
-    // 工作组单选回调
-    result(selectNodeInfo) {
-      $emit(this, 'close', selectNodeInfo)
-    },
-    // 嵌入树，多选时，点击确定时调用的方法
-    selectWorkgroup() {
-      this.$refs.workgroupTree.selectWorkgroup()
-    }
-  },
-  emits: ['open', 'opend', 'close', 'closed', 'opend', 'close', 'closed']
+	name: 'WorkgroupTree',
+	components: {
+		InlineWorkgroupTree,
+		WorkgroupMobileTree
+	},
+	props: {
+		// 是否是多选树，默认是true
+		multiple: {
+			type: Boolean,
+			default: true,
+		},
+		// 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
+		branchInfo: {
+			type: Array,
+			default: null,
+		},
+		// 弹框的标题
+		title: {
+			type: String,
+			default: null,
+		},
+		// 弹框的宽度
+		width: {
+			type: String,
+			default: '60%',
+		},
+		// 多选部门树时，已选择部门id或部门名称或编码集合，多个之间以逗号隔开
+		selectWorkgroupInfo: {
+			type: [String, Number],
+			default: null
+		},
+		// 移除部门时，部门属性名称：id、name、code，默认是id
+		searchField: {
+			type: String,
+			default: 'code',
+		},
+		// 多选树时结果之间的分隔符，默认是逗号分隔
+		separator: {
+			type: String,
+			default: ','
+		}
+	},
+	data() {
+		let myTitle = this.$t('imatrixUIMessage.pleaseSelectATeam')
+		if (this.title) {
+			myTitle = this.title
+		}
+		const isMobile = isMobileBrowser()
+		return {
+			myTitle,
+			isMobile
+		}
+	},
+	methods: {
+		// 工作组单选回调
+		result(selectNodeInfo) {
+			$emit(this, 'close', selectNodeInfo)
+		},
+		// 嵌入树，多选时，点击确定时调用的方法
+		selectWorkgroup() {
+			this.$refs.workgroupTree.selectWorkgroup()
+		},
+	},
+	emits: ['open', 'opend', 'close', 'closed', 'opend', 'close', 'closed'],
 }
 </script>

package/packages/workgroup-tree-inline/src/workgroup-tree-inline.vue

@@ -177,12 +177,7 @@ export default {
 		separator: {
 			type: String,
 			default: ',',
-    },
-    // 根据变量限制部门时，根据部门表的哪个字段进行过滤，默认是code
-    limitFilterColumn: {
-      type: String,
-      default: 'code'
-    }
+		}
 	},
 	computed: {},
 	watch: {