agilebuilder-ui 1.1.36-sit2 → 1.1.36-sit4

package/lib/{tab-content-iframe-index-b132e3ad.js → tab-content-iframe-index-18ef0e35.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-51824aff.js";
+import { _ as s } from "./index-c739d5d5.js";
 const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-1af3948e.js → tab-content-index-72db2984.js}

@@ -1,4 +1,4 @@
-import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-51824aff.js";
+import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-c739d5d5.js";
 import { resolveComponent as u, openBlock as d, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
 const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);

package/lib/{tache-subprocess-history-af6fbc5a.js → tache-subprocess-history-4d3623ca.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-51824aff.js";
+import { _ as I } from "./index-c739d5d5.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.36-sit2",
+  "version": "1.1.36-sit4",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/department-user-tree/src/department-user-multiple-tree.vue

@@ -19,6 +19,7 @@
         :department-info="departmentInfo"
         :height="height"
         :is-need-virtual-user="isNeedVirtualUser"
+        :limit-filter-column="limitFilterColumn"
         :search-field="searchField"
         :select-user-info="selectUserInfo"
         :separator="separator"

package/packages/department-user-tree-inline/src/department-user-tree-multi-service.js

@@ -183,6 +183,7 @@ const departmentUserTreeMultiService = {
   },
   // 加载指定部门节点
   loadPointDepartments() {
+    debugger
     let url = window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/point-department-users'
     if (this.limitFilterColumn) {
       url += '/' + this.limitFilterColumn

package/packages/department-user-tree-inline/src/department-user-tree-single-service.js

@@ -7,8 +7,7 @@ const departmentUserTreeSingleService = {
   filterAppendNodes(value) {
     this.$http
       .post(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/component/organization-trees/search-users',
+        window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/search-users',
         this.searchParam
       )
       .then((result) => {
@@ -19,7 +18,7 @@ const departmentUserTreeSingleService = {
             this.$message({
               showClose: true,
               type: 'error',
-              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
+              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
             })
             return
           }
@@ -29,7 +28,7 @@ const departmentUserTreeSingleService = {
             this.$message({
               showClose: true,
               type: 'error',
-              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
+              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
             })
             return
           }
@@ -48,11 +47,7 @@ const departmentUserTreeSingleService = {
     // this.handleSelectUtil(item, localStorage)
     // 查询最新用户信息替换,缓存为历史数据 数据库可能发生变化
     this.$http
-      .get(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/api/users?loginName=' +
-          item.loginName
-      )
+      .get(window.$vueApp.config.globalProperties.baseAPI + '/api/users?loginName=' + item.loginName)
       .then((userDTO) => {
         if (userDTO !== null) {
           for (const dtoKey in userDTO) {
@@ -100,17 +95,13 @@ const departmentUserTreeSingleService = {
       // 表示没有加载过该父节点的子节点集合时
       const param = {
         parentId: parentId,
-        needVirtualUser: this.isNeedVirtualUser,
+        needVirtualUser: this.isNeedVirtualUser
       }
       if (node.data) {
         param.branchId = node.data.branchId
       }
       this.$http
-        .post(
-          window.$vueApp.config.globalProperties.baseAPI +
-            '/component/organization-trees/department-users',
-          param
-        )
+        .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
         .then((data) => {
           resolve(data)
           // 更新当前点击的节点的子节点，必须加该方法，否则会导致子节点无法选中
@@ -134,41 +125,30 @@ const departmentUserTreeSingleService = {
   loadDepartment(parentId, parentNodeId, isSearch, searchValue) {
     const param = {
       parentId: parentId,
-      needVirtualUser: this.isNeedVirtualUser,
+      needVirtualUser: this.isNeedVirtualUser
     }
     this.$http
-      .post(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/component/organization-trees/department-users',
-        param
-      )
-			.then((children) => {
-				if (this.$refs.deparmentUserTree) {
-					this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, children)
-					if (this.$refs.deparmentUserTree.store.nodesMap[parentNodeId]) {
-            this.$refs.deparmentUserTree.store.nodesMap[parentNodeId].expanded = true
-					}
-				}
-      })
-  },
-  loadPointDepartments() {
-    this.$http
-      .post(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/component/organization-trees/point-department-users',
-        this.departmentInfo
-      )
+      .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
       .then((children) => {
-        this.$refs.deparmentUserTree.updateKeyChildren(
-          this.tenantNodeId,
-          children
-        )
-        if (this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId]) {
-          this.$refs.deparmentUserTree.store.nodesMap[
-            this.tenantNodeId
-          ].expanded = true
+        if (this.$refs.deparmentUserTree) {
+          this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, children)
+          if (this.$refs.deparmentUserTree.store.nodesMap[parentNodeId]) {
+            this.$refs.deparmentUserTree.store.nodesMap[parentNodeId].expanded = true
+          }
         }
       })
   },
+  loadPointDepartments() {
+    let url = window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/point-department-users'
+    if (this.limitFilterColumn) {
+      url += '/' + this.limitFilterColumn
+    }
+    this.$http.post(url, this.departmentInfo).then((children) => {
+      this.$refs.deparmentUserTree.updateKeyChildren(this.tenantNodeId, children)
+      if (this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId]) {
+        this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId].expanded = true
+      }
+    })
+  }
 }
 export default departmentUserTreeSingleService

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

@@ -37,7 +37,16 @@
         </span>
       </template>
       <el-table :show-header="false" :data="fileList" max-height="60vh">
-        <el-table-column prop="showName" show-overflow-tooltip />
+        <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 width="80" align="center">
           <template v-slot="scope">
             <div style="margin: -10px 0">
@@ -69,6 +78,7 @@ 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: {
@@ -284,10 +294,18 @@ export default {
     },
     formatFileName(fileName) {
       return fileName.replace('#', '~~').replace('?', '~$').replace('&', '$')
+    },
+    getFileIconByName(fileName) {
+      return getFileIconByName(fileName)
     }
   },
   emits: ['close']
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.amb-color-iconfont {
+  width: 30px;
+  height: 30px;
+}
+</style>

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

@@ -82,22 +82,35 @@
             </span>
           </template>
           <el-table :data="showFileList" :show-header="false">
-            <el-table-column prop="showName" width="300" />
+            <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 align="right">
               <template v-slot="scope">
                 <el-tooltip :content="$t('imatrixUIPublicModel.preview')" class="item" effect="dark" placement="top">
-                  <el-icon style="cursor: pointer" @click="previewSingle(scope.row)">
-                    <el-icon-view />
-                  </el-icon>
+                  <el-button type="text" @click="previewSingle(scope.row)">
+                    <el-icon style="cursor: pointer">
+                      <el-icon-view />
+                    </el-icon>
+                  </el-button>
                 </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-icon style="cursor: pointer" @click="deleteRow(scope.$index)">
-                    <el-icon-delete />
-                  </el-icon>
+                  <el-button type="text" @click="deleteRow(scope.$index)">
+                    <el-icon style="cursor: pointer">
+                      <el-icon-delete />
+                    </el-icon>
+                  </el-button>
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -144,6 +157,7 @@ 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: {
@@ -418,8 +432,17 @@ 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/fs-preview-new.vue

@@ -2,21 +2,26 @@
   <div>
     <div v-if="!isMobile">
       <div v-for="(file, index) in fileList" :key="index" style="width: 100%">
-        <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 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>
       </div>
     </div>
@@ -53,6 +58,7 @@ 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,
@@ -264,3 +270,9 @@ const isPreview = (fileName: string) => {
   return false
 }
 </script>
+<style lang="scss" scoped>
+.amb-color-iconfont {
+  width: 30px;
+  height: 30px;
+}
+</style>