agilebuilder-ui 1.0.621 → 1.0.962

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

@@ -0,0 +1,119 @@
+<template>
+    <el-drawer v-model="isShowForm" direction="btt" size="100%" class="organization-tree" @close="closeTree()">
+    <template #header>
+        <div style="text-align: center;">
+            {{$t('imatrixUIMessage.pleaseSelect')}}
+        </div>
+    </template>
+    <template #default>
+		<InlineWorkgroupUserTreeApp v-if="isShowForm" :multiple="multiple" :branchInfo="branchInfo" :selectUserInfo="selectUserInfo" :searchField="searchField" :separator="separator" @close="closeTree"/>
+    </template>
+  </el-drawer>
+
+</template>
+<script  lang="ts">
+export default {
+  name: 'DepartmentUserTreeMobile'
+}
+</script>
+<script  setup lang="ts">
+import InlineWorkgroupUserTreeApp from './workgroup-user-tree-inline-app.vue'
+import { reactive,ref,onMounted, defineEmits } from 'vue'
+const props = defineProps<{
+		// 是否是多选树，默认是true
+		multiple: {
+			type: Boolean,
+			default: true,
+		},
+		// 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
+		branchInfo: {
+			type: Array<any>,
+			default: null,
+		},
+		// 多选用户树时，已选择用户id或登录名集合，多个之间以逗号隔开
+		selectUserInfo: {
+			type: [String, Number],
+			default: null,
+		},
+		// 移除用户时，用户属性名称：id、loginName、email、telephone，默认是loginName
+		searchField: {
+			type: String,
+			default: 'loginName',
+		},
+		// 多选树时结果之间的分隔符，默认是逗号分隔
+		separator: {
+			type: String,
+			default: ','
+		}
+	}>()
+	const emits = defineEmits(['close'])
+	let isShowForm = ref(true)
+	// function showTree() {
+	// 	isShowForm.value = true
+	// }
+	function closeTree(selectNodeInfo) {
+		emits('close', selectNodeInfo)
+		isShowForm.value = false
+	}
+	function selectDepartment() {
+		// this.$refs.inlineDeparmentTree.selectDepartment()
+	}
+	// defineExpose({showTree})
+</script>
+<style>
+.organization-tree, .organization-tree .el-checkbox__label,.organization-tree .el-breadcrumb__inner,.organization-tree .el-tree {
+	font-size: 17px;
+	font-weight: 700;
+}
+
+.organization-tree .el-breadcrumb__item:last-child .el-breadcrumb__inner, .el-breadcrumb__item:last-child .el-breadcrumb__inner a, .el-breadcrumb__item:last-child .el-breadcrumb__inner a:hover, .el-breadcrumb__item:last-child .el-breadcrumb__inner:hover {
+    font-size: 17px;
+	font-weight: 700;
+}
+.organization-tree .el-card__body {
+	padding-top: 10px;
+}
+.organization-tree .card-content {
+	margin-top: 10px;
+}
+.organization-tree .item-row-all {
+	margin-bottom: 10px;
+}
+.organization-tree .item-row {
+	display: flex;
+	width: 100%;
+}
+.organization-tree .item-label {
+	flex: 0 0 90%;
+	text-align: left;
+}
+.organization-tree .item-side {
+	flex: 0 0 10%;
+	text-align: right;
+}
+.organization-tree .el-tree-node {
+	margin-bottom: 10px;
+}
+
+.organization-tree .el-tree-node__content>.el-tree-node__expand-icon {
+	padding: 0;
+	display: none;
+}
+
+.organization-tree .card-footer {
+	padding: 20px;
+}
+.organization-tree .card-footer .select-result {
+	color: #409EFF;
+	flex:1 1 75%;
+	text-align: left;
+}
+.organization-tree .card-footer .button-area {
+	flex:0 0 20%;
+	text-align: right;
+}
+
+.organization-tree .dept-path .breadcrumb-label-link{
+	color:#409EFF
+}
+</style>

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

