agilebuilder-ui 1.1.36-sit4 → 1.1.36-tmp1

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

@@ -1,71 +1,64 @@
-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, limitFilterColumn) {
-  if (departmentInfo && departmentInfo.length > 0) {
-    // 加载指定部门时，展开公司节点
-    return loadPointDepartments(departmentInfo, limitFilterColumn)
-  } else {
-    // 加载整个组织结构树时，展开公司节点
-    return loadDepartment(tenantNodeId, null)
-  }
+export function getTenantChildren (departmentInfo, tenantNodeId) {
+    if (departmentInfo && departmentInfo.length > 0) {
+      // 加载指定部门时，展开公司节点
+      return loadPointDepartments(departmentInfo)
+    } else {
+      // 加载整个组织结构树时，展开公司节点
+      return loadDepartment(tenantNodeId, null)
+    }
+  
 }
 
-// 加载指定部门节点
-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) => {
+
+  // 加载指定部门节点
+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 => {
       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) => {
+
+  // 加载当前节点的子节点
+  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 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)
-// }
+    })
+  }
+  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-preview/src/fs-preview.vue

@@ -37,16 +37,7 @@
         </span>
       </template>
       <el-table :show-header="false" :data="fileList" max-height="60vh">
-        <el-table-column prop="showName" show-overflow-tooltip>
-          <template v-slot="scope">
-            <div style="display: flex; align-items: center">
-              <super-icon :iconValue="getFileIconByName(scope.row.showName)" />
-              <span style="margin-left: 10px; cursor: pointer" @click="previewSingle(scope.row)">
-                {{ scope.row.showName }}
-              </span>
-            </div>
-          </template>
-        </el-table-column>
+        <el-table-column prop="showName" show-overflow-tooltip />
         <el-table-column width="80" align="center">
           <template v-slot="scope">
             <div style="margin: -10px 0">
@@ -78,7 +69,6 @@ import { isPlateSys, getSystemFrontendUrl } from '../../../src/utils/common-util
 import { isImage, getEntityFieldValue } from '../../../src/utils/util'
 import { packageFile } from '../../super-grid/src/utils'
 import { getToken } from '../../../src/utils/auth'
-import { getFileIconByName } from '../../../src/utils/file-util'
 import { Base64 } from 'js-base64'
 export default {
   components: {
@@ -294,18 +284,10 @@ export default {
     },
     formatFileName(fileName) {
       return fileName.replace('#', '~~').replace('?', '~$').replace('&', '$')
-    },
-    getFileIconByName(fileName) {
-      return getFileIconByName(fileName)
     }
   },
   emits: ['close']
 }
 </script>
 
-<style lang="scss" scoped>
-.amb-color-iconfont {
-  width: 30px;
-  height: 30px;
-}
-</style>
+<style lang="scss" scoped></style>

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

@@ -82,35 +82,22 @@
             </span>
           </template>
           <el-table :data="showFileList" :show-header="false">
-            <el-table-column prop="showName" width="300" show-overflow-tooltip>
-              <template v-slot="scope">
-                <div style="display: flex; align-items: center">
-                  <super-icon :iconValue="getFileIconByName(scope.row.showName)" />
-                  <span style="margin-left: 10px; cursor: pointer" @click="previewSingle(scope.row)">
-                    {{ scope.row.showName }}
-                  </span>
-                </div>
-              </template>
-            </el-table-column>
+            <el-table-column prop="showName" width="300" />
             <el-table-column align="right">
               <template v-slot="scope">
                 <el-tooltip :content="$t('imatrixUIPublicModel.preview')" class="item" effect="dark" placement="top">
-                  <el-button type="text" @click="previewSingle(scope.row)">
-                    <el-icon style="cursor: pointer">
-                      <el-icon-view />
-                    </el-icon>
-                  </el-button>
+                  <el-icon style="cursor: pointer" @click="previewSingle(scope.row)">
+                    <el-icon-view />
+                  </el-icon>
                 </el-tooltip>
               </template>
             </el-table-column>
             <el-table-column v-if="!disabled">
               <template v-slot="scope">
                 <el-tooltip :content="$t('imatrixUIPublicModel.delete')" class="item" effect="dark" placement="top">
-                  <el-button type="text" @click="deleteRow(scope.$index)">
-                    <el-icon style="cursor: pointer">
-                      <el-icon-delete />
-                    </el-icon>
-                  </el-button>
+                  <el-icon style="cursor: pointer" @click="deleteRow(scope.$index)">
+                    <el-icon-delete />
+                  </el-icon>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -157,7 +144,6 @@ 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'
-import { getFileIconByName } from '../../../src/utils/file-util'
 export default {
   name: 'FsUploadList',
   props: {
@@ -432,17 +418,8 @@ export default {
     },
     uploadFileDone(data) {
       this.$refs.fileUploadRef.uploadFileDone(data)
-    },
-    getFileIconByName(fileName) {
-      return getFileIconByName(fileName)
     }
   },
   emits: ['close', 'upload-success', 'delete-success', 'delete', 'update:value', 'close', 'update:value']
 }
 </script>
-<style lang="scss" scoped>
-.amb-color-iconfont {
-  width: 30px;
-  height: 30px;
-}
-</style>

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('imatrixUIMessage.exceedFileSize', { fileName: file.name, fileSize: limitFileSize })
+      message: t('fileUpload.exceedFileSize', { fileName: file.name, fileSize: limitFileSize })
     })
     // 返回false停止上传
     isCanUpload = false

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

@@ -2,26 +2,21 @@
   <div>
     <div v-if="!isMobile">
       <div v-for="(file, index) in fileList" :key="index" style="width: 100%">
