agilebuilder-ui 1.1.46-sit1 → 1.1.46-sit2

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

@@ -21,41 +21,45 @@
             </el-autocomplete>
           </el-header>
           <el-main style="padding: 10px">
-            <div
-              v-if="!searchValue"
-              style="padding-top: 5px; overflow: auto; width: auto; display: inline-block !important"
-            >
-              <el-tree
-                ref="workgroupUserTree"
-                :filter-node-method="filterNode"
-                :load="loadNode"
-                :props="defaultProps"
-                :show-checkbox="multiple"
-                lazy
-                node-key="nodeId"
-                @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 === 'USER' && searchValue && filterUserVal(data, searchValue)
-                          ? 'searchResult'
-                          : ''
-                      "
-                      :title="node.label"
-                    >
-                      {{ node.label }}
+                <el-tree
+                  ref="workgroupUserTree"
+                  :filter-node-method="filterNode"
+                  :load="loadNode"
+                  :props="defaultProps"
+                  :show-checkbox="multiple"
+                  lazy
+                  node-key="nodeId"
+                  @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 === 'USER' && searchValue && filterUserVal(data, searchValue)
+                            ? '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-user-result
                 ref="workgroupUserResult"
@@ -114,7 +118,7 @@ import localStorage from '../../../src/utils/local-storage'
 import utils from '../../utils/utils'
 import workgroupTreeInlineService from './workgroup-tree-inline-service'
 import WorkgroupUserResult from './search-result.vue'
