agilebuilder-ui 1.1.36 → 1.1.37

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

@@ -2,117 +2,134 @@
   <div>
     <el-card class="card-content" style="height: 50px">
       <el-row class="item-row item-row-all">
-        <el-col style="width: 100%;">
+        <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 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('departmentTreeInline.pleaseInputNameOrCode')" @clear="filterAppendNodes" @keyup.enter="filterAppendNodes" @blur="filterAppendNodes"  clearable>
-                  <template v-slot:suffix>
-                    <el-icon @click="filterAppendNodes"><Search /></el-icon>
+            <div style="flex: 0 0 80%; text-align: right">
+              <el-input
+                v-model="searchParam.searchValue"
+                :placeholder="$t('departmentTreeInline.pleaseInputNameOrCode')"
+                @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-col>
       </el-row>
     </el-card>
-    <el-card  v-if="tenantName" class="card-content"  style="height: 40px">
+    <el-card v-if="tenantName" class="card-content" style="height: 40px">
       <el-row class="item-row item-row-all">
         <el-col class="item-label dept-path">
           <el-breadcrumb separator="/">
-              <el-breadcrumb-item>
-                  <span>{{tenantName}}</span>
-              </el-breadcrumb-item>
+            <el-breadcrumb-item>
+              <span>{{ tenantName }}</span>
+            </el-breadcrumb-item>
           </el-breadcrumb>
         </el-col>
       </el-row>
     </el-card>
-    <el-card class="card-content org-tree" style="overflow: auto;">
+    <el-card class="card-content org-tree" style="overflow: auto">
       <el-tree
-      ref="orgTreeRef"
-      :data="departments"
-      :show-checkbox="multiple"
-      node-key="nodeId"
-      check-on-click-node
-      :default-checked-keys="defaultCheckedKeys"
-      @check-change="handleCheckNode"
-      @node-click="handleClickNode"
-    >
-      <template #default="{ node, data }">
-        <div class="item-row">
-          <div class="item-label">{{ data.name }}</div>
-          <!-- <div v-if="!data.leaf" class="item-side" @click="loadChildren(data,false)">
+        ref="orgTreeRef"
+        :data="departments"
+        :show-checkbox="multiple"
+        node-key="nodeId"
+        check-on-click-node
+        :default-checked-keys="defaultCheckedKeys"
+        @check-change="handleCheckNode"
+        @node-click="handleClickNode"
+      >
+        <template #default="{ node, data }">
+          <div class="item-row">
+            <div class="item-label">{{ data.name }}</div>
+            <!-- <div v-if="!data.leaf" class="item-side" @click="loadChildren(data,false)">
            <el-icon><ArrowRight /></el-icon>
           </div> -->
-        </div>
-      </template>
-    </el-tree>
+          </div>
+        </template>
+      </el-tree>
     </el-card>
-    <el-card  class="card-footer" style="height: 40px">
-    <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 })}}
-            <span style="padding-left: 10px"><el-icon><ArrowUpBold /></el-icon></span>
+    <el-card class="card-footer" style="height: 40px">
+      <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 }) }}
+              <span style="padding-left: 10px"
+                ><el-icon><ArrowUpBold /></el-icon
+              ></span>
+            </span>
           </span>
-        </span>
-        <span v-else-if="selectDepts.length > 0">
-          {{$t('departmentTreeInline.selectResultInfoHasSelect')}}{{selectDepts[0].name }}
-        </span>
-      </div>
-      <div class="button-area">
-        <el-button size="large" type="primary" @click="saveDept">{{$t('imatrixUIPublicModel.sure')}}</el-button>
+          <span v-else-if="selectDepts.length > 0">
+            {{ $t('departmentTreeInline.selectResultInfoHasSelect') }}{{ selectDepts[0].name }}
+          </span>
+        </div>
+        <div class="button-area">
+          <el-button size="large" type="primary" @click="saveDept">{{ $t('imatrixUIPublicModel.sure') }}</el-button>
+        </div>
       </div>
-    </div>
     </el-card>
