agilebuilder-ui 1.1.46 → 1.1.48-rc1

package/packages/super-grid/src/custom-formatter.js

@@ -1,5 +1,5 @@
 import { $emit } from '../../utils/gogocodeTransfer'
-import { doFormat } from './formatter'
+import { doFormat, formatDateTime } from './formatter'
 import store from './store'
 import { initialization, jumpToPage } from '../../../src/utils/jump-page-utils'
 import { analysisFileSetObj, otherFilesToStandard } from './utils'
@@ -198,9 +198,10 @@ const customFormatter = {
       jumpPageJson = column.formatter.options.format
     }
     if (jumpPageJson && jumpPageJson !== '') {
+      const jumpPageJsonObject = JSON.parse(jumpPageJson)
       // 解析是否需要显示该超链接
       const result = initialization(
-        JSON.parse(jumpPageJson),
+        jumpPageJsonObject,
         row,
         isSql,
         additionalParamerter,
@@ -227,6 +228,18 @@ const customFormatter = {
       hyperLinkResult.label = this.objectPropValueTwo(row, column)
       hyperLinkResult.title = hyperLinkResult.label
     }
+    if (hyperLinkResult.jumpPageItem) {
+      const jumpSetting = hyperLinkResult.jumpPageItem.jumpPageSetting
+      if (jumpSetting && jumpSetting.displayTextFormatType && jumpSetting.displayTextFormat) {
+        const formatValue = formatDateTime(
+          jumpSetting.displayTextFormatType,
+          hyperLinkResult.label,
+          jumpSetting.displayTextFormat
+        )
+        hyperLinkResult.label = formatValue
+        hyperLinkResult.title = formatValue
+      }
+    }
     return hyperLinkResult
   },
   // 点击超链接

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

@@ -1,7 +1,9 @@
 <template>
   <div
     v-if="type && type.indexOf('custom:') >= 0 && componentName != ''"
-    :style="row.validateErrorField && row.validateErrorField === column.prop ? 'border:1px solid red' : ''"
+    :class="
+      !this.isFormSubTable && row.validateErrorField && row.validateErrorField === column.prop ? 'required_bg' : ''
+    "
   >
     <component
       :is="componentName"
@@ -26,7 +28,12 @@
       @input="cellEvent('input', $event)"
     />
   </div>
-  <div v-else :style="row.validateErrorField && row.validateErrorField === column.prop ? 'border:1px solid red' : ''">
+  <div
+    v-else
+    :class="
+      !this.isFormSubTable && row.validateErrorField && row.validateErrorField === column.prop ? 'required_bg' : ''
+    "
+  >
     <!--必须有@input ,否则无法输入值-->
     <el-date-picker
       v-if="type === 'year' || type === 'month' || type === 'week'"
@@ -293,6 +300,7 @@
       @delete="deleteFile"
       @delete-success="deleteSuccess"
       @upload-success="uploadOnSuccess"
+      @on-error="onError"
     />
     <multipart-upload
       v-else-if="type === 'multipartUpload'"
@@ -713,7 +721,6 @@ export default {
       newValue: null,
       // disabled, // 当前用户是否禁止编辑该字段/ 是否新增行
       componentName: '',
-      validateErrorField: '', // 保存行记录时，验证失败的字段名
       annexUploadFlag: false,
       defaultAction,
       fileMultiple: false, // 文件是否多选
@@ -768,7 +775,8 @@ export default {
       colConfigure, // v10字段配置原信息
       designProperty, // 字段配置
       myCustomParams: {},
-      systemCode
+      systemCode,
+      isFormSubTable: false // 是否是表单子表
     }
   },
   computed: {},
@@ -816,6 +824,9 @@ export default {
   },
   created() {
     const gridParams = store.get(this.listCode)
+    if (gridParams && gridParams.options && gridParams.options.isFormSubTable) {
+      this.isFormSubTable = gridParams.options.isFormSubTable
+    }
     if (this.controlConfig?.customParams) {
       if (!this.pageContext) {
         this.pageContext = gridParams.options.pageContext
@@ -1111,6 +1122,7 @@ export default {
           val = null
         }
         $emit(this, 'update:value', val)
+        this.clearValidateErrorField()
         isInputVal = true
         // 在callCustomEvent方法中使用了innerValue属性
         this.innerValue = val
@@ -1127,9 +1139,11 @@ export default {
           if (this.innerValue.indexOf(saveAll) < 0) {
             // 不包含“全选”时才走input，全选是在multiselectchange中特殊处理的
             $emit(this, 'update:value', this.innerValue.join(','))
+            this.clearValidateErrorField()
           }
         } else {
           $emit(this, 'update:value', this.innerValue)
+          this.clearValidateErrorField()
         }
         isInputVal = true
       } else if (eventName === 'input' && isInputEventUpdateValue !== undefined && isInputEventUpdateValue === true) {
@@ -1137,6 +1151,7 @@ export default {
         // 在callCustomEvent方法中使用了innerValue属性
         this.innerValue = event
         $emit(this, 'update:value', event)
+        this.clearValidateErrorField()
         isInputVal = true
       } else if (eventName === 'blur' && !this.isSelectControll()) {
         // 为了使输入时流畅，所以在blur时调用input，更改组件的数据
@@ -1193,9 +1208,16 @@ export default {
       }
       // 必须这样调用input事件 ,否则组件无法输入值
       $emit(this, 'update:value', this.innerValue) // 现在的用法
+      this.clearValidateErrorField()
       // 扫描组件时监控值变化
       this.watchScanValueChange(this.innerValue)
     },
+    // 清空单元格必填样式
+    clearValidateErrorField() {
+      if (this.row.validateErrorField) {
+        this.row.validateErrorField = undefined
+      }
+    },
     // 是否是输入框
     isInputControl() {
       return this.type === 'input' || this.type === 'textarea'
@@ -2075,6 +2097,26 @@ export default {
       } else {
         this.departmentInfo = []
       }
+    },
+    onError(error) {
+      console.error('Upload error:', error)
+      if (error.message) {
+        let message = JSON.parse(error.message)
+        if (message && message.message) {
+          message = JSON.parse(message.message)
+        }
+        this.$message({
+          type: 'error',
+          message: message,
+          showClose: true
+        })
+      } else {
+        this.$message({
+          type: 'error',
+          message: this.$t('fsUpload.uploadFailed'),
+          showClose: true
+        })
+      }
     }
   }
 }

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

@@ -179,7 +179,7 @@ export function doFormatWithValueSet(column, value) {
           label.push(item[0].label)
         }
       })