-
+import EmptyState from '../../empty-state/index.vue'
 export default {
   data() {
     return {
@@ -153,12 +157,14 @@ export default {
       selectNodeInfo: null,
       // 公司根节点信息
       tenantInfo: {},
-      ElIconSearch
+      ElIconSearch,
+      canShowOrgTree: false
     }
   },
   name: 'InlineWorkgroupUserTree',
   components: {
-    WorkgroupUserResult
+    WorkgroupUserResult,
+    EmptyState
   },
   props: {
     // 是否是多选树，默认是true
@@ -198,6 +204,9 @@ export default {
     }
   },
   created() {
+    utils.canShowOrgTree().then((showOrgTree) => {
+      this.canShowOrgTree = showOrgTree
+    })
     if (this.multiple) {
       this.initSelectUsers(this.searchField, this.selectUserInfo, this.separator).then((users) => {
         if (users) {

package/src/i18n/langs/cn.js

@@ -56,7 +56,7 @@ const cn = {
     pleaseRemoveallpersonnelBeforeSelectingSpecificPersonnel: '请先移除所有人员，再选择具体人员',
     queryResultIsEmpty: '查询结果为空',
     pleaseSelectATeam: '请选择工作组',
-    pleaseEnterTeamName: '请输入工作组名称',
+    pleaseEnterTeamName: '请输入工作组信息筛选',
     validationFailed: '验证失败',
     selectionDate: '选择日期',
     selectTime: '选择时间',
@@ -142,7 +142,7 @@ const cn = {
   departmentTree: {},
   // 嵌入部门树组件
   departmentTreeInline: {
-    pleaseEnterDepartmentName: '请输入部门名称',
+    pleaseEnterDepartmentName: '请输入部门信息筛选',
     name: '部门名称',
     code: '部门编码',
     removeDepartment: '移除部门',
@@ -156,7 +156,7 @@ const cn = {
   },
   // 用户树
   departmentUserTree: {
-    pleaseEnterUserInformation: '请输入用户信息',
+    pleaseEnterUserInformation: '请输入用户信息筛选',
     selectedPeople: '已选人员',
     searchFieldUserName: '姓名',
     searchFieldLoginName: '登录名',

package/src/i18n/langs/en.js

@@ -57,7 +57,7 @@ const en = {
       'Please Remove All Personnel Before Selecting Specific Personnel',
     queryResultIsEmpty: 'Query Result Is Empty',
     pleaseSelectATeam: 'Please Select A Team',
-    pleaseEnterTeamName: 'Please Enter Team Name',
+    pleaseEnterTeamName: 'Please Enter Team Info Filter',
     validationFailed: 'Validation Failed',
     selectionDate: 'Selection Date',
     selectTime: 'Select Time',
@@ -140,7 +140,7 @@ const en = {
   },
   departmentTree: {},
   departmentTreeInline: {
-    pleaseEnterDepartmentName: 'Please Enter Department Name',
+    pleaseEnterDepartmentName: 'Please Enter Department Info Filter',
     name: 'Department Name',
     code: 'Department Code',
     removeDepartment: 'Remove Department',
@@ -154,7 +154,7 @@ const en = {
   },
   // 用户树
   departmentUserTree: {
-    pleaseEnterUserInformation: 'Please Enter User Information',
+    pleaseEnterUserInformation: 'Please Enter User Information Filter',
     selectedPeople: 'Selected People',
     searchFieldUserName: 'Name',
     searchFieldLoginName: 'Login Name',
@@ -285,7 +285,7 @@ const en = {
     video: 'Video',
     updateSuccess: 'Update success',
     more: 'More',
-    uploadFailed: '上传失败！'
+    uploadFailed: 'Upload failed!'
   },
   messageVideo: {
     attemptingToIdentify: 'Attempting to identify',

package/src/styles/index.scss

@@ -322,4 +322,30 @@ body .el-table colgroup.gutter {
   position: absolute;
   top: 3px;
   right: 5px;
+}
+
+
+// "暂无更多" 样式
+.empty_center_area {
+  width: 100%;
+  position: relative;
+
+  .empty_notAvailable {
+    background-image: url('../assets/nonemessage.png');
+    background-size: 100%;
+    position: absolute;
+    top: 30%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+
+    .empty_notAvailable_text {
+      position: absolute;
+      bottom: 0;
+      left: 50%;
+      transform: translate(-50%, 100%);
+      color: #313233;
+      font-weight: regular;
+      font-size: 14px;
+    }
+  }
 }

package/src/utils/common-util.js

@@ -8,6 +8,9 @@ import i18nUtil from './i18n-util'
  * 获得相对地址
  */
 export function getRelativeBaseUrl(originalBaseUrl) {
+  if(!originalBaseUrl){
+    return originalBaseUrl
+  }
   if (
     window.$vueApp.config.globalProperties.projectModel === undefined ||
     window.$vueApp.config.globalProperties.projectModel !== 'developing.model'
@@ -796,3 +799,22 @@ export function cacheSystemUrl() {
 export function getAuthSource() {
   return window.localStorage.getItem('auth_source')
 }
+/**
+ * 把路径中的参数转为对象
+ * @param {*} fullPath 全路径。例如：hash路径：http://xx:8090/#/sss/dd?p1=1&p2=2 或 普通路径：http://xx:8090/sss/dd?p1=1&p2=2
+ * @returns 
+ */
+export function getURLSearchParamObj(fullPath) {
+  try{
+    // 提取hash部分 
+    const hash = fullPath.includes('#') ? fullPath.split('#')[1] : fullPath; 
+    // 提取查询参数 
+    const queryString = hash.includes('?') ? hash.split('?')[1] : hash; 
+    // 解析参数 
+    const params = new URLSearchParams(queryString); 
+    // 转换为普通对象
+    return Object.fromEntries(params)
+  }catch(error){
+    console.error('error===',error)
+  }
+}

package/src/views/dsc-component/Sidebar/SidebarItem.vue

@@ -53,6 +53,7 @@ import AppLink from './Link.vue'
 import * as Vue from 'vue'
 import tabJs from '../../../api/tab'
 import { getI18nName } from '../../../utils/menu'
+import { getRelativeBaseUrl, getURLSearchParamObj } from '../../../utils/common-util'
 // import { SidebarItemChild } from './SidebarItemChild.vue'
 export default {
   name: 'SidebarItem',
@@ -171,6 +172,11 @@ export default {
             url = url.substring(0, url.lastIndexOf('&'))
           }
         }
+        const paramObj = getURLSearchParamObj(url)
+        if(paramObj && paramObj._isThird && paramObj._isThird === 'false') {
+          // 表示不是第3方系统，需要替换域名，内网外网部署时需要使用
+          url = getRelativeBaseUrl(url)
+        }
         window.open(url, toPathObj.query._menuName)
       } else {
         // 刷新页签打开菜单

package/src/views/dsc-component/tabs/tab-content.vue

@@ -35,6 +35,7 @@
 <script>
 import * as Vue from 'vue'
 import { mapGetters } from 'vuex'
+import { getRelativeBaseUrl, getURLSearchParamObj } from '../../../utils/common-util'
 export default {
   name: 'TabContent',
   data() {
@@ -158,6 +159,11 @@ export default {
       ) {
         path = path.substring(0, path.lastIndexOf('&'))
       }
+      const paramObj = getURLSearchParamObj(path)
+      if(paramObj && paramObj._isThird && paramObj._isThird === 'false') {
+        // 表示不是第3方系统，需要替换域名，内网外网部署时需要使用
+        path = getRelativeBaseUrl(path)
+      }
       return path
     },
     recieveMessage(event) {