agilebuilder-ui 1.1.36-p1 → 1.1.36-sit2

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

@@ -1,64 +1,71 @@
-export function getTenant () {
+export function getTenant() {
   const parentId = 0
-  return window['$vueApp'].config.globalProperties.$http.get(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/departments/' + parentId)
+  return window['$vueApp'].config.globalProperties.$http.get(
+    window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/departments/' + parentId
+  )
 }
 
 // 获得公司节点的孩子节点
-export function getTenantChildren (departmentInfo, tenantNodeId) {
-    if (departmentInfo && departmentInfo.length > 0) {
-      // 加载指定部门时，展开公司节点
-      return loadPointDepartments(departmentInfo)
-    } else {
-      // 加载整个组织结构树时，展开公司节点
-      return loadDepartment(tenantNodeId, null)
-    }
-  
+export function getTenantChildren(departmentInfo, tenantNodeId, limitFilterColumn) {
+  if (departmentInfo && departmentInfo.length > 0) {
+    // 加载指定部门时，展开公司节点
+    return loadPointDepartments(departmentInfo, limitFilterColumn)
+  } else {
+    // 加载整个组织结构树时，展开公司节点
+    return loadDepartment(tenantNodeId, null)
+  }
 }
 
-
-  // 加载指定部门节点
-export function loadPointDepartments (departmentInfo) {
-  return new Promise((resolve,reject)=>{
-    window['$vueApp'].config.globalProperties.$http.post(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/point-department-users', departmentInfo).then(children => {
+// 加载指定部门节点
+export function loadPointDepartments(departmentInfo, limitFilterColumn) {
+  return new Promise((resolve, reject) => {
+    let url = window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/point-department-users'
+    if (limitFilterColumn) {
+      url += '/' + limitFilterColumn
+    }
+    window['$vueApp'].config.globalProperties.$http.post(url, departmentInfo).then((children) => {
       resolve(children)
     })
   })
 }
 
-
-  // 加载当前节点的子节点
-  export function loadDepartment (parentId, branchId) {
-    let param = {
-      parentId: parentId,
-      needVirtualUser: false,
-      branchId: null
-    }
-    if (branchId) {
-      param.branchId = branchId
-    }
-    return new Promise((resolve,reject)=>{
-       window['$vueApp'].config.globalProperties.$http.post(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
-      .then(children => {
-        resolve(children)
-      })
-    })
+// 加载当前节点的子节点
+export function loadDepartment(parentId, branchId) {
+  let param = {
+    parentId: parentId,
+    needVirtualUser: false,
+    branchId: null
   }
-  export function checkedDeptDefault (selectDepts, defaultCheckedKeys) {
-    defaultCheckedKeys = []
-    selectDepts.forEach(dept => {
-      defaultCheckedKeys.push(dept.nodeId)
-    })
-  }
-  // ,
-  // isDeptOrUser (item, dept) {
-  //   return item.id === dept.id && item.nodeType && dept.nodeType && item.nodeType === dept.nodeType
-  // },
-  export function getUserInDepartments (departmentIds) {
-    return window['$vueApp'].config.globalProperties.$http.post(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/user-only-in-departments', departmentIds)
+  if (branchId) {
+    param.branchId = branchId
   }
-  // getTenantNoDeptUsers () {
-  //   return this.$http.get(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/tenant-no-dept-users')
-  // },
-  // getBranchNoDeptUsers (branchId) {
-  //   return this.$http.get(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/branch-no-dept-users/' + branchId)
-  // }
+  return new Promise((resolve, reject) => {
+    window['$vueApp'].config.globalProperties.$http
+      .post(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
+      .then((children) => {
+        resolve(children)
+      })
+  })
+}
+export function checkedDeptDefault(selectDepts, defaultCheckedKeys) {
+  defaultCheckedKeys = []
+  selectDepts.forEach((dept) => {
+    defaultCheckedKeys.push(dept.nodeId)
+  })
+}
+// ,
+// isDeptOrUser (item, dept) {
+//   return item.id === dept.id && item.nodeType && dept.nodeType && item.nodeType === dept.nodeType
+// },
+export function getUserInDepartments(departmentIds) {
+  return window['$vueApp'].config.globalProperties.$http.post(
+    window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/user-only-in-departments',
+    departmentIds
+  )
+}
+// getTenantNoDeptUsers () {
+//   return this.$http.get(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/tenant-no-dept-users')
+// },
+// getBranchNoDeptUsers (branchId) {
+//   return this.$http.get(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/branch-no-dept-users/' + branchId)
+// }

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

@@ -362,7 +362,7 @@ function validateCanUploadFile(file, limitFileSize) {
     ElMessage({
       showClose: true,
       type: 'warning',
-      message: t('fileUpload.exceedFileSize', { fileName: file.name, fileSize: limitFileSize })
+      message: t('imatrixUIMessage.exceedFileSize', { fileName: file.name, fileSize: limitFileSize })
     })
     // 返回false停止上传
     isCanUpload = false

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

@@ -39,6 +39,7 @@
       :search-field="searchField"
       :select-user-info="selectOrganizationInfo"
       :separator="separator"
+      :limit-filter-column="limitFilterColumn"
       @close="closeOrganizationTree"
     />
     <!-- 部门树 -->
@@ -47,8 +48,10 @@
       :check-strictly="typeof checkStrictly === 'undefined' ? false : checkStrictly"
       :multiple="typeof multiple === 'undefined' ? false : multiple"
       :search-field="searchField"
+      :department-info="departmentInfo"
       :select-department-info="selectOrganizationInfo"
       :separator="separator"
+      :limit-filter-column="limitFilterColumn"
       width="30%"
       @close="closeOrganizationTree"
     />
@@ -60,6 +63,7 @@
       :search-field="searchField"
       :select-workgroup-info="selectOrganizationInfo"
       :separator="separator"
+      :limit-filter-column="limitFilterColumn"
       width="30%"
       @close="closeOrganizationTree"
     />
@@ -71,6 +75,7 @@
       :search-field="searchField"
       :select-user-info="selectOrganizationInfo"
       :separator="separator"
+      :limit-filter-column="limitFilterColumn"
       width="30%"
       @close="closeOrganizationTree"
     />
@@ -102,11 +107,14 @@
 import { Delete as ElIconDelete, Search as ElIconSearch } from '@element-plus/icons-vue'
 // import Vue from 'vue'
 import { getPropNameWhenJoinTable, setEntityFieldValue } from '../../../src/utils/util'
-
+import DepartmentUserTree from '../../department-user-tree/src/department-user-tree.vue'
+import DepartmentTree from '../../department-tree/src/department-tree.vue'
 export default {
   components: {
     ElIconSearch,
-    ElIconDelete
+    ElIconDelete,
+    DepartmentUserTree,
+    DepartmentTree
   },
   name: 'OrganizationInput',
   model: {
@@ -184,6 +192,11 @@ export default {
     pageModels: {
       type: Object,
       default: null
+    },
+    // 根据变量限制部门时，根据部门表的哪个字段进行过滤，默认是code
+    limitFilterColumn: {
+      type: String,
+      default: 'code'
     }
   },
   data() {
@@ -369,20 +382,24 @@ export default {
             }
           }
           return mainDeptIds.join(this.separator)
-        } else if (orgDataType === 'mainDeptCode') {
-          // 正职部门code
-          const mainDeptCodes = []
+        } else if (orgDataType === 'mainDeptCode' || orgDataType === 'mainDeptName') {
+          // 正职部门code或名称
+          // 这里的orgDataType是mainDeptCode或mainDeptName
+          // 需要根据orgDataType来判断返回的值
+          // 如果是mainDeptCode，则返回mainDepartmentCode，如果是mainDeptName，则返回mainDepartmentName
+          const mainDeptColumn = []
+          const key = orgDataType === 'mainDeptCode' ? 'mainDepartmentCode' : 'mainDepartmentName'
           if (isUserTree) {
             const users = selectNodeInfo.users
             if (users) {
               users.forEach((user) => {
-                if (user.mainDepartmentCode) {
-                  mainDeptCodes.push(user.mainDepartmentCode)
+                if (user[key]) {
+                  mainDeptColumn.push(user[key])
                 }
               })
             }
           }
-          return mainDeptCodes.join(this.separator)
+          return mainDeptColumn.join(this.separator)
         } else if (orgDataType === 'subCompanyName') {
           // 分支名称
           const branchNames = []
@@ -445,16 +462,21 @@ export default {
             }
           }
           return mainDeptId
-        } else if (orgDataType === 'mainDeptCode') {
+        } else if (orgDataType === 'mainDeptCode' || orgDataType === 'mainDeptName') {
+          // 正职部门code或名称
+          // 这里的orgDataType是mainDeptCode或mainDeptName
+          // 需要根据orgDataType来判断返回的值
+          // 如果是mainDeptCode，则返回mainDepartmentCode，如果是mainDeptName，则返回mainDepartmentName
+          const key = orgDataType === 'mainDeptCode' ? 'mainDepartmentCode' : 'mainDepartmentName'
           // 正职部门code
-          let mainDeptCode = null
+          let mainDeptColumn = null
           if (isUserTree) {
             const user = selectNodeInfo.user
             if (user) {
-              mainDeptCode = user.mainDepartmentCode
+              mainDeptColumn = user[key]
             }
           }
-          return mainDeptCode
+          return mainDeptColumn
         } else if (orgDataType === 'subCompanyName') {
           // 分支名称
           let branchName = null

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

@@ -134,7 +134,12 @@ const apis = {
     }
   },
   // 新建行
-  createRow(listCode, row, options) {
+  createRow(listCode, row, options, event) {
+    // addRowIndex 表示新建行插入到第几行后面，默认是-1表示添加到最后面
+    let addRowIndex = -1
+    if (event && event.rowIndex > -1) {
+      addRowIndex = event.rowIndex + 1
+    }
     return new Promise((resolve, reject) => {
       if (!listCode) {
         listCode = store.get('_list_code')
@@ -257,10 +262,18 @@ const apis = {
             if (gridParams.isSubTableShowPage !== undefined && gridParams.isSubTableShowPage === true) {
               // 子表集合添加该新建的行。会触发watch subTableData的监控
               gridParams.isChangePage = true
-              gridParams.subTableData.splice(gridParams.subTableData.length, 0, row)
+              if (addRowIndex >= 0) {
+                gridParams.subTableData.splice(addRowIndex, 0, row)
+              } else {
+                gridParams.subTableData.splice(gridParams.subTableData.length, 0, row)
+              }
             } else {
               // 子表不分页
-              gridData.splice(gridData.length, 0, row)
+              if (addRowIndex >= 0) {
+                gridData.splice(addRowIndex, 0, row)
+              } else {
+                gridData.splice(gridData.length, 0, row)
+              }
               if (gridParams.lineEdit.editingCell) {
                 gridParams.lineEdit.editingCell.row = gridData.length
               }
@@ -284,7 +297,11 @@ const apis = {
           // console.log('创建行所属的list2', gridData)
           // console.log('创建行所属的打印gridParams.gridData', gridParams.gridData)
           const orgRow = Object.assign({}, row)
-          gridParams.orgGridData.splice(0, 0, orgRow)
+          if (addRowIndex >= 0) {
+            gridParams.orgGridData.splice(addRowIndex, 0, orgRow)
+          } else {
+            gridParams.orgGridData.splice(0, 0, orgRow)
+          }
           if (!gridParams.lineEdit.editingCell) {
             gridParams.lineEdit.editingCell = {}
             gridParams.lineEdit.validateErrorField = ''

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

@@ -531,7 +531,7 @@ import dynamicSourceSelect from '../../dynamic-source-select/src/dynamic-source-
 import { getEntityFieldValue, setEntityFieldValue } from '../../../src/utils/util'
 import { getToken } from '../../../src/utils/auth'
 import apis from './apis'
-import ViewImageDialog from './view-image-dialog'
+import ViewImageDialog from './view-image-dialog.vue'
 import { $emit } from '../../utils/gogocodeTransfer'
 import eventBus from './eventBus'
 import { isMobileBrowser, getAuthSource } from '../../../src/utils/common-util'
@@ -664,7 +664,6 @@ export default {
       // 表示手机浏览器访问的
       userAgent = 'browser'
     }
-    console.log('superGrid----window.location.protocol---', window.location.protocol)
     const isDingTalk = getAuthSource() === 'dingtalk' ? true : false
     const isApk = isMobile && userAgent && userAgent === 'app' ? true : false
     const isShowScanIcon =
@@ -677,14 +676,6 @@ export default {
     const colConfigure = gridParams.colConfigureMap ? gridParams.colConfigureMap[this.column.prop] : null
     const runtimeInfo = colConfigure && colConfigure.runtime ? colConfigure.runtime : {}
     const designProperty = runtimeInfo.props ? runtimeInfo.props : {}
-    console.log(
-      'super-grid-dynamicInput--designProperty=',
-      designProperty,
-      'colConfigure=',
-      colConfigure,
-      'gridParams.colConfigureMap=',
-      gridParams.colConfigureMap
-    )
     return {
       deptManTree: false, // 是否是部门人员树
       isMultiTree: false, // 是否是多选树
@@ -1133,7 +1124,6 @@ export default {
         this.blurEvent()
         isInputVal = true
         if (this.innerValue && this.isInputControl() && this.column.dataType === 'TEXT') {
-          console.log('trim value', this.innerValue)
           this.innerValue = this.innerValue.trim()
         }
       }
@@ -1977,7 +1967,6 @@ export default {
       this.blurEvent()
     },
     packageCustomRules(columnRule) {
-      console.log('packageCustomRules---columnRule=', columnRule)
       if (!columnRule) {
         return
       }

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

@@ -106,8 +106,10 @@
             :is-show="operation.isShow"
             :label="operation.props.label ? operation.props.label : row[column.prop]"
             :on-click="operation.onClick"
+            :operation="operation"
             :operation-index="operationIndex"
             :operation-setting="operation.props"
+            :event-name="operation.eventName"
             :row-index="rowIndex"
             :list-code="listCode"
             :parent-form-data="parentFormData"
@@ -1184,7 +1186,6 @@ export default {
       return 'primary'
     },
     changeDisabled(state) {
-      debugger
       this.disabled = state
     },
     refreshList() {

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

@@ -1,10 +1,10 @@
 <template>
   <!--将@click改为@mousedown.native是因为操作列保存按钮时事件和input等组件的@blur冲突，导致保存需要保存两次，因为
       @blur先于@click执行的，所以只会执行@blur，@click就失效了，@mousedown是先于@blur执行的-->
-  <span :style="myStyle">
+  <span class="table-operation-row-btn" :style="myStyle">
     <template v-if="isShowButton()">
       <el-tooltip :disabled="tooltipDisabled" :content="label" placement="top">
-        <template v-if="operationSettingData.permission">
+        <template v-if="operationSettingData?.permission">
           <component
             v-bind="operationSettingData"
             :is="isElementType"
@@ -77,9 +77,13 @@ export default {
       type: String,
       default: null,
     },
+    operation: {
+      type: Object,
+      default: () => ({}),
+    },
     operationSetting: {
       type: Object,
-      default: null,
+      default: () => ({}),
     },
     operationIndex: {
       type: Number,
@@ -92,6 +96,11 @@ export default {
     parentFormData: {
       type: Object,
       default: null
+    },
+    // 按钮绑定的事件名称
+    eventName: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -104,19 +113,20 @@ export default {
     ...mapGetters(['preventReclick']),
     // 是否是保存按钮
     isSaveRow() {
-      return /^\s*function\s+saveRow*\s*\(/.test((this.onClick ?? ''))
+      return ['lineEditSave', 'saveRow'].includes(this.eventName)
     },
     // 是否是删除按钮
     isDeleteRow() {
-      return /^\s*function\s+deleteRow*\s*\(/.test((this.onClick ?? ''))
+      return ['lineEditDelete', 'deleteRow'].includes(this.eventName)
     },
     // 是否是修改按钮
     isEditRow() {
-      return /^\s*function\s+editRow*\s*\(/.test((this.onClick ?? ''))
+      return ['lineEditUpdate', 'editRow'].includes(this.eventName)
     },
     // 是否是取消按钮
     isRestoreRow() {
-      return /^\s*function\s+restoreRow*\s*\(/.test((this.onClick ?? ''))
+      return ['restoreEdit', 'restoreRow'].includes(this.eventName)
+      // return /^\s*function\s+restoreRow*\s*\(/.test((this.onClick ?? ''))
     },
     // 前置图标
     prefixIcon() {
@@ -142,16 +152,16 @@ export default {
     },
     // 后置图标
     suffixIcon() {
-      if(['right'].includes(this.operationSettingData.iconPosition)) return this.operationSetting.iconValue
+      if(['right'].includes(this.operationSetting.iconPosition)) return this.operationSetting.iconValue
       return undefined
     },
     // 是否显示文字按钮 > 图标模式
     isTextIcon() {
       if (this.isTableBtnLinkShow) {
-        if (this.operationSettingData.isTextIcon === undefined) {
+        if (this.operationSetting.isTextIcon === undefined) {
           return this.isSaveRow || this.isDeleteRow || this.isEditRow || this.isRestoreRow
         }
-        return this.operationSettingData.isTextIcon
+        return this.operationSetting.isTextIcon
       } else {
         return false
       }
@@ -166,14 +176,14 @@ export default {
     },
     // 是否自动开启表格 按钮 转 文字按钮
     isTableBtnLinkShow() {
-      if (this.operationSetting.text) return true
+      if (this.operationSetting?.text) return true
       if (this.isTableBtnLink && this.elementType === 'el-button') {
-        return [this.operationSetting.text, this.operationSetting.plain, this.operationSetting.round].every(v => v === undefined)
+        return [this.operationSetting?.text, this.operationSetting?.plain, this.operationSetting?.round].every(v => v === undefined)
       }
       return false
     },
     operationSettingData() {
-      const dataList = { ...this.operationSetting }
+      const dataList = { ...(this.operationSetting ?? {}) }
       if (this.isTableBtnLinkShow) {
         dataList.underline = false
         delete dataList.text