-      if(label.length > 0){
+      if (label.length > 0) {
         value = label.join(',')
       }
     } else {
@@ -194,3 +194,7 @@ export function doFormatWithValueSet(column, value) {
   }
   return value
 }
+
+export function formatDateTime(type, value, format) {
+  return formatter[type](value, { format: format })
+}

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

@@ -34,7 +34,7 @@
       @change-required="changeRequired"
       @open-page="openPageEvent"
     />
-    <div v-else class="column-text-main">
+    <div v-else :class=" (options?.configureObj?.props?.base?.columnEditable ?? false) ? 'column-text-main' : ''">
       <div
         v-if="
           lineEdit.editable &&
@@ -147,7 +147,7 @@
           columnFormatter.options.format &&
           columnFormatter.options.format !== ''
         "
-        :class="isShowForm ? '' : 'cell--span'"
+        :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
       >
         <!--:key="column.prop+'_'+rowIndex+'_'+currentPage" 为了解决子表分页时，新增自动跳转到下一页，第一条记录的自定义控件被复用，导致业务逻辑没执行 -->
         <component
@@ -172,7 +172,7 @@
           :component-id="componentId"
           :additional-settings="additionalSettings"
           :page-context="options?.pageContext"
-          :custom-params="controlConfig ? controlConfig.customParams : null"
+          :custom-params="getCustomParams()"
           @prohibitToEdit="prohibitToEdit"
           @refresh-list="refreshList"
       /></span>
@@ -221,12 +221,7 @@
             @click="clickHyperLink(column, row, listCode, rowIndex)"
         > -->
         <el-link
