agilebuilder-ui 1.1.35 → 1.1.36-sit1

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

@@ -581,11 +581,15 @@ export default {
       if (gridParams && gridParams.options && gridParams.options.rowKeyProp) {
         return gridParams.options.rowKeyProp
       } else {
-        if (this.dataSourceType === 'oracle') {
-          return 'ID'
-        } else {
-          return 'id'
-        }
+        // 使用rowDataGuId作为唯一标识，解决台账显示或不显示id。
+        // 大小写、或（子表时id还不存在问题，导致行选择和push新数据后 3行数据，
+        // 在第二行插入数据，因为key问题3、4行数据变成一样的)
+        return '$rowDataGuId'
+        // if (this.dataSourceType === 'oracle') {
+        //   return 'ID'
+        // } else {
+        //   return 'id'
+        // }
       }
     },
     filterGridData() {
@@ -630,15 +634,12 @@ export default {
     tableDatas: {
       deep: true,
       immediate: true,
-      handler(a, b) {
-        console.log('SGQ --- 表格监听数据修改============================》', a, b)
-      }
+      handler(a, b) {}
     },
     'options.SuperGrid': {
       deep: true,
       handler: function () {
         this.externalClickFlag = true
-        console.log('监听到数据改变')
         this.initSetting()
         this.initialize()
       }
@@ -714,7 +715,6 @@ 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,7 +746,6 @@ 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)
       }
@@ -937,7 +936,6 @@ 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
@@ -994,19 +992,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 ||
@@ -1037,16 +1035,6 @@ export default {
             this.tableHeight = undefined
           }
         }
-        console.log(
-          'resizeTableHeight-----tempMaxHeight=',
-          tempMaxHeight,
-          'this.tableHeight=',
-          this.tableHeight,
-          'this.maxHeight=',
-          this.maxHeight,
-          'gridParams.options=',
-          gridParams.options
-        )
       })
     },
     // 回车键
