agilebuilder-ui 1.1.10 → 1.1.12-tmp1

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

@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="isShowForm" direction="btt" size="100%" class="organization-tree" @close="closeTree()">
+    <el-drawer v-model="isShowForm" append-to-body :close-on-click-modal="false" :close-on-press-escape="false" direction="btt" size="100%" class="organization-tree" @close="closeTree()">
     <template #header>
         <div style="text-align: center;">
             {{$t('imatrixUIMessage.pleaseSelect')}}

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

@@ -39,7 +39,7 @@
           <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.showName }}<span v-if="data.parentNodeId !== '-1' && getDeptNamePath(data)" style="color:#999">({{ getDeptNamePath(data) }})</span></div>
+          <div v-else class="item-label"  @click="loadChildren(data,false)">{{ data.showName }}<span v-if="data.parentNodeId !== '-1' && getDeptNamePath(data)" style="color:#999">({{ getDeptNamePath(data) }})</span></div>
           <div v-if="!data.nodeType || data.nodeType !== 'USER'" class="item-side" @click="loadChildren(data,false)">
            <el-icon><ArrowRight /></el-icon>
           </div>

package/packages/fs-upload-list/src/fs-upload-list.vue

@@ -138,7 +138,7 @@ import { getSystemFrontendUrl, isPlateSys, isMobileBrowser } from '../../../src/
 import FsPreview from '../../fs-preview/src/fs-preview.vue'
 import { packageFile } from '../../super-grid/src/utils'
 import FileUploadInputMobile from '../../fs-upload-new/src/file-upload-mobile/file-upload-input.vue'