-          v-else-if="
-            columnFormatter !== undefined &&
-            columnFormatter.type !== undefined &&
-            columnFormatter.type === 'hyperlinks' &&
-            getMyHyperLinkSetting(row, rowIndex).visible === true
-          "
+          v-else-if="columnFormatter?.type === 'hyperlinks' && linkObject.visible === true"
           :type="getLinkType(row)"
           @click="clickHyperLink(column, row, listCode, rowIndex)"
         >
@@ -234,20 +229,14 @@
             v-if="isShowOverflowTooltip"
             :id="column.prop + 'DomData' + rowIndex"
             :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
-            :title="getMyHyperLinkSetting(row, rowIndex).title"
+            :title="linkObject.title"
             :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
-            >{{ getMyHyperLinkSetting(row, rowIndex).label }}
-            <SuperIcon
-              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
-              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
-            ></SuperIcon>
+            >{{ linkObject.label }}
+            <SuperIcon v-if="linkObject.icon" :iconValue="linkObject.icon"></SuperIcon>
           </span>
           <span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'"
-            >{{ getMyHyperLinkSetting(row, rowIndex).label }}
-            <SuperIcon
-              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
-              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
-            ></SuperIcon>
+            >{{ linkObject.label }}
+            <SuperIcon v-if="linkObject.icon" :iconValue="linkObject.icon"></SuperIcon>
           </span>
         </el-link>
         <span
@@ -307,12 +296,7 @@
         </span>
         <!-- 超链接 -->
         <el-link
-          v-else-if="
-            columnFormatter !== undefined &&
-            columnFormatter.type !== undefined &&
-            columnFormatter.type === 'hyperlinks' &&
-            getMyHyperLinkSetting(row, rowIndex).visible === true
-          "
+          v-else-if="columnFormatter?.type === 'hyperlinks' && linkObject.visible"
           type="primary"
           @click="clickHyperLink(column, row, listCode, rowIndex)"
         >
@@ -320,20 +304,14 @@
             v-if="isShowOverflowTooltip"
             :id="column.prop + 'DomData' + rowIndex"
             :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
-            :title="$escapeHtml(getMyHyperLinkSetting(row, rowIndex).title)"
+            :title="$escapeHtml(linkObject.title)"
             :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
-            >{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
-            <SuperIcon
-              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
-              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
-            ></SuperIcon>
+            >{{ $escapeHtml(linkObject.label) }}
+            <SuperIcon v-if="linkObject.icon" :iconValue="linkObject.icon"></SuperIcon>
           </span>
           <span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'"
-            >{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
-            <SuperIcon
-              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
-              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
-            ></SuperIcon>
+            >{{ $escapeHtml(linkObject.label) }}
+            <SuperIcon v-if="linkObject.icon" :iconValue="linkObject.icon"></SuperIcon>
           </span>
         </el-link>
         <!-- 富文本 -->
@@ -554,7 +532,8 @@ export default {
       requiredClass: '',
       lineEdit,
       options,
-      textOverflow
+      textOverflow,
+      linkObject: {}
     }
   },
   computed: {
@@ -707,6 +686,9 @@ export default {
     }
     this.setScanRuleSets()
     this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried column-text-main' : ''
+    if (this.columnFormatter?.type === 'hyperlinks') {
+      this.linkObject = this.getMyHyperLinkSetting(this.row, this.rowIndex)
+    }
   },
   mounted() {
     if (this.controlConfig) {
@@ -1280,6 +1262,16 @@ export default {
         }
       }
       return true
+    },
+    getCustomParams() {
+      if (this.column.formatter.type === 'customControl') {
+        if (this.column.formatter?.options?.controlConfig) {
+          const controlConfig = JSON.parse(this.column.formatter.options.controlConfig)
+          if (controlConfig && controlConfig.customParams) {
+            return formatCustomParams(controlConfig.customParams, this.options?.pageContext, this.row)
+          }
+        }
+      }
     }
   },
   emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']

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

@@ -49,6 +49,8 @@
         :row-index="scope.$index"
         :line-edit="lineEdit"
         :custom-format="customFormat"