@@ -1556,7 +1544,6 @@ export default {
             // 子表无记录时不需要刷新子表记录。表示是新建或修改时子表无记录，且不需要刷新子表。
             if (this.isSubTableEmpty(gridParams)) {
               // 表示是新建表单时，子表记录集合是空数组
-              console.log('子表无记录----code=', this.code, gridParams)
               const subTableData = []
               this.packageSubTableData(gridParams, subTableData)
             }
@@ -2180,7 +2167,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 &&
@@ -2188,18 +2175,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)
@@ -2344,8 +2331,6 @@ 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() {
@@ -2356,7 +2341,6 @@ export default {
     },
     handleSizeChange(val) {
       if (!this.options || !this.options.isPageShow) {
-        // console.log(`每页 ${val} 条`)
         this.currentPage = 1
         this.pageSize = val
         this.pagination.pageSize = val
@@ -2839,7 +2823,6 @@ 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模式
@@ -2849,7 +2832,6 @@ 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
@@ -2880,7 +2862,6 @@ 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)
@@ -2895,7 +2876,6 @@ export default {
       this.rowDblClick(row, column, event)
     },
     rowDbClickEditRow(gridParams, row) {
-      console.log('rowDbClickEditRow+++++++++++++++++++', gridParams, row)
       // 取消上一行的编辑状态
       let editRows
       if (this.isSubTableShowPage) {
@@ -3353,6 +3333,35 @@ 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,9 +264,14 @@ 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
         }
       }
@@ -565,7 +570,6 @@ 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
@@ -755,7 +759,18 @@ export function getDynamicDataSourceOptions(column, isSql, additionalParamMap, b
 
 // 值设置是否是动态数据源类型的数据源
 export function isDynamicDataSourceSource(column) {
+  if (column.valueSetOptions) {
+    const valueSetOptionsObj = JSON.parse(column.valueSetOptions)
+    if (
+      (valueSetOptionsObj.type && valueSetOptionsObj.type === 'dynamicData') ||
+      valueSetOptionsObj.dynamicDataSourceCode
+    ) {
+      // 表示是动态数据源
+      return true
+    }
+  }
   if (column.valueSet && column.valueSet.length > 0 && column.valueSet[0].value === 'dynamicDataSource') {
+    // 表示是动态数据源
     return true
   } else {
     return false
@@ -774,10 +789,8 @@ 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

@@ -1,10 +1,10 @@
 <template>
   <i v-if="iconValue.indexOf('amb-icon-') === 0" class="amb-iconfont" :class="iconValue" />
-  <i v-else-if="iconValue.indexOf('amb-color-icon-') === 0" class="amb-color-iconfont" :class="iconValue" />
+  <i v-else-if="iconValue.indexOf('amb-color-icon-') === 0" class="amb-color-iconfont super-icon" :class="iconValue" />
   <i v-else-if="iconValue.indexOf('fa-') === 0" :class="'fa ' + iconValue" />
   <img
     v-else-if="iconValue.indexOf('svg-img-') === 0"
-    :src="defaultShowImageAction + iconValue.substring('svg-img-'.length)"
+    :src="defaultShowSvgAction + iconValue"
     style="width: 1em; height: 1em"
   />
   <SvgIcon v-else-if="iconValue.indexOf('svg-') === 0" :icon-class="iconValue.substring('svg-'.length)" />
@@ -39,4 +39,13 @@ 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 {
+ width: 14px;
+ height: 14px;
+}
+</style>

package/packages/utils/value-set.js

@@ -1,8 +1,19 @@
 import * as Vue from 'vue'
+import { isPlateSys } from '../../src/utils/common-util'
+
+export function packageEnumAndBeanColumnValueSets(columns, listCode, additionalParamMap, entity) {
+  if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
+    // 平台系统时，beanName和枚举类型时
+    return packageEnumAndBeanColumnValueSetsWhenPlate(columns, listCode)
+  } else {
+    // 业务系统时，获得选项配置
+    return packageEnumAndBeanColumnValueSetsWhenOtherSys(columns, listCode, additionalParamMap, entity)
+  }
+}
 /**
  * 封装值设置为枚举 或 bean方式时的值为'key-value'键值对信息
  */
-export function packageEnumAndBeanColumnValueSets(columns, listCode) {
+function packageEnumAndBeanColumnValueSetsWhenPlate(columns, listCode) {
   return new Promise((resolve, reject) => {
     const valueSetColumnsInfo = {
       listCode: listCode,
@@ -95,3 +106,138 @@ function packageEnumAndBeanColumnValueSet(valueSetInfo) {
     return BEAN_NAME_PREFIX + beanName
   }
 }
+
+/**
+ * 封装值设置为枚举 或 bean方式时的值为'key-value'键值对信息
+ */
+function packageEnumAndBeanColumnValueSetsWhenOtherSys(columns, listCode, additionalParamMap, entity, systemCode) {
+  return new Promise((resolve, reject) => { 
+    const dataSourceList = getDataSourceConfigList(columns)
+    const valueSetColumnIndexs = dataSourceList.valueSetColumnIndexs
+    const param = {
+      listCode: listCode,
+      entityMap: entity,
+      additionalParamMap: additionalParamMap,
+      dataSourceList: dataSourceList.dataSourceConfigList,
+      dataSourceListTitle: dataSourceList.dataSourceConfigListTitle,
+      systemCode: systemCode
+    }
+    const url = window.$vueApp.config.globalProperties.baseURL + '/common/common-data/find-grid-datas'
+    //const url = window['$vueApp'].config.globalProperties.baseAPI + '/common/common-data/xxxx'
+    window.$vueApp.config.globalProperties.$http
+      .post(url, param)
+      .then((result) => {
+        const columnValueSet = result.columnValueSet
+        const columnTitleValueSet = result.columnTitleValueSet
+        for(let prop in valueSetColumnIndexs){
+          const columnIndex = valueSetColumnIndexs[prop]
+          const valueSet = columnValueSet[prop]
+          if (valueSet) {
+            columns[columnIndex].valueSet = valueSet
+          }
+          const valueSetTitle = columnTitleValueSet[prop]
+          if (valueSetTitle) {
+            columns[columnIndex].titleValueSetValue = valueSetTitle
+          }
+        }
+        console.log('查询选项数据完成', result)
+        resolve(result)
+      })
+      .catch((error) => {
+        console.log('查询选项数据失败', error)
+        //失败时
+        reject(error)
+      })
+  })
+}
+
+function getDataSourceConfigList(columns) {
+  const dataSourceConfigList = []
+  const dataSourceConfigListTitle = []
+  const valueSetColumnIndexs = {}
+  for (let i = 0; i < columns.length; i++) {
+    const column = columns[i]
+    const prop = column.prop ? column.prop : column.label
+    const columnValueSet = getConfigWithValueSet(column, prop, column)
+    let titleValueSet = null
+    const titleValueSetJson = column.titleValueSet
+    if (titleValueSetJson) {
+      titleValueSet = getConfigWithValueSet(JSON.parse(titleValueSetJson), prop)
+    }
+    if (columnValueSet || titleValueSet) {
+      if (columnValueSet) {
+        // 字段的值设置
+        dataSourceConfigList.push(columnValueSet)
+      }
+      if (titleValueSet) {
+        dataSourceConfigListTitle.push(titleValueSet)
+      }
+      valueSetColumnIndexs[prop] = i
+    }
+  }
+  return {dataSourceConfigList, dataSourceConfigListTitle, valueSetColumnIndexs}
+}
+
+function getConfigWithValueSet(valueSetInfo, prop, column) {
+  /**
+   * 枚举类型值设置前缀
+   */
+  const ENUM_NAME_PREFIX = 'enumname:'
+  /**
+   * bean形式值设置前缀
+   */
+  const BEAN_NAME_PREFIX = 'beanname:'
+  const enumName = valueSetInfo.enumName
+  const beanName = valueSetInfo.beanName
+  let infoObj = {
+    uuid: prop
+  }
+  // 选项组的在解析列表字段配置时就获得了，不需要在此处获得了
+  if (enumName && enumName !== '') {
+    if (valueSetInfo.remoteEnum === true) {
+      // 需要远程获得枚举值
+      infoObj.type = 'enumName'
+      infoObj.props = {
+        prop: prop,
+        valueSet: ENUM_NAME_PREFIX + enumName
+      }
+    }
+  } else if (beanName && beanName !== '') {
+      infoObj.type = 'beanName'
+      infoObj.props = {
+        prop: prop,
+        valueSet: BEAN_NAME_PREFIX + beanName
+      }
+  }else if(column && column.valueSetOptions) {
+    // 动态数据源、数据表/视图、服务
+    const valueSetOptionsObj = JSON.parse(column.valueSetOptions)
+    if((valueSetOptionsObj.type || valueSetOptionsObj.dynamicDataSourceCode) && valueSetOptionsObj.valueLabelSwitch){
+      // 表示是动态数据源等值设置信息
+      // const isShouldInitSearch = (valueSetOptionsObj.filterType === undefined || valueSetOptionsObj.filterType != 'remote')
+      if(!valueSetOptionsObj.type || valueSetOptionsObj.type !== 'optionGroup'){
+        // 选项组时不需要在此处获得
+        Object.assign(infoObj, valueSetOptionsObj)
+        // 更新uuid为字段名
+        infoObj.uuid = prop
+        if(!infoObj.props){
+          infoObj.props = {}
+        }
+        infoObj.props.prop = prop
+      }
+      if(valueSetOptionsObj.dynamicDataSourceCode){
+        infoObj.type = 'dynamicData'
+        if(!infoObj.props){
+          infoObj.props = {}
+        }
+        infoObj.props.code = valueSetOptionsObj.dynamicDataSourceCode
+      }
+    }
+  }
+  if(infoObj.type){
+    // 表示是有效的值设置
+    return infoObj
+  }
+  return null
+}
+
+