agilebuilder-ui 1.1.46-sit1 → 1.1.46-sit2

package/packages/department-user-tree-inline/src/department-user-single-tree-inline.vue

@@ -18,48 +18,52 @@
         </el-autocomplete>
       </el-header>
       <el-main style="padding: 10px; width: 100%">
-        <div
-          v-if="!searchValue || searchResult.length === 0"
-          style="padding-top: 5px; overflow: auto; width: auto; display: inline-block !important"
-        >
-          <el-tabs v-model="activeTab" class="boe">
-            <el-tab-pane :label="$t('departmentUserTreeInline.orgTree')" name="orgTree">
-              <el-tree
-                ref="deparmentUserTree"
-                :load="loadNode"
-                :props="defaultProps"
-                lazy
-                node-key="nodeId"
-                @node-click="handleNodeClick"
-              >
-                <template #default="{ node, data }">
-                  <span>
-                    <el-icon>
-                      <Menu v-if="node.data.id === -1 || node.data.branch" />
-                      <Tickets v-else-if="node.data.id === -2 || node.data.id === -3" />
-                      <User v-else-if="node.data.nodeType === 'USER'" />
-                      <Calendar v-else />
-                    </el-icon>
-                    <span :title="node.label">
-                      {{ node.label }}
+        <template v-if="!searchValue || searchResult.length === 0">
+          <div
+            v-if="canShowOrgTree"
+            style="padding-top: 5px; overflow: auto; width: auto; display: inline-block !important"
+          >
+            <el-tabs v-model="activeTab" class="boe">
+              <el-tab-pane :label="$t('departmentUserTreeInline.orgTree')" name="orgTree">
+                <el-tree
+                  ref="deparmentUserTree"
+                  :load="loadNode"
+                  :props="defaultProps"
+                  lazy
+                  node-key="nodeId"
+                  @node-click="handleNodeClick"
+                >
+                  <template #default="{ node, data }">
+                    <span>
+                      <el-icon>
+                        <Menu v-if="node.data.id === -1 || node.data.branch" />
+                        <Tickets v-else-if="node.data.id === -2 || node.data.id === -3" />
+                        <User v-else-if="node.data.nodeType === 'USER'" />
+                        <Calendar v-else />
+                      </el-icon>
+                      <span :title="node.label">
+                        {{ node.label }}
+                      </span>
                     </span>
-                  </span>
+                  </template>
+                </el-tree>
+              </el-tab-pane>
+              <el-tab-pane name="groupTree">
+                <template v-slot:label>
+                  <span>{{ $t('departmentUserTreeInline.group') }}</span>
+                  <span><GroupUser :active-tab="activeTab" @update-group-tree="updateGroupTree" /></span>
                 </template>
-              </el-tree>
-            </el-tab-pane>
-            <el-tab-pane name="groupTree">
-              <template v-slot:label>
-                <span>{{ $t('departmentUserTreeInline.group') }}</span>
-                <span><GroupUser :active-tab="activeTab" @update-group-tree="updateGroupTree" /></span>
-              </template>
-              <GroupUserSingleTree
-                v-if="isShowGroupTree"
-                @singleClick="getGroupUserResult"
-                @dblClick="dblClickGroupUserResult"
-              />
-            </el-tab-pane>
-          </el-tabs>
-        </div>
+                <GroupUserSingleTree
+                  v-if="isShowGroupTree"
+                  @singleClick="getGroupUserResult"
+                  @dblClick="dblClickGroupUserResult"
+                />
+              </el-tab-pane>
+            </el-tabs>
+          </div>
+          <!-- 暂无信息 -->
+          <EmptyState v-else style="width: 100%; height: 100%" />
+        </template>
         <div
           v-if="searchValue && searchValue.length > 0 && searchResult.length > 0"
           style="height: 100%; overflow: hidden"
@@ -89,6 +93,7 @@ import departmentUserTreeSingleService from './department-user-tree-single-servi
 import memoryCacheUtils from '../../utils/memory-cache-utils'
 import GroupUserSingleTree from './group-user-single-tree.vue'
 import GroupUser from './group-user/group-user.vue'