+        :class="isValidateError(scope.row,scope.$index)?'required_bg required-corner':''"
+        :style="isValidateError(scope.row,scope.$index)?'display:block;':''"
         @open-page="openPageEvent"
         @refresData="refresData"
         @refresh-list="refreshList"
@@ -60,7 +62,6 @@
     </template>
   </el-table-column>
 </template>
-
 <script>
 import { CirclePlus, ZoomIn as ElIconZoomIn } from '@element-plus/icons-vue'
 import { $emit, $off, $on } from '../../utils/gogocodeTransfer'
@@ -77,6 +78,7 @@ import RichEditorViewer from '../../rich-editor/viewer.vue'
 import GridIcon from './components/grid-icon.vue'
 import NormalColumnContent from './normal-column-content.vue'
 import eventBus from './eventBus'
+// border:1px solid red;padding: 10px; 
 export default {
   components: {
     DynamicInput,
@@ -359,6 +361,11 @@ export default {
     openPageEvent(openPageParams) {
       console.log('normalColumn----openPageEvent----', openPageParams)
       this.$emit('open-page', openPageParams)
+    },
+    isValidateError(row,rowIndex) {
+      // const gridParams = store.get(this.listCode)
+      console.log('row.validateErrorField-----',row)
+      return this.isFormSubTable && row && row['validateErrorField'] && row['validateErrorField'] === this.column.prop
     }
   },
   emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']

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

@@ -226,7 +226,7 @@ import { checkPermission } from '../../../src/utils/permission'
 import { getGuId } from '../../../src/utils/guid.js'
 // import resizeMixin from '../../../src/mixins/resizeMixin.js';
 import storeVuex from '../../../src/store'
-
+import { setPageDataToChatAiStore, setPageInfoToChatStore } from '../../../src/utils/chat-ai-util.ts'
 export default {
   components: {
     IndexColumn,
@@ -460,7 +460,7 @@ export default {
     // 限制高度最低值
     hasMaxHeight() {
       if (this.maxHeight) {
-        return this.maxHeight <= 100 ? 100 : this.maxHeight + (this.heightOffset!==0?this.heightOffset:30)
+        return this.maxHeight <= 100 ? 100 : this.maxHeight + (this.heightOffset !== 0 ? this.heightOffset : 30)
       }
       return undefined
     },
@@ -468,7 +468,7 @@ export default {
     // 是指固定高度最低值
     hasTableHeight() {
       if (this.tableHeight) {
-        return this.tableHeight <= 100 ? 100 : this.tableHeight + (this.heightOffset!==0?this.heightOffset:30)
+        return this.tableHeight <= 100 ? 100 : this.tableHeight + (this.heightOffset !== 0 ? this.heightOffset : 30)
       }
       return undefined
     },
@@ -924,6 +924,16 @@ export default {
           deep: true
         }
       )
+      if (!this.isFormSubTable) {
+        setPageInfoToChatStore(this.pageContext, {
+          listRefs: [
+            {
+              ref: this
+            }
+          ],
+          pageType: 'list'
+        })
+      }
     })
   },
   beforeDestroy() {
@@ -1649,16 +1659,16 @@ export default {
       }
       return isCanRefreshTableData
     },
-    getSubTableGridData(subTableData) {
+    getSubTableGridData(subTableData, currentPage) {
       let gridData = subTableData
       if (this.isSubTableShowPage === true) {
         if (subTableData && subTableData.length > 0) {
           // const subTableData = JSON.parse(JSON.stringify(this.subTableData))
           this.pagination.total = subTableData.length
           // 当前是第几页
-          let currentPage = this.currentPage
-          if (currentPage === undefined || currentPage === null) {
-            currentPage = 1
+          let newCurrentPage = currentPage !== undefined && currentPage !== null ? currentPage : this.currentPage
+          if (newCurrentPage === undefined || newCurrentPage === null) {
+            newCurrentPage = 1
           }
           // 每页显示多少条记录
           let pageSize = this.pageSize
@@ -1669,7 +1679,7 @@ export default {
             pageSize = 20
           }
           // 当前页的第一条记录的数组下标
-          const startRowIndex = (currentPage - 1) * pageSize
+          const startRowIndex = (newCurrentPage - 1) * pageSize
           // 当前页的最后一条记录的数组下标
           let lastRowIndex = startRowIndex + pageSize
           if (subTableData.length > startRowIndex) {
@@ -2380,13 +2390,13 @@ export default {
         this.changePage()
       }
     },
-    changePage() {
+    changePage(currentPage) {
       console.log('点击了分页')
       // 翻页操作会导致筛选项发生变化，所以需要清空已有的
       this.$refs.superGrid?.clearFilter()
       // TODO: 把当前页数、每页条数、查询条件、排序信息传回后台
       if (this.isSubTableShowPage) {
-        this.gridData = this.getSubTableGridData(this.subTableData)
+        this.gridData = this.getSubTableGridData(this.subTableData, currentPage)
         const gridParams = store.get(this.code)
         gridParams.gridData = this.gridData
         // 完成深拷贝，复制一份对象，行编辑时使用
@@ -3222,6 +3232,9 @@ export default {
         //   this.$refs.superGrid?.toggleRowSelection(newSelection[newSelection.length - 1], false)
         // }
       }
+      if (!this.isFormSubTable) {
+        setPageDataToChatAiStore(newSelection)
+      }
       this.selectionChange(newSelection)
     },
     // 显示移动端查询区域

package/packages/utils/utils.js

@@ -1,30 +1,31 @@
 import { getI18n } from '../../src/utils/util'
 import * as Vue from 'vue'
+import { cacheCanShowOrgTree, getCanShowOrgTree } from '../../src/utils/global-prop.js'
 const utils = {
   getSearchUserFields() {
     const i18n = getI18n()
     return [
       {
         value: 'name',
-        label: i18n.t('departmentUserTree.searchFieldUserName'),
+        label: i18n.t('departmentUserTree.searchFieldUserName')
       },
       {
         value: 'loginName',
-        label: i18n.t('departmentUserTree.searchFieldLoginName'),
+        label: i18n.t('departmentUserTree.searchFieldLoginName')
       },
       { value: 'email', label: i18n.t('departmentUserTree.searchFieldEmail') },
       {
         value: 'telephone',
-        label: i18n.t('departmentUserTree.searchFieldTelephone'),
+        label: i18n.t('departmentUserTree.searchFieldTelephone')
       },
       {
         value: 'jobNumber',
-        label: i18n.t('departmentUserTree.searchFieldJobNumber'),
+        label: i18n.t('departmentUserTree.searchFieldJobNumber')
       },
       {
         value: 'honorificName',
-        label: i18n.t('departmentUserTree.searchFieldHonorificName'),
-      },
+        label: i18n.t('departmentUserTree.searchFieldHonorificName')
+      }
     ]
   },
   removeRow(arr, row) {
@@ -70,9 +71,7 @@ const utils = {
   },
   createFilter(queryString) {
     return (restaurant) => {
-      return (
-        restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
-      )
+      return restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
     }
   },
   handleSelectUtil(item, localStorage) {
@@ -176,5 +175,24 @@ const utils = {
       }
     })
   },
+  canShowOrgTree() {
+    return new Promise((resolve, reject) => {
+      const cacheShowOrgTree = getCanShowOrgTree()
+      if (cacheShowOrgTree === 'false' || cacheShowOrgTree === 'true') {
+        let showOrgTree = cacheShowOrgTree === 'true'
+        resolve(showOrgTree)
+      } else {
+        window.$http
+          .get(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/show-org-tree')
+          .then((canshow) => {
+            cacheCanShowOrgTree(canshow)
+            resolve(canshow)
+          })
+          .catch((error) => {
+            resolve(false)
+          })
+      }
+    })
+  }
 }
 export default utils

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

@@ -162,7 +162,8 @@ export default {
 		},
 		// 添加工作组
 		addWorkgroup(index, row) {
-			$emit(this, 'addWorkgroup', index, row)
+			// JSON.parse(JSON.stringify(row)) 转换对象是为了解决添加数据时浏览器崩溃
+            $emit(this, 'addWorkgroup', index, JSON.parse(JSON.stringify(row)))
 		},
 		// 选中工作组
 		selectWorkgroup(selectVal) {