-        <el-tag color="white" size="large">
-          <template #default>
-            <div style="display: flex; align-items: center">
-              <!-- 'amb-color-icon-XLS' -->
-              <super-icon :iconValue="getFileIconByName(file.showName)" />
-              <el-tooltip content="预览" placement="top">
-                <span style="cursor: pointer" @click="preview(file.showName, file.serverPath)">
-                  <span style="margin-left: 6.5px">{{ file.showName }}</span>
-                </span>
-              </el-tooltip>
-              <el-tooltip v-if="!disabled" content="下载" placement="top">
-                <el-icon style="margin-left: 10px" @click="handleDownload(file)">
-                  <Download />
-                </el-icon>
-              </el-tooltip>
-              <el-tooltip v-if="!disabled" content="移除" placement="top">
-                <el-icon @click="handleOnRemove(file)"><Close /></el-icon>
-              </el-tooltip>
-            </div>
-          </template>
+        <el-tag>
+          <el-tooltip content="预览" placement="top">
+            <span style="cursor: pointer" @click="preview(file.showName, file.serverPath)">
+              <el-icon><Paperclip /></el-icon>
+              <span style="margin-left: 6.5px">{{ file.showName }}</span>
+            </span>
+          </el-tooltip>
+          <el-tooltip v-if="!disabled" content="下载" placement="top">
+            <el-icon @click="handleDownload(file)">
+              <Download />
+            </el-icon>
+          </el-tooltip>
+          <el-tooltip v-if="!disabled" content="移除" placement="top">
+            <el-icon @click="handleOnRemove(file)"><Close /></el-icon>
+          </el-tooltip>
         </el-tag>
       </div>
     </div>
@@ -58,7 +53,6 @@ import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getReplaceUrlDomain
 import { getToken } from '../../../src/utils/auth'
 import { isImage } from '../../../src/utils/util'
 import { Base64 } from 'js-base64'
-import { getFileIconByName } from '../../../src/utils/file-util'
 const props = defineProps({
   systemCode: {
     type: String,
@@ -270,9 +264,3 @@ const isPreview = (fileName: string) => {
   return false
 }
 </script>
-<style lang="scss" scoped>
-.amb-color-iconfont {
-  width: 30px;
-  height: 30px;
-}
-</style>

package/packages/index.js

@@ -110,10 +110,10 @@ const install = function (Vue) {
   if(Vue.config.globalProperties) Vue.config.globalProperties.$agilebuilderUIStore = store;
 }
 
-//  判断是否是直接引入vue的js文件，即全局引用可自动安装所有组件
-if (typeof window !== 'undefined' && window.Vue) {
-  install(window.Vue)
-}
+// //  判断是否是直接引入vue的js文件，即全局引用可自动安装所有组件
+// if (typeof window !== 'undefined' && window.Vue) {
+//   install(window.Vue)
+// }
 export {
   Breadcrumb,
   DepartmentTree,

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

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

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

@@ -134,12 +134,7 @@ const apis = {
     }
   },
   // 新建行
-  createRow(listCode, row, options, event) {
-    // addRowIndex 表示新建行插入到第几行后面，默认是-1表示添加到最后面
-    let addRowIndex = -1
-    if (event && event.rowIndex > -1) {
-      addRowIndex = event.rowIndex + 1
-    }
+  createRow(listCode, row, options) {
     return new Promise((resolve, reject) => {
       if (!listCode) {
         listCode = store.get('_list_code')
@@ -262,18 +257,10 @@ const apis = {
             if (gridParams.isSubTableShowPage !== undefined && gridParams.isSubTableShowPage === true) {
               // 子表集合添加该新建的行。会触发watch subTableData的监控
               gridParams.isChangePage = true
-              if (addRowIndex >= 0) {
-                gridParams.subTableData.splice(addRowIndex, 0, row)
-              } else {
-                gridParams.subTableData.splice(gridParams.subTableData.length, 0, row)
-              }
+              gridParams.subTableData.splice(gridParams.subTableData.length, 0, row)
             } else {
               // 子表不分页
-              if (addRowIndex >= 0) {
-                gridData.splice(addRowIndex, 0, row)
-              } else {
-                gridData.splice(gridData.length, 0, row)
-              }
+              gridData.splice(gridData.length, 0, row)
               if (gridParams.lineEdit.editingCell) {
                 gridParams.lineEdit.editingCell.row = gridData.length
               }
@@ -297,11 +284,7 @@ const apis = {
           // console.log('创建行所属的list2', gridData)
           // console.log('创建行所属的打印gridParams.gridData', gridParams.gridData)
           const orgRow = Object.assign({}, row)
-          if (addRowIndex >= 0) {
-            gridParams.orgGridData.splice(addRowIndex, 0, orgRow)
-          } else {
-            gridParams.orgGridData.splice(0, 0, orgRow)
-          }
+          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.vue'
+import ViewImageDialog from './view-image-dialog'
 import { $emit } from '../../utils/gogocodeTransfer'
 import eventBus from './eventBus'
 import { isMobileBrowser, getAuthSource } from '../../../src/utils/common-util'
@@ -664,6 +664,7 @@ 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 =
@@ -676,6 +677,14 @@ 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, // 是否是多选树
@@ -1124,6 +1133,7 @@ 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()
         }
       }
@@ -1967,6 +1977,7 @@ export default {
       this.blurEvent()
     },
     packageCustomRules(columnRule) {
+      console.log('packageCustomRules---columnRule=', columnRule)
       if (!columnRule) {
         return
       }

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

@@ -106,10 +106,8 @@
             :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"
@@ -1186,6 +1184,7 @@ export default {
       return 'primary'
     },
     changeDisabled(state) {
+      debugger
       this.disabled = state
     },
     refreshList() {