-    <deptResult ref="deptResultRef" :selectDepts="selectDepts" @removeDept="removeResultDept"/>
+    <deptResult ref="deptResultRef" :selectDepts="selectDepts" @removeDept="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, initSelectGroups} from './workgroup-tree-service.ts'
-import {resizeScrollTargetHeightUtil, getDeptNamePath} from '../../utils/organization.ts'
+<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, initSelectGroups } from './workgroup-tree-service.ts'
+import { resizeScrollTargetHeightUtil, getDeptNamePath } from '../../utils/organization.ts'
 import deptResult from './dept-result.vue'
-import {ElMessage} from 'element-plus'
-import {useI18n} from "vue-i18n"
+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或部门名称或编码集合，多个之间以逗号隔开
-    selectWorkgroupInfo: {
-      type: [String, Number],
-      default: null,
-    },
-    // 移除部门时，部门属性名称：id、name、code，默认是id
-    searchField: {
-      type: String,
-      default: 'code',
-    },
-    // 多选树时结果之间的分隔符，默认是逗号分隔
-    separator: {
-      type: String,
-      default: ','
-    }
-  }>()
-const emits = defineEmits(["close"])
+  // 是否是多选树，默认是true
+  multiple: {
+    type: Boolean
+    default: true
+  }
+  // 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
+  branchInfo: {
+    type: Array<any>
+    default: null
+  }
+  // 多选部门树时，已选择部门id或部门名称或编码集合，多个之间以逗号隔开
+  selectWorkgroupInfo: {
+    type: [String, Number]
+    default: null
+  }
+  // 移除部门时，部门属性名称：id、name、code，默认是id
+  searchField: {
+    type: String
+    default: 'code'
+  }
+  // 多选树时结果之间的分隔符，默认是逗号分隔
+  separator: {
+    type: String
+    default: ','
+  }
+  // 根据变量限制部门时，根据部门表的哪个字段进行过滤，默认是code
+  limitFilterColumn: {
+    type: String
+    default: 'code'
+  }
+}>()
+const emits = defineEmits(['close'])
 const orgTreeRef = ref(null)
 let tenantInfo = ref(null)
 let containBranch = ref(false)
@@ -124,23 +141,23 @@ let selectDepts = ref([])
 let selectDeptNodeIds = ref([])
 let clickDepts = ref([])
 let defaultCheckedKeys = ref([])
-let deptResultRef:Ref<any> = ref(null)
+let deptResultRef: Ref<any> = ref(null)
 let checkAll = ref(false)
 let searchParam = ref({
   searchValue: null,
   treeType: 'GROUP_TREE',
   departmentInfo: null
 })