+import EmptyState from '../../empty-state/index.vue'
 
 export default {
   data() {
@@ -136,14 +141,16 @@ export default {
       memoryCacheData: [],
       ElIconSearch,
       activeTab: 'orgTree', // 当前页签
-      isShowGroupTree: true
+      isShowGroupTree: true,
+      canShowOrgTree: false
     }
   },
   name: 'InlineDepartmentUserSingleTree',
   components: {
     UserResult,
     GroupUserSingleTree,
-    GroupUser
+    GroupUser,
+    EmptyState
   },
   props: {
     // 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
@@ -184,6 +191,9 @@ export default {
     }
   },
   created() {
+    utils.canShowOrgTree().then((showOrgTree) => {
+      this.canShowOrgTree = showOrgTree
+    })
     this.searchFields = this.getSearchUserFields()
   },
   mounted() {

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

@@ -1,80 +1,71 @@
 <template>
-	<div style="height: 100%">
-		<el-table
-				ref="superGrid"
-				:data="gridData"
-				:max-height="myHeight"
-				:row-class-name="tableRowClassName"
-				border
-				fit
-				row-key="id"
-				stripe
-				@row-click="rowClick"
-				@row-dblclick="rowDblclick"
-		>
-			<template v-slot:empty>
-				<div class="roleQuery_center_area" style="height: 395px">
-					<div
-							class="roleQuery_notAvailable"
-							style="width: 120px; height: 120px"
-					>
-            <span class="roleQuery_notAvailable_text">{{
-		            $t('imatrixUIPromptMessage.NoContent')
-	            }}</span>
-					</div>
-				</div>
-			</template>
-			<el-table-column v-if="multiple === false" fixed width="60">
-				<template v-slot="scope">
-					<el-radio
-							v-model="singleUserIndex"
-							:label="scope.$index"
-							@change="selectUser"
-					>
-						{{ scope.$index + 1 }}
-					</el-radio>
-				</template>
-			</el-table-column>
-			<el-table-column
-					v-if="multiple && isSearchResult"
-					:label="$t('imatrixUIPublicModel.edit')"
-					align="center"
-					fixed
-					width="60px"
-			>
-				<template v-slot="scope">
-					<div>
-						<el-button
-								:disabled="isDisable(scope.row)"
-								:icon="ElIconPlus"
-								circle
-								size="default"
-								type="primary"
-								@click="addUser(scope.$index, scope.row)"
-						/>
-					</div>
-				</template>
-			</el-table-column>
-			<el-table-column
-					v-if="multiple && !isSearchResult"
-					:label="$t('imatrixUIPublicModel.edit')"
-					align="center"
-					fixed="right"
-					width="60px"
-			>
-				<template v-slot="scope">
-					<div>
-						<el-button
-								:icon="ElIconDelete"
-								circle
-								size="default"
-								type="danger"
-								@click="removeUser(scope.$index, scope.row)"
-						/>
-					</div>
-				</template>
-			</el-table-column>
-			<!-- <el-table-column
+  <div style="height: 100%">
+    <el-table
+      ref="superGrid"
+      :data="gridData"
+      :max-height="myHeight"
+      :row-class-name="tableRowClassName"
+      border
+      fit
+      row-key="id"
+      stripe
+      @row-click="rowClick"
+      @row-dblclick="rowDblclick"
+    >
+      <template v-slot:empty>
+        <div class="empty_center_area" style="height: 395px">
+          <div class="empty_notAvailable" style="width: 120px; height: 120px">
+            <span class="empty_notAvailable_text">{{ $t('imatrixUIPromptMessage.NoContent') }}</span>
+          </div>
+        </div>
+      </template>
+      <el-table-column v-if="multiple === false" fixed width="60">
+        <template v-slot="scope">
+          <el-radio v-model="singleUserIndex" :label="scope.$index" @change="selectUser">
+            {{ scope.$index + 1 }}
+          </el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="multiple && isSearchResult"
+        :label="$t('imatrixUIPublicModel.edit')"
+        align="center"
+        fixed
+        width="60px"
+      >
+        <template v-slot="scope">
+          <div>
+            <el-button
+              :disabled="isDisable(scope.row)"
+              :icon="ElIconPlus"
+              circle
+              size="default"
+              type="primary"
+              @click="addUser(scope.$index, scope.row)"
+            />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="multiple && !isSearchResult"
+        :label="$t('imatrixUIPublicModel.edit')"
+        align="center"
+        fixed="right"
+        width="60px"
+      >
+        <template v-slot="scope">
+          <div>
+            <el-button
+              :icon="ElIconDelete"
+              circle
+              size="default"
+              type="danger"
+              @click="removeUser(scope.$index, scope.row)"
+            />
+          </div>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
 					v-if="multiple"
 					:label="$t('superGrid.index')"
 					align="center"
@@ -84,30 +75,27 @@
 					{{ scope.$index + 1 }}
 				</template>
 			</el-table-column> -->
-			<el-table-column
-					:label="$t('departmentUserTreeInline.name')"
-					prop="name"
-			>
-				<template v-slot="scope">
-					<div v-if="scope.row.enName && scope.row.enName.trim() !== ''">
-						<div :title="scope.row.name +'('+scope.row.enName+')' +'['+scope.row.loginName+']'">
-						<span>{{ scope.row.name+'('+scope.row.enName+')' }}[{{ scope.row.loginName }}]</span>
-						</div>
-						<div style="color:#ccc" :title="getDeptName(scope.row)">
-						{{ getDeptName(scope.row) }}
-						</div>
-					</div>
-					<div v-else>
-						<div :title="scope.row.name +'['+scope.row.loginName+']'">
-						<span>{{ scope.row.name }}[{{ scope.row.loginName }}]</span>
-						</div>
-						<div style="color:#ccc" :title="getDeptName(scope.row)">
-						{{ getDeptName(scope.row) }}
-						</div>
-					</div>
-				</template>
-			</el-table-column>
-			<!-- <el-table-column
+      <el-table-column :label="$t('departmentUserTreeInline.name')" prop="name">
+        <template v-slot="scope">
+          <div v-if="scope.row.enName && scope.row.enName.trim() !== ''">
+            <div :title="scope.row.name + '(' + scope.row.enName + ')' + '[' + scope.row.loginName + ']'">
+              <span>{{ scope.row.name + '(' + scope.row.enName + ')' }}[{{ scope.row.loginName }}]</span>
+            </div>
+            <div style="color: #ccc" :title="getDeptName(scope.row)">
+              {{ getDeptName(scope.row) }}
+            </div>
+          </div>
+          <div v-else>
+            <div :title="scope.row.name + '[' + scope.row.loginName + ']'">
+              <span>{{ scope.row.name }}[{{ scope.row.loginName }}]</span>
+            </div>
+            <div style="color: #ccc" :title="getDeptName(scope.row)">
+              {{ getDeptName(scope.row) }}
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
 					:label="$t('departmentUserTreeInline.loginName')"
 					:width="110"
 					prop="loginName"
@@ -139,8 +127,8 @@
           >
 				</template>
 			</el-table-column> -->
-			<!--由于保密要求，邮箱不能显示，需要脱敏处理，暂时注释掉，不显示-->
-			<!-- <el-table-column
+      <!--由于保密要求，邮箱不能显示，需要脱敏处理，暂时注释掉，不显示-->
+      <!-- <el-table-column
 							:label="$t('departmentUserTreeInline.email')"
 							:width="130"
 							prop="email"
@@ -149,139 +137,138 @@
 								<span class="ellipsis cell--span" :title="scope.row.email">{{ scope.row.email }}</span>
 							</template>
 						</el-table-column> -->
-		</el-table>
-	</div>
+    </el-table>
+  </div>
 </template>
 
 <script>
-import {Delete as ElIconDelete, Plus as ElIconPlus} from '@element-plus/icons-vue'
+import { Delete as ElIconDelete, Plus as ElIconPlus } from '@element-plus/icons-vue'
 
 export default {
-	data() {
-		let tableHeight = this.height
-		tableHeight = tableHeight.substring(0, tableHeight.indexOf('px'))
-		const myHeight = parseInt(tableHeight) + 30 + 'px'
-		return {
-			// 选中的用户序号
-			singleUserIndex: null,
-			selectedUser: null,
-			myHeight,
-			language: !window.$locale ? 'cn' : window.$locale,
-			ElIconPlus,
-			ElIconDelete,
-		}
-	},
-	name: 'UserResult',
-	props: {
-		gridData: {
-			type: Array,
-			default: null,
-		},
-		containBranch: {
-			type: Boolean,
-			default: false,
-		},
-		multiple: {
-			type: Boolean,
-			default: false,
-		},
-		// 多选树时是否是查询结果列表，用于控制“操作”列按钮的显示
-		isSearchResult: {
-			type: Boolean,
-			default: true,
-		},
-		height: {
-			type: String,
-			default: '300px',
-		},
-		selectResult: {
-			type: Array,
-			default: function () {
-				return []
-			},
-		},
-	},
-	created() {
-	},
-	methods: {
-		// 单选树时，点击行事件
-		// rowClick(row, column, event) {
-		//   this.selectedUser = row
-		//   // this.$emit('rowClick', row, column, event)
-		// },
-		// 移除用户
-		removeUser(index, row) {
-			this.$emit( 'removeUser', index, row)
-		},
-		// 添加用户
-		addUser(index, row) {
-			this.$emit( 'addUser', index, row)
-		},
-		selectUser(selectVal) {
-			// console.log('selectUser', selectVal)
-			this.$emit( 'selectResult', this.gridData[selectVal])
-		},
-		rowClick(row, column, event) {
-			if(!this.multiple){
-				this.singleUserIndex = row.row_index
-				this.$emit( 'selectResult', row)
-			}
-		},
-		tableRowClassName({row, rowIndex}) {
-			if(!this.multiple){
-				row.row_index = rowIndex
-			}
-		},
-		rowDblclick(row, column, event) {
-			if (this.multiple) {
-				this.$emit( 'addUser', null, row)
-			} else {
-				this.$emit( 'resultRowDblclick', row)
-			}
-		},
-		isDisable(row) {
-			if (this.selectResult) {
-				const containUsers = this.selectResult.filter(this.filterDept(row))
-				if (containUsers && containUsers.length > 0) {
-					return true
-				}
-			}
-			return false
-		},
-		// 判断用户是否存在的过滤器
-		filterDept(queryDept) {
-			return (dept) => {
-				return dept.id === queryDept.id
-			}
-		},
-		getDeptName(row) {
-			let deptName = row.superiorDeptNameFullPath
-			if (deptName) {
-				return deptName
-			}
-			if (this.language && this.language !== 'cn') {
-				deptName = row.mainDepartmentEnName
-			}
-			if (deptName) {
-				return deptName
-			}
-			return row.mainDepartmentName
-		}
-	},
-	emits: ['removeUser', 'addUser', 'selectResult', 'resultRowDblclick'],
+  data() {
+    let tableHeight = this.height
+    tableHeight = tableHeight.substring(0, tableHeight.indexOf('px'))
+    const myHeight = parseInt(tableHeight) + 30 + 'px'
+    return {
+      // 选中的用户序号
+      singleUserIndex: null,
+      selectedUser: null,
+      myHeight,
+      language: !window.$locale ? 'cn' : window.$locale,
+      ElIconPlus,
+      ElIconDelete
+    }
+  },
+  name: 'UserResult',
+  props: {
+    gridData: {
+      type: Array,
+      default: null
+    },
+    containBranch: {
+      type: Boolean,
+      default: false
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    // 多选树时是否是查询结果列表，用于控制“操作”列按钮的显示
+    isSearchResult: {
+      type: Boolean,
+      default: true
+    },
+    height: {
+      type: String,
+      default: '300px'
+    },
+    selectResult: {
+      type: Array,
+      default: function () {
+        return []
+      }
+    }
+  },
+  created() {},
+  methods: {
+    // 单选树时，点击行事件
+    // rowClick(row, column, event) {
+    //   this.selectedUser = row
+    //   // this.$emit('rowClick', row, column, event)
+    // },
+    // 移除用户
+    removeUser(index, row) {
+      this.$emit('removeUser', index, row)
+    },
+    // 添加用户
+    addUser(index, row) {
+      this.$emit('addUser', index, row)
+    },
+    selectUser(selectVal) {
+      // console.log('selectUser', selectVal)
+      this.$emit('selectResult', this.gridData[selectVal])
+    },
+    rowClick(row, column, event) {
+      if (!this.multiple) {
+        this.singleUserIndex = row.row_index
+        this.$emit('selectResult', row)
+      }
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (!this.multiple) {
+        row.row_index = rowIndex
+      }
+    },
+    rowDblclick(row, column, event) {
+      if (this.multiple) {
+        this.$emit('addUser', null, row)
+      } else {
+        this.$emit('resultRowDblclick', row)
+      }
+    },
+    isDisable(row) {
+      if (this.selectResult) {
+        const containUsers = this.selectResult.filter(this.filterDept(row))
+        if (containUsers && containUsers.length > 0) {
+          return true
+        }
+      }
+      return false
+    },
+    // 判断用户是否存在的过滤器
+    filterDept(queryDept) {
+      return (dept) => {
+        return dept.id === queryDept.id
+      }
+    },
+    getDeptName(row) {
+      let deptName = row.superiorDeptNameFullPath
+      if (deptName) {
+        return deptName
+      }
+      if (this.language && this.language !== 'cn') {
+        deptName = row.mainDepartmentEnName
+      }
+      if (deptName) {
+        return deptName
+      }
+      return row.mainDepartmentName
+    }
+  },
+  emits: ['removeUser', 'addUser', 'selectResult', 'resultRowDblclick']
 }
 </script>
 
 <style>
 .searchResult {
-	color: red;
+  color: red;
 }
 
 .inline-select-custom {
-	width: 100px;
+  width: 100px;
 }
 
 .inline-input-custom {
-	width: 98%;
+  width: 98%;
 }
 </style>

package/packages/dynamic-source-select/src/dynamic-source-select-service.js

@@ -1,3 +1,5 @@
+import { getRelativeBaseUrl } from "../../../src/utils/common-util"
+
 const dynamicSourceSelectService = {
   findDynamicDataSourceByCode(dynamicSourceCode, entity, searchParam, additionalParameterStr, backendUrl) {
     let searchText
@@ -62,7 +64,8 @@ const dynamicSourceSelectService = {
     if (!backendUrl) {
       backendUrl = window.$vueApp.config.globalProperties.baseURL
     }
-
+    // 替换域名，内网、外网访问需要
+    backendUrl = getRelativeBaseUrl(backendUrl)
     return new Promise((resolve, reject) => {
       // this.$http
       //   .post(
@@ -105,8 +108,10 @@ const dynamicSourceSelectService = {
           .then((result) => {
             if (result.backendUrl) {
               // result.backendUrl表示需要使用动态数据源所属的系统路径重新获得一次数据
+              // 替换域名，内网、外网访问需要
+              const resultBackendUrl = getRelativeBaseUrl(result.backendUrl)
               this.$http
-                .post(result.backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params, {
+                .post(resultBackendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params, {
                   headers: { customSystem: result.systemCode }
                 })
                 .then((finallyResult) => {

package/packages/empty-state/index.vue

@@ -0,0 +1,28 @@
+<template>
+  <div class="empty_center_area">
+    <div class="empty_notAvailable" :style="{ width: props.imageWidth, height: props.imageHeight }">
+      <span class="empty_notAvailable_text">
+        {{ props.emptyText ? props.emptyText : t('imatrixUIPromptMessage.NoContent') }}
+      </span>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { defineProps } from 'vue'
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
+const props = defineProps({
+  imageHeight: {
+    type: String,
+    default: '120px'
+  },
+  imageWidth: {
+    type: String,
+    default: '120px'
+  },
+  emptyText: {
+    type: String,
+    default: ''
+  }
+})
+</script>