@@ -0,0 +1,394 @@
+<template>
+  <div>
+    <el-card class="card-content" style="height: 50px">
+      <el-row class="item-row item-row-all">
+        <el-col style="width: 100%;">
+          <div style="display: flex">
+            <div style="flex: 0 0 20%;text-align:left">
+              <el-checkbox  v-if="multiple" v-model="checkAll" :label="$t('departmentTreeInline.allCheck')" value="all" @change="changeAllCheck" />
+            </div>
+            <div style="flex: 0 0 80%;text-align:right">
+              <el-input v-model="searchParam.searchValue" :placeholder="$t('departmentUserTree.pleaseEnterUserInformation')" @clear="filterAppendNodes" @keyup.enter="filterAppendNodes" @blur="filterAppendNodes"  clearable>
+                  <template v-slot:suffix>
+                    <el-icon @click="filterAppendNodes"><Search /></el-icon>
+                </template>
+              </el-input>
+            </div>
+          </div>
+          </el-col>
+      </el-row>
+    </el-card>
+    <el-card  v-if="tenantName" class="card-content">
+      <el-row class="item-row item-row-all">
+        <el-col class="item-label dept-path"><deptPath :tenantName="tenantName" :clickDepts="clickDepts" @clickBreadcrumb="clickBreadcrumb"/></el-col>
+      </el-row>
+    </el-card>
+    <el-card class="card-content org-tree" style="overflow: auto;">
+      <el-tree
+      ref="orgTreeRef"
+      :data="departments"
+      :show-checkbox="multiple"
+      node-key="nodeId"
+      :props="defaultProps"
+      :default-checked-keys="defaultCheckedKeys"
+      @check-change="handleCheckNode"
+      @node-click="handleClickNode"
+    >
+      <template #default="{ node, data }">
+        <div class="item-row">
+          <div v-if="data.nodeType && data.nodeType === 'USER'" class="item-label">{{ data.showName }}
+           <span style="color:#999">({{ data.loginName }}{{ getUserMainDeptName(data) ? '/'+getUserMainDeptName(data): ''}})</span>
+          </div> 
+          <div v-else class="item-label">{{ data.name }}</div>
+          <div v-if="!data.nodeType || data.nodeType !== 'USER'" class="item-side" @click="loadChildren(data,false)">
+           <el-icon><ArrowRight /></el-icon>
+          </div>
+        </div>
+      </template>
+    </el-tree>
+    </el-card>
+    <el-card  class="card-footer">
+    <div  style="display: flex;">
+      <div  class="select-result" >
+        <!-- 已选择:{useNum}个用户,{deptNum}个部门(含子部门) -->
+        <!-- {{$t('departmentUserTree.selectResultInfo',{userNum: selectUsers.length, deptNum: selectDepts.length})}} -->
+        <span v-if="multiple" @click="showResult">
+          <span v-if="selectUsers.length > 0 && selectDepts.length > 0">{{$t('departmentTreeInline.selectResultInfoHasSelect')}}{{$t('departmentUserTree.selectUserResultInfo',{userNum: selectUsers.length })}}, {{$t('departmentUserTree.selectDeptResultInfo',{deptNum: selectDepts.length })}}</span>
+          <span v-else-if="selectUsers.length > 0">{{$t('departmentTreeInline.selectResultInfoHasSelect')}}{{$t('departmentUserTree.selectUserResultInfo',{userNum: selectUsers.length })}}</span>
+          <span v-else-if="selectDepts.length > 0">{{$t('departmentTreeInline.selectResultInfoHasSelect')}}{{$t('departmentUserTree.selectDeptResultInfo',{deptNum: selectDepts.length })}}</span>
+          <span v-if="selectUsers.length > 0 || selectDepts.length > 0" style="padding-left: 10px"><el-icon><ArrowUpBold /></el-icon></span>
+        </span>
+        <span v-else-if="selectUsers.length > 0">
+          {{$t('departmentTreeInline.selectResultInfoHasSelect')}}{{selectUsers[0].showName }}<span style="color:#999">({{ selectUsers[0].loginName }}{{ getUserMainDeptName(selectUsers[0]) ? '/'+getUserMainDeptName(selectUsers[0]): ''}})</span>
+        </span>
+        
+      </div>
+      <div class="button-area">
+        <el-button size="large" type="primary" @click="saveDept">{{$t('imatrixUIPublicModel.sure')}}</el-button>
+      </div>
+    </div>
+    </el-card>
+    <deptResult ref="deptResultRef" :selectUsers="selectUsers.concat(selectDepts)" @removeResult="removeResultDept"/>
+  </div>
+</template>
+
+<script  setup lang="ts">
+import { reactive,ref,onMounted, defineEmits,Ref } from 'vue'
+import {
+  ArrowRight,
+  Search,
+  ArrowUpBold
+} from '@element-plus/icons-vue'
+import {getTenant, getTenantChildren, checkedDeptDefault, loadChildNodes, getUserInWorkgroups} from './workgroup-user-tree-service.ts'
+import {resizeScrollTargetHeightUtil, getUserMainDeptName, getDeptNamePath,initSelectUsers, addSelectedUserInfo, packageSelectResult} from '../../utils/organization.ts'
+import deptPath from './dept-path.vue'
+import deptResult from './dept-result.vue'
+import {ElMessage} from 'element-plus'
+import {useI18n} from "vue-i18n"
+const props = defineProps<{
+    // 是否是多选树，默认是true
+    multiple: {
+      type: Boolean,
+      default: true,
+    },
+    // 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
+    branchInfo: {
+      type: Array<any>,
+      default: null,
+    },
+		// 多选用户树时，已选择用户id或登录名集合，多个之间以逗号隔开
+		selectUserInfo: {
+			type: [String, Number],
+			default: null,
+		},
+		// 移除用户时，用户属性名称：id、loginName、email、telephone，默认是loginName
+		searchField: {
+			type: String,
+			default: 'loginName',
+		},
+    // 多选树时结果之间的分隔符，默认是逗号分隔
+    separator: {
+      type: String,
+      default: ','
+    }
+  }>()
+const emits = defineEmits(["close"])
+const orgTreeRef = ref(null)
+let tenantInfo = ref(null)
+let containBranch = ref(false)
+let tenantName = ref(null)
+let tenantNodeId = "-1"
+let departments = ref([])
+let checkedKeys = ref([])
+let selectUsers = ref([])
+let selectDepts = ref([])
+let selectDeptNodeIds = ref([])
+let clickDepts = ref([])
+let defaultCheckedKeys = ref([])
+let deptResultRef:Ref<any> = ref(null)
+let checkAll = ref(false)
+let searchParam = ref({
+  searchValue: null,
+  treeType: 'MAN_GROUP_TREE',
+  departmentInfo: null
+})
+let defaultProps = ref({
+	disabled: 'disable'
+
+})
+let loading = ref(false)
+const {t} = useI18n()
+onMounted(()=>{
+  initSelectUsers(props.searchField, props.selectUserInfo, props.separator ).then((departments)=>{
+    selectUsers.value = departments
+    getTenantInfo()
+  })
+  resizeScrollTargetHeight()
+})
+function getTenantInfo() {
+  getTenant().then(data=>{
+    const tenantData = data[0].data
+    tenantInfo.value = JSON.parse(tenantData)
+    containBranch.value = data[0].containBranch
+    tenantName.value = data[0].name
+    getTenantChildrenDept()
+  })
+}
+
+function getTenantChildrenDept() {
+    getTenantChildren(props.branchInfo, tenantNodeId).then(children=>{
+        departments.value = children
+        checkedDeptDefault(selectUsers.value, defaultCheckedKeys.value)
+    })
+}
+
+function  resizeScrollTargetHeight () {
+    const scrollTarget = document.querySelector('.org-tree')
+    let height = resizeScrollTargetHeightUtil(scrollTarget)
+    const titleArea = 110
+    const deptPathArea = 60
+    const allCheckArea = 60
+    const buttonArea = 60
+    height = height - titleArea - deptPathArea - allCheckArea - buttonArea
+    scrollTarget['style'].height = height + 'px'
+    scrollTarget['style'].minHeight =  '300px'
+    // scrollTarget.style.maxHeight = height + 'px'
+}
+// 点击复选框时处理
+function handleCheckNode(data, check, isChildrenCheck) {
+    if(props.multiple) {
+      if(check) {
+        // 表示选择节点时
+        if(props.multiple) {
+          // 表示是复选组织树
+          addToSelectDept(data)
+        }
+      } else {
+        // 表示取消选择
+        if(props.multiple || (data.nodeType && data.nodeType === 'USER')) {
+          removeSelectDept(data)
+        }
+      }
+    }
+}
+
+function handleClickNode(data, node, treenode, events) {
+  if(!props.multiple && data.nodeType && data.nodeType === 'USER') {
+    selectUsers.value = [data]
+  }
+}
+function addToSelectDept(dept) {
+  if(dept.nodeType && dept.nodeType === 'USER') {
+    // 表示是用户
+    const filterValue = selectUsers.value.filter(item=> item.nodeId === dept.nodeId)
+    if(!filterValue || filterValue.length === 0) {
+      // 表示集合中没有该记录，需要记录到结果集合中
+      selectUsers.value.push(JSON.parse(JSON.stringify(dept)))
+    }
+  } else {
+    // 表示是部门
+    const filterValue = selectDepts.value.filter(item=> item.nodeId === dept.nodeId)
+    if(!filterValue || filterValue.length === 0) {
+      // 表示集合中没有该记录，需要记录到结果集合中
+      selectDepts.value.push(JSON.parse(JSON.stringify(dept)))
+    }
+  }
+}
+
+function removeSelectDept(dept) {
+  if(dept.nodeType && dept.nodeType === 'USER') {
+    const index = selectUsers.value.findIndex(selectItem=> selectItem.nodeId === dept.nodeId)
+    // 删除指定元素
+    selectUsers.value.splice(index, 1)
+  } else {
+    const index = selectDepts.value.findIndex(selectItem=> selectItem.nodeId === dept.nodeId)
+    // 删除指定元素
+    selectDepts.value.splice(index, 1)
+  }
+    
+    checkAll.value =false
+}
+function changeAllCheck(value: boolean) {
+  console.log('changeCheck====value=', value)
+  if(props.multiple) {
+    // 表示是复选组织树
+    if(value){
+      // 表示全选时
+      const allNodeIds = departments.value.map((item)=>{
+          return item['nodeId'];
+      })
+      orgTreeRef.value.setCheckedKeys(allNodeIds, false)
+      departments.value.forEach(item=>{
+        addToSelectDept(item)
+      })
+    } else {
+      // 表示取消全选时
+      departments.value.forEach(item=>{
+       removeSelectDept(item)
+      })
+      orgTreeRef.value.setCheckedKeys([], false)
+    }
+  }
+}
+
+function loadChildrenDept(dept) {
+  loadChildNodes(props.branchInfo, dept.id).then(children=>{
+    departments.value = children
+    checkedDeptDefault(selectUsers.value,  defaultCheckedKeys.value)
+  })
+}
+function  loadChildren (dept, isBreadcrumb) {
+    clickDepts.value.push(dept)
+    loadChildrenDept(dept)
+}
+
+function clickBreadcrumb(item, isTenant, index) {
+  if(isTenant) {
+    // 表示点击的时公司节点
+    clickDepts.value = []
+    getTenantChildrenDept()
+  } else {
+    // 表示点击的是部门节点
+    // 删除指定元素
+    clickDepts.value.splice(index+1, clickDepts.value.length - (index + 1) )
+    loadChildrenDept(item)
+  }
+}
+
+function showResult() {
+  deptResultRef.value.showResult()
+}
+
+function removeResultDept(dept) {
+  const removeDeptInDepts = departments.value.filter(item=>item.nodeId === dept.nodeId)
+  if(removeDeptInDepts && removeDeptInDepts.length > 0) {
+    // departments结果存在当前移除的节点时，check-change事件会走removeSelectDept的逻辑
+    const selectNodeIds = []
+    selectUsers.value.forEach(item=>{
+      if(item.nodeId !== dept.nodeId) {
+        selectNodeIds.push(item.nodeId)
+      }
+    })
+    selectDepts.value.forEach(item=>{
+      if(item.nodeId !== dept.nodeId) {
+        selectNodeIds.push(item.nodeId)
+      }
+    })
+    orgTreeRef.value.setCheckedKeys(selectNodeIds, true)
+  }
+  removeSelectDept(dept)
+}
+
+function saveDept () {
+      if (selectDepts.value.length === 0 && selectUsers.value.length === 0 ) {
+        ElMessage({
+              message: t('imatrixUIMessage.pleaseSelectPersonnel'),
+              type: 'warning',
+            })
+        return
+      }
+      if (props.multiple) {
+        const selectNodeInfo = {
+          userIds: [],
+          userNames: [],
+          loginNames: [],
+          userZhNames: [],
+          userEnNames: [],
+          emails: [],
+          telephones: [],
+          users: []
+        }
+        const departmentIds = []
+        selectDepts.value.forEach(node => {
+          // 部门集合，最后确定时会使用该集合去后台获得用户集合
+            departmentIds.push(node.id)
+        })
+        selectUsers.value.forEach(node => {
+            // 用户集合
+            // node.data是部门对象的json字符串信息，通过JSON.parse(node.data)将json字符串转为对象
+            const userData = JSON.parse(node.data)
+            addSelectedUserInfo(selectNodeInfo, userData, containBranch.value)
+        })
+        loading.value = true
+        if (departmentIds.length > 0) {
+          getUserInWorkgroups(departmentIds).then(users => {
+            if (users) {
+              users.forEach(user => {
+                addSelectedUserInfo(selectNodeInfo, user, containBranch.value)
+              })
+            }
+            loading.value  = false
+            if (selectNodeInfo.userIds.length > 0) {
+              emits('close', selectNodeInfo)
+            } else {
+               ElMessage({
+                message: t('imatrixUIMessage.pleaseSelectPersonnel'),
+                type: 'warning',
+              })
+            }
+          }).catch(() => {
+            loading.value  = false
+          })
+        } else {
+          loading.value  = false
+          if (selectNodeInfo.userIds.length > 0) {
+            emits('close', selectNodeInfo)
+          } else {
+               ElMessage({
+                message: t('imatrixUIMessage.pleaseSelectPersonnel'),
+                type: 'warning',
+              })
+          }
+        }
+      } else {
+        const user = JSON.parse(selectUsers.value[0].data)
+        const selectNodeInfo = packageSelectResult(user, containBranch.value)
+        emits('close', selectNodeInfo)
+      }
+    }
+
+  function filterAppendNodes ( ) {
+    if (searchParam.value.searchValue) {
+      searchParam.value.searchValue = searchParam.value.searchValue.trim()
+      searchParam.value.departmentInfo = props.branchInfo
+      window['$vueApp'].config.globalProperties.$http.post(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/search-users-mobile', searchParam.value).then(result => {
+        if (result) {
+          if (result.length === 0) {
+            ElMessage({
+              message: t('imatrixUIMessage.queryResultIsEmpty'),
+              type: 'warning',
+            })
+          }
+          departments.value = result
+        } else {
+          ElMessage({
+            message: t('imatrixUIMessage.queryResultIsEmpty'),
+            type: 'warning',
+          })
+        }
+      })
+    } else {
+     getTenantChildrenDept()
+    }
+}
+</script>