-const {t} = useI18n()
-onMounted(()=>{
-  initSelectGroups(props.searchField, props.selectWorkgroupInfo,  props.separator ).then((departments)=>{
+const { t } = useI18n()
+onMounted(() => {
+  initSelectGroups(props.searchField, props.selectWorkgroupInfo, props.separator).then((departments) => {
     selectDepts.value = departments
     getTenantInfo()
   })
   resizeScrollTargetHeight()
 })
 function getTenantInfo() {
-  getTenant().then(data=>{
+  getTenant().then((data) => {
     const tenantData = data[0].data
     tenantInfo.value = JSON.parse(tenantData)
     containBranch.value = data[0].containBranch
@@ -150,28 +167,28 @@ function getTenantInfo() {
 }
 
 function getTenantChildrenDept() {
-    getTenantChildren(props.branchInfo, tenantNodeId).then(children=>{
-        departments.value = children
-        checkedDeptDefault(selectDepts.value, defaultCheckedKeys.value)
-    })
+  getTenantChildren(props.branchInfo, tenantNodeId).then((children) => {
+    departments.value = children
+    checkedDeptDefault(selectDepts.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 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) {
+    if (check) {
       // 表示选择节点时
       addToSelectDept(data)
     } else {
@@ -182,49 +199,48 @@ function handleCheckNode(data, check, isChildrenCheck) {
 }
 
 function handleClickNode(data, node, treenode, events) {
-  if(!props.multiple && data.nodeType && data.nodeType === 'WORKGROUP') {
+  if (!props.multiple && data.nodeType && data.nodeType === 'WORKGROUP') {
     selectDepts.value = [data]
   }
 }
 
-
 function addToSelectDept(dept) {
   console.log('addToSelectDept---selectDepts.value=', selectDepts.value, 'dept=', dept)
-    if(dept.nodeType && dept.nodeType === 'WORKGROUP') {
-      const filterValue = selectDepts.value.filter(item=> item.nodeId === dept.nodeId)
-      if(!filterValue || filterValue.length === 0) {
-        // 表示集合中没有该记录，需要记录到结果集合中
-        selectDepts.value.push(JSON.parse(JSON.stringify(dept)))
-      }
+  if (dept.nodeType && dept.nodeType === 'WORKGROUP') {
+    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) {
-    const index = selectDepts.value.findIndex(selectItem=> selectItem.nodeId === dept.nodeId)
+  const index = selectDepts.value.findIndex((selectItem) => selectItem.nodeId === dept.nodeId)
   console.log('removeSelectDept---selectDepts.value=', selectDepts.value, 'dept=', dept, 'index=', index)
-    if(index !== undefined && index !== -1) {
-      // 删除指定元素
-      selectDepts.value.splice(index, 1)
-    }
-    checkAll.value =false
+  if (index !== undefined && index !== -1) {
+    // 删除指定元素
+    selectDepts.value.splice(index, 1)
+  }
+  checkAll.value = false
 }
 function changeAllCheck(value: boolean) {
   console.log('changeCheck====value=', value)
-  if(props.multiple) {
+  if (props.multiple) {
     // 表示是复选组织树
-    if(value){
+    if (value) {
       // 表示全选时
-      const allNodeIds = departments.value.map((item)=>{
-          return item['nodeId'];
+      const allNodeIds = departments.value.map((item) => {
+        return item['nodeId']
       })
       orgTreeRef.value.setCheckedKeys(allNodeIds, false)
-      departments.value.forEach(item=>{
+      departments.value.forEach((item) => {
         addToSelectDept(item)
       })
     } else {
       // 表示取消全选时
-      departments.value.forEach(item=>{
-       removeSelectDept(item)
+      departments.value.forEach((item) => {
+        removeSelectDept(item)
       })
       orgTreeRef.value.setCheckedKeys([], false)
     }
@@ -261,13 +277,13 @@ function showResult() {
 }
 
 function removeResultDept(dept) {
-  const removeDeptInDepts = selectDepts.value.filter(item=>item.nodeId === dept.nodeId)
-    console.log('removeResultDept-----removeDeptInDepts=', removeDeptInDepts)
-  if(removeDeptInDepts && removeDeptInDepts.length > 0) {
+  const removeDeptInDepts = selectDepts.value.filter((item) => item.nodeId === dept.nodeId)
+  console.log('removeResultDept-----removeDeptInDepts=', removeDeptInDepts)
+  if (removeDeptInDepts && removeDeptInDepts.length > 0) {
     // departments结果存在当前移除的节点时，check-change事件会走removeSelectDept的逻辑
     const selectNodeIds = []
-    selectDepts.value.forEach(item=>{
-      if(item.nodeId !== dept.nodeId) {
+    selectDepts.value.forEach((item) => {
+      if (item.nodeId !== dept.nodeId) {
         selectNodeIds.push(item.nodeId)
       }
     })
@@ -278,98 +294,103 @@ function removeResultDept(dept) {
 }
 
 function saveDept() {
-      if (props.multiple) {
-        let leafSelectNodeInfo = {
-          ids: [],
-          names: [],
-          codes: [],
-          workgroups: []
-        }
-        // const parentIds = []
-        selectDepts.value.forEach(node => {
-          // node.data是部门对象的json字符串信息，通过JSON.parse(node.data)将json字符串转为对象
-          let departmentData
-          // 点开initSelectDepts 查询的数据只有一层
-          if (node.data !== null && node.data !== undefined) {
-            departmentData = JSON.parse(node.data)
-          } else {
-            departmentData = node
-          }
-          addSelectedDepartmentInfo(leafSelectNodeInfo, node, departmentData)
-        })
-        let selectNodeInfo = {
-          ids: [],
-          names: [],
-          codes: [],
-          workgroups: []
-        }
-        Object.assign(selectNodeInfo, leafSelectNodeInfo)
-        if (selectNodeInfo.ids.length > 0) {
-          emits('close', selectNodeInfo)
-        } else {
-          ElMessage({
-            message: t('imatrixUIMessage.pleaseSelectDepartment'),
-            type: 'warning',
-          })
-        }
+  if (props.multiple) {
+    let leafSelectNodeInfo = {
+      ids: [],
+      names: [],
+      codes: [],
+      workgroups: []
+    }
+    // const parentIds = []
+    selectDepts.value.forEach((node) => {
+      // node.data是部门对象的json字符串信息，通过JSON.parse(node.data)将json字符串转为对象
+      let departmentData
+      // 点开initSelectDepts 查询的数据只有一层
+      if (node.data !== null && node.data !== undefined) {
+        departmentData = JSON.parse(node.data)
       } else {
-        const dept = selectDepts.value[0]
-        const department = JSON.parse(dept.data)
-        const showName = dept.name
-        // if (this.containBranch && dept.branchName) {
-        // // 如果包含分支机构，则拼接分支机构名称
-        //   name = name + '（' + dept.branchName + '）'
-        // }
-        department.tenantName = tenantInfo.value.tenantName
-        department.tenantCode = tenantInfo.value.code
-        const selectNodeInfo = {
-          id: dept.id,
-					name: showName,
-					code: department.code,
-					containBranch: containBranch.value,
-					workgroup: department
-        }
-        emits('close', selectNodeInfo)
+        departmentData = node
       }
+      addSelectedDepartmentInfo(leafSelectNodeInfo, node, departmentData)
+    })
+    let selectNodeInfo = {
+      ids: [],
+      names: [],
+      codes: [],
+      workgroups: []
     }
-    // 将选中的部门节点添加到结果集合中
- function   addSelectedDepartmentInfo (result, node, department) {
-      result.ids.push(node.id)
-      result.codes.push(department.code)
-      result.containBranch = containBranch.value
-      department.tenantCode = tenantInfo.value.code
-      department.tenantName = tenantInfo.value.tenantName
-      result.workgroups.push(department)
-      const showName = department.name
-      // if (this.containBranch && node.branchName) {
-      //   // 如果包含分支机构，则拼接分支机构名称
-      //   name = name + '（' + node.branchName + '）'
-      // }
-      result.names.push(showName)
+    Object.assign(selectNodeInfo, leafSelectNodeInfo)
+    if (selectNodeInfo.ids.length > 0) {
+      emits('close', selectNodeInfo)
+    } else {
+      ElMessage({
+        message: t('imatrixUIMessage.pleaseSelectDepartment'),
+        type: 'warning'
+      })
+    }
+  } else {
+    const dept = selectDepts.value[0]
+    const department = JSON.parse(dept.data)
+    const showName = dept.name
+    // if (this.containBranch && dept.branchName) {
+    // // 如果包含分支机构，则拼接分支机构名称
+    //   name = name + '（' + dept.branchName + '）'
+    // }
+    department.tenantName = tenantInfo.value.tenantName
+    department.tenantCode = tenantInfo.value.code
+    const selectNodeInfo = {
+      id: dept.id,
+      name: showName,
+      code: department.code,
+      containBranch: containBranch.value,
+      workgroup: department
     }
+    emits('close', selectNodeInfo)
+  }
+}
+// 将选中的部门节点添加到结果集合中
+function addSelectedDepartmentInfo(result, node, department) {
+  result.ids.push(node.id)
+  result.codes.push(department.code)
+  result.containBranch = containBranch.value
+  department.tenantCode = tenantInfo.value.code
+  department.tenantName = tenantInfo.value.tenantName
+  result.workgroups.push(department)
+  const showName = department.name
+  // if (this.containBranch && node.branchName) {
+  //   // 如果包含分支机构，则拼接分支机构名称
+  //   name = name + '（' + node.branchName + '）'
+  // }
+  result.names.push(showName)
+}
 
-  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-mobile-workgroups', searchParam.value).then(result => {
+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-mobile-workgroups',
+        searchParam.value
+      )
+      .then((result) => {
         if (result) {
           if (result.length === 0) {
             ElMessage({
               message: t('imatrixUIMessage.queryResultIsEmpty'),
-              type: 'warning',
+              type: 'warning'
             })
           }
           departments.value = result
         } else {
           ElMessage({
             message: t('imatrixUIMessage.queryResultIsEmpty'),
-            type: 'warning',
+            type: 'warning'
           })
         }
       })
-    } else {
-     getTenantChildrenDept()
-    }
+  } else {
+    getTenantChildrenDept()
+  }
 }
-</script>
+</script>

package/src/api/sso-service.js

@@ -141,11 +141,11 @@ function getUserLangAndTheme() {
   }
 }
 
-function forgetPasswordSendMail(username, email) {
-  const userInfo = {
-    username,
-    email,
-  }
+function getForgetPasswordMailType(username) {
+  return request.get(window.$vueApp.config.globalProperties.baseAPI + '/sso/forget-passwords/mail-type?username=' + username)
+}
+
+function forgetPasswordSendMail(userInfo) {
   return request.post(
     window.$vueApp.config.globalProperties.baseAPI +
       '/sso/forget-passwords/send-mails',
@@ -236,6 +236,7 @@ export default {
   getUserLanguage,
   getUserLangAndTheme,
   forgetPasswordSendMail,
+  getForgetPasswordMailType,
   isResetPasswordJwtOverdue,
   resetPassword,
   isLoginTimeOut,

package/src/store/modules/table.js

@@ -68,7 +68,6 @@ const app = {
      * @param {Object} context - 上下文对象
      */
     clearAllEditing({ commit }) {
-      debugger
       commit('clearAllEditing');
     }
   },

package/src/styles/theme/dark-blue/sidebar.scss

@@ -220,6 +220,15 @@
     }
   }
 
+// 注释的原因：会导致孙子菜单显示的位置不正确
+  // .sidebar-container-popper .el-menu{
+  //   // height: 100vh;
+  //   height: auto;
+  //   max-height: 100vh;
+  //   overflow-y: auto;
+  //   overflow-x: hidden;
+  //   scroll-behavior: smooth;
+  // }
   .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
     background: #F7F7F8;
     color: rgba(0, 13, 31, 0.85);

package/src/styles/theme/gray/sidebar.scss

@@ -189,14 +189,15 @@
     }
   }
 
-  .sidebar-container-popper .el-menu{
-    // height: 100vh;
-    height: auto;
-    max-height: 100vh;
-    overflow-y: auto;
-    overflow-x: hidden;
-    scroll-behavior: smooth;
-  }
+// 注释的原因：会导致孙子菜单显示的位置不正确
+  // .sidebar-container-popper .el-menu{
+  //   // height: 100vh;
+  //   height: auto;
+  //   max-height: 100vh;
+  //   overflow-y: auto;
+  //   overflow-x: hidden;
+  //   scroll-behavior: smooth;
+  // }
 
   .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
     background: #F7F7F8;

package/src/styles/theme/green/sidebar.scss

@@ -223,6 +223,16 @@
     }
   }
 
+// 注释的原因：会导致孙子菜单显示的位置不正确
+  // .sidebar-container-popper .el-menu{
+  //   // height: 100vh;
+  //   height: auto;
+  //   max-height: 100vh;
+  //   overflow-y: auto;
+  //   overflow-x: hidden;
+  //   scroll-behavior: smooth;
+  // }
+
   .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
     background: #F7F7F8;
     color: rgba(0, 13, 31, 0.85);