-
+import { Base64 } from 'js-base64'
 export default {
   name: 'FsUploadList',
   props: {

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-app.vue

@@ -156,7 +156,7 @@ const emits = defineEmits(['remove', 'uploadend'])
 
 // 表示点击了选择文件按钮
 function pickBrowserFiles() {
-  // console.log('---点击了选择文件按钮---')
+  console.log('---点击了选择文件按钮---')
   const message = {
     type: 'pickFiles',
     multiple: props.multiple,
@@ -166,7 +166,21 @@ function pickBrowserFiles() {
     token: getToken(),
     listCode: props.listCode
   }
-  window.parent.postMessage(JSON.stringify(message), '*')
+  if(window.parent && window.parent.parent && window.parent.parent.parent ) {
+  console.log('---点击了选择文件按钮111---')
+  message.myCustom = 'window.parent.parent.parent'
+    // 加上uniapp中的iframe，一共是4层iframe嵌套时.最多支持4层iframe嵌套。
+    window.parent.parent.parent.postMessage(JSON.stringify(message), '*')
+  } else if(window.parent && window.parent.parent) {
+  console.log('---点击了选择文件按钮222---')
+  message.myCustom = 'window.parent.parent'
+    // 加上uniapp中的iframe，一共是3层iframe嵌套时
+    window.parent.parent.postMessage(JSON.stringify(message), '*')
+  } else {
+  console.log('---点击了选择文件按钮444---')
+  message.myCustom = 'window.parent'
+    window.parent.postMessage(JSON.stringify(message), '*')
+  }
 }
 
 function pickFileDone(data) {

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-browser.vue

@@ -15,7 +15,7 @@
       @chooseFile="pickBrowserFiles"
       @remove="removeFile"
     />
-    <template v-if="openCameraOrChoosePhoto && openCameraOrChoosePhoto === 'openCamera'">
+    <!-- <template v-if="openCameraOrChoosePhoto && openCameraOrChoosePhoto === 'openCamera'"> -->
       <!-- 由于直接打开capture相机属性的设置为空或者不是user/environment其中的任意一项时会打开的本地捕获音频 麦克风-->
       <!-- 所有使用 template 可查看 https://w3c.github.io/html-media-capture/#introduction -->
       <input
@@ -39,7 +39,7 @@
         :accept="myAccept"
         @change="uploadFiles"
       />
-    </template>
+    <!-- </template>
     <template v-else>
       <input
         v-if="multiple && !disabled"
@@ -60,7 +60,7 @@
         :accept="myAccept"
         @change="uploadFiles"
       />
-    </template>
+    </template> -->
     <el-drawer v-model="fileTypeFlag" direction="btt" @close="fileTypeFlag = false">
     <div><el-button
         link
@@ -261,17 +261,17 @@ function removeFile(param) {
   }
 }
 function pickBrowserFiles() {
-  if (props.openCameraOrChoosePhoto && props.openCameraOrChoosePhoto === 'openCamera') {
+  // if (props.openCameraOrChoosePhoto && props.openCameraOrChoosePhoto === 'openCamera') {
     // 只打开相机
     myAccept.value = 'image/*'
     setTimeout(() => {
       fileRef.value.click()
     })
-  } else {
-    // 相机和文件都可以选
-    myAccept.value = '*'
-    fileTypeFlag.value = true
-  }
+  // } else {
+  //   // 相机和文件都可以选
+  //   myAccept.value = '*'
+  //   fileTypeFlag.value = true
+  // }
 }
 
 function confirmFileType(fileType: string) {

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-component.vue

@@ -13,7 +13,7 @@
         <div  class="file-name-container" >
             {{file.name}}
         </div></div>
-        <img v-else class="el-upload-list__item-thumbnail" :src="getPreviewSrc(file.name, file.serverPath)" alt="" />
+        <img v-else class="el-upload-list__item-thumbnail" :src="getPreviewSrc(file.showName?file.showName: file.name, file.serverPath)" alt="" />
         <fs-preview-new :disabled="disabled" :file-list="fileListResult" :file="file" :system-code="systemCode" :before-remove="beforeRemove" :on-remove="onRemove" :before-download="beforeDownload" @remove="removeFile"/>
 
       </div>
@@ -81,7 +81,7 @@ let baseURL = props.baseURL
 const baseAPI = window.$vueApp.config.globalProperties.baseAPI
 
 const fileListResult = ref(props.fileList)
-console.log('file-upload-component---fileListResult=', fileListResult.value)
+console.log('file-upload-component---fileListResult=', fileListResult.value?JSON.stringify(fileListResult.value):fileListResult.value)
 function changeFileList(fileList: any) {
   fileListResult.value = fileList
 }
@@ -90,7 +90,7 @@ const chooseFile = ()=>{
   emits('chooseFile')
 }
 const isImg = (file: Object) =>{
-    return isImage(file.name)
+    return isImage(file.showName?file.showName:file.name)
 }
 
 function getPreviewSrc(showName: string, serverPath: string) {

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-input.vue

@@ -179,6 +179,7 @@ const props = defineProps({
 const emits = defineEmits(['remove', 'uploadend'])
 const annexUploadFlag = ref(false)
 const fileNames = ref(null)
+fileNames.value = props.fileList && props.fileList.length > 0 ? props.fileList.map((item: any) => item.showName).join(','): null
 
 const openAnnexUpload = ()=>{
   console.log('点击选择文件按钮---')

package/packages/fs-upload-new/src/fs-preview-new.vue

@@ -52,6 +52,7 @@ import { ref, defineProps } from 'vue'
 import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getReplaceUrlDomain } from '../../../src/utils/common-util'
 import { getToken } from '../../../src/utils/auth'
 import { isImage } from '../../../src/utils/util'
+import { Base64 } from 'js-base64'
 const props = defineProps({
   systemCode: {
     type: String,
@@ -223,8 +224,8 @@ const previweDoc = (showName: string, serverPath: string) => {
       const myPreviewUrl = originUrl + '&fullfilename=' + showName
       console.log('myPreviewUrl====', myPreviewUrl)
       // http://127.0.0.1:8012/onlinePreview
-      previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl + '?url=' + 1
-      // encodeURIComponent(Base64.encode(myPreviewUrl))
+      previewUrl =
+        window.$vueApp.config.globalProperties.kkFileViewUrl + '?url=' + encodeURIComponent(Base64.encode(myPreviewUrl))
       console.log('previewUrl====', previewUrl)
     } else {
       previewUrl = baseUrl + '/common/fs-upload/preview?jwt=' + token

package/packages/organization-input/src/organization-input.vue

@@ -1,5 +1,5 @@
 <template>
-  <span style="width: 100%">
+  <span style="width: 100%" class="organization-input">
     <template v-if="disabled">
       <el-input
         :disabled="true"
@@ -221,7 +221,7 @@ export default {
     getPropName(prop, isJoinTable, tableName) {
       if (prop && prop.startsWith('${')) {
         // 格式是：${page.xxx} 或 ${data.xxx}
-        prop = prop.substring(prop.indexOf('.')+1, prop.length - 1)
+        prop = prop.substring(prop.indexOf('.') + 1, prop.length - 1)
       }
       return getPropNameWhenJoinTable(prop, isJoinTable, tableName)
     },
@@ -296,7 +296,7 @@ export default {
     },
     getModelValue(model, propType) {
       let models = this.models
-      if(propType && propType === 'page') {
+      if (propType && propType === 'page') {
         models = this.pageModels
       }
       let modelValue = ''
@@ -305,8 +305,8 @@ export default {
         modelValue = parentObj[model.substring(model.lastIndexOf('.') + 1)]
       } else {
         const name = this.getPropName(model)
-        if(propType && propType === 'page') {
-          modelValue = models?models[name]: null
+        if (propType && propType === 'page') {
+          modelValue = models ? models[name] : null
         } else {
           modelValue = models[name]
         }
@@ -520,11 +520,11 @@ export default {
       }
     },
     setValue(model, finallyOrgResult, propType) {
-      if(!propType) {
-          propType = this.getPropType(model)
+      if (!propType) {
+        propType = this.getPropType(model)
       }
       let models = this.models
-      if(propType && propType === 'page') {
+      if (propType && propType === 'page') {
         models = this.pageModels
       }
       this.setEntityValue(model, finallyOrgResult, models)
@@ -579,3 +579,8 @@ export default {
   emits: ['replace', 'setValue', 'clear', 'focus', 'update:value', 'change']
 }
 </script>
+<style lang="css">
+.organization-input .el-input-group__append {
+  padding: 0 10px;
+}
+</style>

package/packages/row-form/index.vue

@@ -13,6 +13,19 @@
       </div>
     </template>
     <template #default>
+      <operation
+        v-if="operationColumn"
+        :column="operationColumn"
+        :list-code="listCode"
+        :currentPage="currentPage"
+        :grid-data="gridData"
+        :page-grid-data="pageGridData"
+        :row="gridData[realEditIndex]"
+        :rowIndex="realEditIndex"
+        :parentFormData="parentFormData"
+        @refreshList="refreshList"
+        @afterClick="afterClickBtn"
+      />
       <el-form label-width="auto">
         <template v-for="(column, index) in columns" >
           <el-form-item  :key="index" v-if="column.prop != '$index' && column.prop != '$selection'  && column.prop != 'operation'" :label="getMyHeaderLable(column)" >
@@ -57,6 +70,7 @@
 </template>
 <script lang="ts">
 export default {
+  components: { operation },
   name: 'RowForm'
 }
 </script>
@@ -66,6 +80,9 @@ import {
   getHeaderLable
 } from '../super-grid/src/utils'
 import { reactive, ref, onMounted, defineEmits, nextTick } from 'vue'
+import RowOperation from '../super-grid/src/row-operation.vue'
+import store from '../super-grid/src/store'
+import operation from './operation.vue'
 const props = defineProps<{
   columns: {
     type: Array<any>
@@ -124,6 +141,16 @@ const props = defineProps<{
     type: Object
     default: null
   }
+  // 是否显示分页
+  showPage: {
+    type: Boolean
+    default: false
+  }
+  // 每页显示多少条
+  pageSize: {
+    type: Number,
+    default: null
+  }
 }>()
 const emits = defineEmits([
   'open-page',
@@ -132,11 +159,37 @@ const emits = defineEmits([
   'refresData',
   'refresPortData',
   'refresPortsData',
-  'refresMainTableFields'
+  'refresMainTableFields',
+  'refreshList'
 ])
-const realEditIndex: any = ref(props.rowIndex)
+const realEditIndex: any = ref(getCurrentRowIndex())
+
 const isShowForm = ref(true)
 const reload = ref(true)
+let parentFormData:any
+const gridParams = store.get(props.listCode)
+const options = gridParams.options
+if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
+  parentFormData = gridParams.options.extraParam.entityMap
+}
+const operationColumn = ref(null)
+const operationCols = props.columns?props.columns.filter(item=>item.prop&&item.prop==='operation'):null
+if(operationCols && operationCols.length > 0) {
+  operationColumn.value= operationCols[0]
+}
+
+function getCurrentRowIndex() {
+  let realRowIndex:any = props.rowIndex
+  if(props.showPage){
+    if(props.rowIndex < props.pageSize) {
+      realRowIndex = ((props.currentPage-1) * props.pageSize) + props.rowIndex
+    } else {
+      realRowIndex = (props.currentPage * props.pageSize)-1
+    }
+  }
+  return realRowIndex
+}
+
 function getMyHeaderLable(column) {
   return getHeaderLable(column)
 }
@@ -146,7 +199,6 @@ function prevRow() {
   nextTick(() => {
     reload.value = true
   })
-  console.log(realEditIndex.value)
 }
 function nextRow() {
   reload.value = false
@@ -154,7 +206,6 @@ function nextRow() {
   nextTick(() => {
     reload.value = true
   })
-  console.log(realEditIndex.value)
 }
 function isShowColumn(column) {
   let hidden = true
@@ -208,4 +259,17 @@ function refresPortsData(map) {
 function refresMainTableFields(map) {
   emits('refresMainTableFields', map)
 }
+
+function refreshList() {
+  emits('refreshList')
+}
+
+function afterClickBtn(params) {
+  console.log('afterClickBtn----params=', params)
+  reload.value = false
+  realEditIndex.value=props.gridData.length - 1
+  nextTick(() => {
+    reload.value = true
+  })
+}
 </script>

package/packages/row-form/operation.vue

@@ -0,0 +1,151 @@
+<template>
+  <div v-if="column.operations" class="grid-operation-buttons operation-area">
+    <span
+      v-for="(operation, operationIndex) in column.operations"
+      :key="operationIndex"
+      :class="isShowForm ? '' : 'cell--span'"
+    >
+      <el-dropdown
+        v-if="operation.isGroup"
+        :size="operation.buttons && operation.buttons.length > 0 ? operation.buttons[0].props.size : 'small'"
+        split-button
+        style="padding-left: 10px"
+        @command="handleCommand"
+      >
+        {{ $escapeHtml(operation.label) }}
+        <template v-slot:dropdown>
+          <el-dropdown-menu>
+            <span
+              v-for="(buttonChild, buttonChildIndex) in operation.buttons"
+              :key="buttonChild.props.code + buttonChildIndex"
+            >
+              <el-dropdown-item
+                v-permission="buttonChild.props.permission"
+                :command="beforeHandleCommand(buttonChild.props.code, row, rowIndex)"
+                :disabled="preventReclick"
+              >
+                {{ $escapeHtml(buttonChild.props.label) }}
+              </el-dropdown-item>
+            </span>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
+      <component
+        :is="operation.props.customControl"
+        v-else-if="operation.props.customControl"
+        v-permission="operation.props.permission"
+        :key="column.prop + '_' + rowIndex + '_' + currentPage"
+        :disabled="true"
+        :row="pageGridData[rowIndex]"
+        :entity="pageGridData[rowIndex]"
+        :prop="column.prop"
+        :parent="parentFormData"
+        :row-index="rowIndex"
+        :grid-data="gridData"
+        :page-grid-data="pageGridData"
+        :current-page="currentPage"
+        @refresh-list="refreshList"
+      />
+      <row-operation
+        v-else
+        :column="column"
+        :editing="row.$editing"
+        :entity="row"
+        :is-show="operation.isShow"
+        :label="operation.props.label ? operation.props.label : row[column.prop]"
+        :on-click="operation.onClick"
+        :operation-index="operationIndex"
+        :operation-setting="operation.props"
+        :row-index="rowIndex"
+        :list-code="listCode"
+        :parent-form-data="parentFormData"
+        @afterClick="afterClickBtn"
+      />
+    </span>
+  </div>
+</template>
+<script lang="ts">
+export default {
+  name: 'RowForm'
+}
+</script>
+<script setup lang="ts">
+import NormalColumnContent from '../super-grid/src/normal-column-content.vue'
+import { getHeaderLable } from '../super-grid/src/utils'
+import { reactive, ref, onMounted, defineEmits, nextTick } from 'vue'
+import RowOperation from '../super-grid/src/row-operation.vue'
+import customFormatter from '../super-grid/src/custom-formatter'
+const props = defineProps<{
+  column: {
+    type: Object,
+    default: null
+  }
+  listCode: {
+    type: String
+    default: null
+  }
+  currentPage: {
+    type: Number
+    default: 1
+  }
+  gridData: {
+    type: Array<any>
+    default: null
+  }
+  pageGridData: {
+    type: Array<any>
+    default: null
+  }
+  // 行记录序号
+  rowIndex: {
+    type: Number
+    default: 0
+  }
+  // 父表单实体
+  parentFormData: {
+    type: Object
+    default: null
+  }
+  row: {
+    type: Object
+    default: null
+  }
+}>()
+const emits = defineEmits([
+  'refreshList',
+  'afterClick'
+])
+const realEditIndex: any = ref(props.rowIndex)
+const isShowForm = ref(true)
+const reload = ref(true)
+function beforeHandleCommand(comman, row, rowIndex) {
+  return {
+    comman: comman,
+    row: row,
+    rowIndex: rowIndex
+  }
+}
+function handleCommand(comman) {
+  let prop = null
+  props.column.operations.forEach((item) => {
+    if (item.isGroup) {
+      item.buttons.forEach((button) => {
+        if (button.props.code === comman.comman) {
+          prop = button
+        }
+      })
+    }
+  })
+  if (prop) {
+    customFormatter.onClickFun(comman.row, props.column, prop.onClick, comman.rowIndex)
+  }
+}
+
+function refreshList() {
+  emits('refreshList')
+}
+
+function afterClickBtn() {
+  emits('afterClick',{row: props.row, column: props.column, rowIndex: props.rowIndex})
+}
+</script>

package/packages/super-grid/src/dynamic-input.vue

@@ -1022,15 +1022,26 @@ export default {
         }
       }
     },
+    orgTreeSetSort() {
+      // 设值排下序，否则出现所有映射还没设值完毕，就触发了change事件问题
+      const columnPropIndex = this.fields.findIndex((filed) => filed.model === this.column.prop)
+      if (columnPropIndex > -1) {
+        const tempFiled = this.fields[columnPropIndex]
+        this.fields.splice(columnPropIndex, 1)
+        this.fields.push(tempFiled)
+      }
+    },
     // 显示组织树时需要计算指定部门
     showOrganizationTree() {
       if (this.column.orgTreeSet) {
         const orgTreeSet = JSON.parse(this.column.orgTreeSet)
         if (orgTreeSet.length) {
           this.fields = orgTreeSet
+          this.orgTreeSetSort()
         } else {
           if (orgTreeSet.orgTreeSetArr) {
             this.fields = orgTreeSet.orgTreeSetArr
+            this.orgTreeSetSort()
           }
           if (orgTreeSet.specifyType) {
             if (orgTreeSet.specifyType === 'dataTable') {

package/packages/super-grid/src/normal-column-content.vue

@@ -59,13 +59,7 @@
                     :disabled="preventReclick"
                   >
                     {{
-                      $escapeHtml(
-                        buttonChild.props.label
-                          ? buttonChild.props.label
-                          : buttonChild.props.code === 'search'
-                          ? $t('superPageMessage.searchButtonLabel')
-                          : ''
-                      )
+                      $escapeHtml(buttonChild.props.label)
                     }}
                   </el-dropdown-item>
                 </span>

package/packages/super-grid/src/row-operation.vue

@@ -158,6 +158,7 @@ export default {
         this.rowIndex,
         button
       )
+      this.$emit('afterClick',{row: this.entity, column: this.column, rowIndex: this.rowIndex})
     },
     isShowButton() {
       // const start = new Date().getTime()

package/packages/super-grid/src/super-grid-service.js

@@ -176,6 +176,7 @@ const superGridService = {
                 gridParams.pagination = this.pagination
                 gridParams.pageContext = this.pageContext
                 gridParams.configureObj = this.configureObj
+                this.tableName = this.basicInfo.tableName
                 gridParams.hiddenColumns = this.options.hiddenColumns?JSON.parse(JSON.stringify(this.options.hiddenColumns)):[]
                 if (this.pagination) {
                   // 监控每行显示多少条变量使用

package/packages/super-grid/src/super-grid.vue

@@ -229,6 +229,8 @@
       :grid-data="isSubTableShowPage ? subTableData : gridData"
       :page-grid-data="isSubTableShowPage ? getSubTableGridData(subTableData) : gridData"
       :line-edit="lineEdit"
+      :show-page="pagination && isShowPage"
+      :page-size="pagination?pagination.pageSize: null"
       @close="closeRowForm"
       @refresData="refresData"
       @refresPortData="refresPortData"
@@ -236,6 +238,7 @@
       @refresMainTableFields="refresMainTableFields"
       @open-page="openPageDialog"
       @prohibitToEdit="prohibitToEdit"
+      @refreshList="refreshList"
     />
   </div>
 </template>
@@ -2161,7 +2164,8 @@ export default {
     },
     getSearchParam() {
       const searchParam = {
-        code: this.code
+        code: this.code,
+        tableName: this.tableName
       }
       const gridParams = store.get(this.code)
       const pagination = this.getPaginationInfo()
@@ -2343,12 +2347,24 @@ export default {
     },
     packageSummaryColumnProps() {
       const summaryColumnProps = []
-      this.visibleColumns.forEach((item) => {
+      // this.visibleColumns.forEach((item) => {
+      //   if (item.total !== undefined && item.total === true) {
+      //     summaryColumnProps.push(item.prop)
+      //   } else if (item.groupHeader && item.children && item.children.length > 0) {
+      //     setGroupHeaderChildernSummary(item.children, summaryColumnProps)
+      //   }
+      // })
+      this.setGroupHeaderChildernSummary(this.visibleColumns, summaryColumnProps)
+      return summaryColumnProps
+    },
+    setGroupHeaderChildernSummary(columns, summaryColumnProps) {
+      columns.forEach((item) => {
         if (item.total !== undefined && item.total === true) {
           summaryColumnProps.push(item.prop)
+        } else if (item.groupHeader && item.children && item.children.length > 0) {
+          this.setGroupHeaderChildernSummary(item.children, summaryColumnProps)
         }
       })
-      return summaryColumnProps
     },
     getSummaries(param) {
       // 后台返回时需要处理好序号列和多选列

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

@@ -3,6 +3,8 @@
 		<WorkgroupMobileTree
 			v-if="isMobile"
 			ref="workgroupTree"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
 			:branch-info="branchInfo"
 			:multiple="multiple"
 			:search-field="searchField"

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

@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="isShowForm" :close-on-click-modal="false" :close-on-press-escape="false" direction="btt" size="100%" class="organization-tree" @close="closeTree()">
+    <el-drawer v-model="isShowForm" append-to-body :close-on-click-modal="false" :close-on-press-escape="false"  direction="btt" size="100%" class="organization-tree" @close="closeTree()">
     <template #header>
         <div style="text-align: center;">
             {{$t('imatrixUIMessage.pleaseSelect')}}

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

@@ -2,6 +2,8 @@
 	<div>
 		<WorkgroupMobileUserTree
 			v-if="isMobile"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
 			:multiple="multiple"
 			:branch-info="branchInfo"
 			:search-field="searchField"

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

@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="isShowForm" direction="btt" size="100%" class="organization-tree" @close="closeTree()">
+    <el-drawer v-model="isShowForm" append-to-body :close-on-click-modal="false" :close-on-press-escape="false" direction="btt" size="100%" class="organization-tree" @close="closeTree()">
     <template #header>
         <div style="text-align: center;">
             {{$t('imatrixUIMessage.pleaseSelect')}}

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

@@ -39,7 +39,7 @@
           <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-else class="item-label" @click="loadChildren(data,false)">{{ data.name }}</div>
           <div v-if="!data.nodeType || data.nodeType !== 'USER'" class="item-side" @click="loadChildren(data,false)">
            <el-icon><ArrowRight /></el-icon>
           </div>