package/packages/workgroup-user-tree-mobile/src/workgroup-user-tree-service.ts

@@ -0,0 +1,41 @@
+export function getTenant () {
+  const parentId = 0
+  return window['$vueApp'].config.globalProperties.$http.get(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/departments/' + parentId)
+}
+
+// 获得公司节点的孩子节点
+export function getTenantChildren (branchInfo, tenantNodeId ) {
+  // 加载整个组织结构树时，展开公司节点
+  return loadChildNodes(branchInfo, tenantNodeId)
+  
+}
+
+  // 加载当前节点的子节点
+  export  function loadChildNodes (branchInfo, parentId) {
+    const param = {
+      parentId: parentId,
+      departmentInfo: branchInfo,
+    }
+    return new Promise((resolve,reject)=>{
+       window['$vueApp'].config.globalProperties.$http.post(
+        window.$vueApp.config.globalProperties.baseAPI +
+          '/component/organization-trees/workgroup-users',
+        param
+      )
+      .then(children => {
+        resolve(children)
+      })
+    })
+  }
+  
+  
+  export function checkedDeptDefault (selectDepts, defaultCheckedKeys) {
+    defaultCheckedKeys = []
+    selectDepts.forEach(dept => {
+      defaultCheckedKeys.push(dept.nodeId)
+    })
+  }
+
+  export function getUserInWorkgroups (workgroupIds) {
+    return window['$vueApp'].config.globalProperties.$http.post(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/user-in-workgroups', workgroupIds)
+  }

package/src/api/sso-service.js

@@ -1,6 +1,7 @@
 import request from '../utils/request'
 import {getLanguage, getTheme} from '../utils/auth'
 import * as Vue from 'vue'
+import { isMobileBrowser } from '../utils/common-util'
 function login(username, password, language) {
   const usernamePasswordToken = {
     username,
@@ -60,22 +61,27 @@ function logout() {
 }
 
 function getCurrentUserPermissionsBySystem(loginName, systemCode) {
-  if (!systemCode) {
-    if (window.$vueApp.config.globalProperties.customSystem) {
-      systemCode = window.$vueApp.config.globalProperties.customSystem
-    } else {
-      systemCode = window.$vueApp.config.globalProperties.systemCode
+  console.log('getCurrentUserPermissionsBySystem----loginName=', loginName, isMobileBrowser())
+  if(isMobileBrowser()){
+    return getCurrentUserMobilePermissions(loginName)
+  } else {
+    if (!systemCode || systemCode+'' === 'null') {
+      if (window.$vueApp.config.globalProperties.customSystem) {
+        systemCode = window.$vueApp.config.globalProperties.customSystem
+      } else {
+        systemCode = window.$vueApp.config.globalProperties.systemCode
+      }
     }
+    return request.get(
+      window.$vueApp.config.globalProperties.baseAPI +
+        '/sso/current-users/permissions/with-system?loginName=' +
+        encodeURI(loginName) +
+        '&systemCode=' +
+        systemCode +
+        '&_t=' +
+        new Date().getTime()
+    )
   }
-  return request.get(
-    window.$vueApp.config.globalProperties.baseAPI +
-      '/sso/current-users/permissions/with-system?loginName=' +
-      encodeURI(loginName) +
-      '&systemCode=' +
-      systemCode +
-      '&_t=' +
-      new Date().getTime()
-  )
 }
 
 function isPasswordExpired(username, password) {
@@ -89,6 +95,20 @@ function isPasswordExpired(username, password) {
   )
 }
 
+function isPasswordExpiredWithValidateCode(username, password, validateCode, imageCodeKey) {
+  const usernamePasswordToken = {
+    username,
+    password,
+    validateCode,
+    imageCodeKey
+  }
+  return request.post(
+    window.$vueApp.config.globalProperties.baseAPI + '/sso/is-password-expired-with-validate-code',
+    usernamePasswordToken
+  )
+}
+
+
 /** 更新密码 */
 function updatePassword(data) {
   return request.put(
@@ -198,6 +218,14 @@ function getDevPlatformPermissions(roleCodes) {
   )
 }
 
+
+
+function getCurrentUserMobilePermissions (loginName) {
+  
+  console.log('getCurrentUserMobilePermissions----loginName=', loginName, 'window.$vueApp.config.globalProperties.baseAPI=', window.$vueApp.config.globalProperties.baseAPI)
+  return request.get(window.$vueApp.config.globalProperties.baseAPI + '/sso/current-users/mobile-permissions?loginName=' + encodeURI(loginName) + '&_t=' + new Date().getTime())
+}
+
 export default {
   login,
   getCurrentUser,
@@ -213,5 +241,6 @@ export default {
   isLoginTimeOut,
   getUserPermissionMenusBySystemCode,
   loginWithValidateCode,
-  getDevPlatformPermissions
+  getDevPlatformPermissions,
+  isPasswordExpiredWithValidateCode
 }

package/src/directives/permission/permission.js

@@ -12,9 +12,10 @@ export default {
         el.parentNode && el.parentNode.removeChild(el)
       }
     } else {
-      throw new Error(
-        `need permission1! Like v-permission="acs.department.save"`
-      )
+      console.log( `need permission1! Like v-permission="acs.department.save"`)
+      // throw new Error(
+      //   `need permission1! Like v-permission="acs.department.save"`
+      // )
     }
   },
 }