agilebuilder-ui 1.1.47 → 1.1.48-rc1

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/super-grid.vue

@@ -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
     },
@@ -925,7 +925,7 @@ export default {
         }
       )
       if (!this.isFormSubTable) {
-        setPageInfoToChatStore(this.pageContext.menuCode, {
+        setPageInfoToChatStore(this.pageContext, {
           listRefs: [
             {
               ref: this
@@ -1666,7 +1666,7 @@ export default {
           // const subTableData = JSON.parse(JSON.stringify(this.subTableData))
           this.pagination.total = subTableData.length
           // 当前是第几页
-          let newCurrentPage = currentPage!== undefined && currentPage !== null ?currentPage: this.currentPage
+          let newCurrentPage = currentPage !== undefined && currentPage !== null ? currentPage : this.currentPage
           if (newCurrentPage === undefined || newCurrentPage === null) {
             newCurrentPage = 1
           }

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) {

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

@@ -3,7 +3,7 @@
     <el-container style="height: 395px">
       <el-aside width="430px">
         <el-container style="height: 390px">
-          <el-header style="text-align: right; font-size: 12px">
+          <el-header style="text-align: right; font-size: 12px; height: 35px">
             <el-autocomplete
               v-model="filterText"
               :fetch-suggestions="querySearch"
@@ -20,44 +20,48 @@
             </el-autocomplete>
           </el-header>
           <el-main>
-            <div
-              v-if="!searchValue"
-              style="padding-top: 5px; overflow: auto; width: auto; display: inline-block !important"
-            >
-              <el-tree
-                ref="workgroupTree"
-                :filter-node-method="filterNode"
-                :load="loadNode"
-                :props="defaultProps"
-                :show-checkbox="multiple"
-                lazy
-                node-key="id"
-                @check="handleCheckNode"
-                @node-click="handleNodeClick"
+            <template v-if="!searchValue">
+              <div
+                v-if="canShowOrgTree"
+                style="padding-top: 5px; overflow: auto; width: auto; display: inline-block !important"
               >
-                <template #default="{ node, data }">
-                  <span>
-                    <el-icon>
-                      <Menu v-if="node.data.id === -1" />
-                      <Calendar v-else />
-                    </el-icon>
-                    <span
-                      :class="
-                        data.nodeType &&
-                        data.nodeType === 'WORKGROUP' &&
-                        searchValue &&
-                        data.name.indexOf(searchValue) > -1
-                          ? 'searchResult'
-                          : ''
-                      "
-                      :title="node.label"
-                    >
-                      {{ node.label }}
+                <el-tree
+                  ref="workgroupTree"
+                  :filter-node-method="filterNode"
+                  :load="loadNode"
+                  :props="defaultProps"
+                  :show-checkbox="multiple"
+                  lazy
+                  node-key="id"
+                  @check="handleCheckNode"
+                  @node-click="handleNodeClick"
+                >
+                  <template #default="{ node, data }">
+                    <span>
+                      <el-icon>
+                        <Menu v-if="node.data.id === -1" />
+                        <Calendar v-else />
+                      </el-icon>
+                      <span
+                        :class="
+                          data.nodeType &&
+                          data.nodeType === 'WORKGROUP' &&
+                          searchValue &&
+                          data.name.indexOf(searchValue) > -1
+                            ? 'searchResult'
+                            : ''
+                        "
+                        :title="node.label"
+                      >
+                        {{ node.label }}
+                      </span>
                     </span>
-                  </span>
-                </template>
-              </el-tree>
-            </div>
+                  </template>
+                </el-tree>
+              </div>
+              <!-- 暂无信息 -->
+              <EmptyState v-else style="width: 100%; height: 100%" />
+            </template>
             <div v-if="searchValue && searchValue.length > 0" style="height: 100%; overflow: hidden">
               <workgroup-result
                 ref="workgroupResult"
@@ -116,7 +120,7 @@ import localStorage from '../../../src/utils/local-storage'
 import utils from '../../utils/utils'
 import workgroupTreeService from './workgroup-tree-service'
 import WorkgroupResult from './search-result.vue'
-
+import EmptyState from '../../empty-state/index.vue'
 export default {
   data() {
     return {
@@ -145,12 +149,14 @@ export default {
       selectWorkgroupData: null,
       // 公司根节点信息
       tenantInfo: {},
-      ElIconSearch
+      ElIconSearch,
+      canShowOrgTree: false
     }
   },
   name: 'InlineWorkgroupTree',
   components: {
-    WorkgroupResult
+    WorkgroupResult,
+    EmptyState
   },
   props: {
     // 是否是多选树，默认是true
@@ -195,6 +201,9 @@ export default {
     }
   },
   created() {
+    utils.canShowOrgTree().then((showOrgTree) => {
+      this.canShowOrgTree = showOrgTree
+    })
     if (this.multiple) {
       this.initSelectGroups(this.searchField, this.selectGroupInfo, this.separator).then((selectGroups) => {
         if (selectGroups) {
@@ -537,7 +546,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 .searchResult {
   color: red;
 }

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

@@ -43,7 +43,9 @@
       </el-row>
     </el-card>
     <el-card class="card-content org-tree" style="overflow: auto">
+      <el-empty v-if="!departments.length" :image="noMessageImage"> </el-empty>
       <el-tree
+        v-else
         ref="orgTreeRef"
         :data="departments"
         :show-checkbox="multiple"
@@ -63,14 +65,14 @@
         </template>
       </el-tree>
     </el-card>
-    <el-card class="card-footer" style="height: 40px">
+    <el-card class="card-footer">
       <div style="display: flex">
         <div class="select-result" @click="showResult">
           <!-- 已选择:6人,其中有一个部门(含子部门) -->
           <span v-if="multiple" @click="showResult">
             <span v-if="selectDepts.length > 0">
               {{ $t('departmentTreeInline.selectResultInfoHasSelect')
-              }}{{ $t('departmentTreeInline.workgroupTree', { num: selectDepts.length }) }}
+              }}{{ $t('workgroupTree.selectResultInfo', { num: selectDepts.length }) }}
               <span style="padding-left: 10px"
                 ><el-icon><ArrowUpBold /></el-icon
               ></span>
@@ -97,6 +99,8 @@ import { resizeScrollTargetHeightUtil, getDeptNamePath } from '../../utils/organ
 import deptResult from './dept-result.vue'
 import { ElMessage } from 'element-plus'
 import { useI18n } from 'vue-i18n'
+import utils from '../../utils/utils'
+import noMessageImage from '../../../src/assets/nonemessage.png'
 const props = defineProps<{
   // 是否是多选树，默认是true
   multiple: {
@@ -149,6 +153,7 @@ let searchParam = ref({
   departmentInfo: null
 })
 const { t } = useI18n()
+
 onMounted(() => {
   initSelectGroups(props.searchField, props.selectWorkgroupInfo, props.separator).then((departments) => {
     selectDepts.value = departments
@@ -167,9 +172,15 @@ function getTenantInfo() {
 }
 
 function getTenantChildrenDept() {
-  getTenantChildren(props.branchInfo, tenantNodeId).then((children) => {
-    departments.value = children
-    checkedDeptDefault(selectDepts.value, defaultCheckedKeys.value)
+  utils.canShowOrgTree().then((showOrgTree) => {
+    if (showOrgTree) {
+      getTenantChildren(props.branchInfo, tenantNodeId).then((children) => {
+        departments.value = children
+        checkedDeptDefault(selectDepts.value, defaultCheckedKeys.value)
+      })
+    } else {
+      departments.value = []
+    }
   })
 }
 

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

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

package/packages/workgroup-user-tree-inline/src/workgroup-tree-inline-service.js

@@ -132,27 +132,29 @@ const workgroupTreeInlineService = {
       .then((data) => {
         resolve(data)
         // 更新当前点击的节点的子节点
-        this.$refs.workgroupUserTree.updateKeyChildren(parentNodeId, data)
-        if (parentId === 0) {
-          // 初始化树时，展开公司节点
-          const tenantData = data[0].data
-          this.tenantInfo = JSON.parse(tenantData)
-          this.containBranch = data[0].containBranch
-          // 加载整个组织结构树时，展开公司节点
-          this.loadWorkgroup(this.tenantNodeId, this.tenantNodeId + '')
-        }
-        if (this.isClickNode) {
-          // 表示点击工作组节点选中时展开
-          this.isClickNode = false
-          this.checkedNode(node.data)
-        } else {
-          // 表示是点击三角展开节点时
-          if (checkedKeys && checkedKeys.indexOf(parentNodeId) > -1) {
-            // 点击公司名称前的三角标识展开节点时，保持当前节点的选中状态
-            // 表示当前展开的节点是选中状态，则应保持其选中状态，并选中其子节点
-            this.checkedNode(node.data)
+          if (this.$refs.workgroupUserTree) {
+            this.$refs.workgroupUserTree.updateKeyChildren(parentNodeId, data)
+            if (parentId === 0) {
+              // 初始化树时，展开公司节点
+              const tenantData = data[0].data
+              this.tenantInfo = JSON.parse(tenantData)
+              this.containBranch = data[0].containBranch
+              // 加载整个组织结构树时，展开公司节点
+              this.loadWorkgroup(this.tenantNodeId, this.tenantNodeId + '')
+            }
+            if (this.isClickNode) {
+              // 表示点击工作组节点选中时展开
+              this.isClickNode = false
+              this.checkedNode(node.data)
+            } else {
+              // 表示是点击三角展开节点时
+              if (checkedKeys && checkedKeys.indexOf(parentNodeId) > -1) {
+                // 点击公司名称前的三角标识展开节点时，保持当前节点的选中状态
+                // 表示当前展开的节点是选中状态，则应保持其选中状态，并选中其子节点
+                this.checkedNode(node.data)
+              }
+            }
           }
-        }
       })
   },
   // 加载当前节点的子节点
@@ -164,9 +166,11 @@ const workgroupTreeInlineService = {
     this.$http
       .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/workgroup-users', param)
       .then((children) => {
-        this.$refs.workgroupUserTree.updateKeyChildren(parentNodeId, children)
-        if (this.$refs.workgroupUserTree.store.nodesMap[parentNodeId]) {
-          this.$refs.workgroupUserTree.store.nodesMap[parentNodeId].expanded = true
+        if(this.$refs.workgroupUserTree) {
+          this.$refs.workgroupUserTree.updateKeyChildren(parentNodeId, children)
+          if (this.$refs.workgroupUserTree.store.nodesMap[parentNodeId]) {
+            this.$refs.workgroupUserTree.store.nodesMap[parentNodeId].expanded = true
+          }
         }
         if (isSearch) {
           // 查询时处理
@@ -176,7 +180,9 @@ const workgroupTreeInlineService = {
           }
           if (this.allExpandNodeIds.length === this.allSearchNodeIds.length) {
             // 表示所有节点已展开，执行树的过滤方法
-            this.$refs.workgroupUserTree.filter(searchValue)
+            if(this.$refs.workgroupUserTree) {
+                this.$refs.workgroupUserTree.filter(searchValue)
+            }
             this.allExpandNodeIds = []
             this.allSearchNodeIds = []
           }