agilebuilder-ui 1.1.36-sit3 → 1.1.36-sit5

package/lib/{tab-content-iframe-index-3eed6086.js → tab-content-iframe-index-0c3b2101.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-e982c337.js";
+import { _ as s } from "./index-09cd1ad3.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-deae4aab.js → tab-content-index-dcdefb56.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-e982c337.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-09cd1ad3.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-cd6d062b.js → tache-subprocess-history-06b435b8.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-e982c337.js";
+import { _ as I } from "./index-09cd1ad3.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-sit3",
+  "version": "1.1.36-sit5",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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>

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

@@ -468,6 +468,7 @@
       :check-strictly="isCheckStrictly"
       :department-info="departmentInfo"
       :disabled="disabled"
+      :limit-filter-column="controlConfig?.limitFilterColumn"
       :fields="fields"
       :is-join-table="isJoinTable"
       :models="row"
@@ -528,7 +529,12 @@ import {
   getControlConfig
 } from './utils'
 import dynamicSourceSelect from '../../dynamic-source-select/src/dynamic-source-select.vue'
-import { getEntityFieldValue, setEntityFieldValue } from '../../../src/utils/util'
+import {
+  getEntityFieldValue,
+  setEntityFieldValue,
+  getPropValueNew,
+  watchPageContextDynamicVariable
+} from '../../../src/utils/util'
 import { getToken } from '../../../src/utils/auth'
 import apis from './apis'
 import ViewImageDialog from './view-image-dialog.vue'
@@ -831,6 +837,7 @@ export default {
         }
       }
     }
+
     if (this.column.orgTreeSet) {
       const orgTreeSet = JSON.parse(this.column.orgTreeSet)
       if (this.type.indexOf('DeptTree') > 0 && orgTreeSet.checkStrictly) {
@@ -1032,6 +1039,7 @@ export default {
           // 说明是工作组树
           this.wgTree = true
         }
+        this.deptScopeLimit()
       }
     },
     orgTreeSetSort() {
@@ -2010,6 +2018,54 @@ export default {
         // 表示没有跳转页面配置
         this.callCustomEvent(eventName)
       }
+    },
+    deptScopeLimit() {
+      debugger
+      if (this.controlConfig && this.controlConfig.deptScope) {
+        // 表示有部门范围限制
+        if (this.controlConfig.deptScope == 'field' && this.controlConfig.deptScopeField) {
+          if (this.controlConfig.deptScopeField.indexOf('${row.') === 0) {
+            // 表示是行记录的字段
+            const fieldName = this.controlConfig.deptScopeField.replace('${row.', '').replace('}', '')
+            if (this.row[fieldName]) {
+              this.departmentInfo = this.row[fieldName].split(',')
+            } else {
+              this.departmentInfo = []
+            }
+            this.$watch('row.' + fieldName, (newVal, oldVal) => {
+              if (newVal) {
+                this.departmentInfo = newVal.split(',')
+              } else {
+                this.departmentInfo = []
+              }
+            })
+          } else {
+            // 表示是页面pageContext的字段
+            this.setLimitDepartmentInfo()
+            if (!this.controlConfig.deptScopeField.indexOf('${fixed.') === 0) {
+              watchPageContextDynamicVariable(
+                this,
+                this.pageContext,
+                this.controlConfig.deptScopeField,
+                (newVal, oldVal) => {
+                  this.setLimitDepartmentInfo()
+                }
+              )
+            }
+          }
+        } else if (this.controlConfig.deptScope == 'depts' && this.controlConfig.deptScopeCodes) {
+          // 表示固定部门范围
+          this.departmentInfo = this.controlConfig.deptScopeCodes.split(',')
+        }
+      }
+    },
+    setLimitDepartmentInfo() {
+      const deptScopeFieldValue = getPropValueNew(this.controlConfig.deptScopeField, this.pageContext, this.row)
+      if (deptScopeFieldValue) {
+        this.departmentInfo = deptScopeFieldValue.split(',')
+      } else {
+        this.departmentInfo = []
+      }
     }
   }
 }

package/src/utils/util.js

@@ -624,6 +624,7 @@ export function getPropValueNew(propValue, pageContext, row) {
   let value = null
   if (propValue && propValue !== null && propValue !== '') {
     const entity = pageContext && pageContext.entity ? pageContext.entity.data : null
+    const pageVar = pageContext && pageContext.entity ? pageContext.entity.page : null
     const additionalParamMap = getAdditionalParamMap(pageContext)
     const contextParameterMap = pageContext && pageContext.entity ? pageContext.entity.context : null
     const parentEntity =
@@ -643,6 +644,9 @@ export function getPropValueNew(propValue, pageContext, row) {
         const propName = propValue.replace('${row.', '').replace('}', '')
         value = getEntityFieldValue(row, propName)
       }
+    } else if (propValue.indexOf('${page.') === 0) {
+      const variable = propValue.replace('${page.', '').replace('}', '')
+      value = pageVar ? pageVar[variable] : null
     } else if (
       propValue.includes('${context.') ||
       propValue.includes('${request.') ||
@@ -930,3 +934,18 @@ export function isImage(fileName) {
     return false
   }
 }
+
+export function watchPageContextDynamicVariable(that, pageContext, variable, callback) {
+  const match = variable.match(/\${(.*?)}/)
+  if (!match) return
+  const path = match ? match[1].split('.') : []
+  if (path && path.length > 0) {
+    // 监听 pageContext.entity[type][field][xxx]... 的变化
+    that.$watch(
+      () => path.reduce((obj, key) => obj[key], pageContext.entity),
+      (newVal, oldVal) => {
+        callback(newVal, oldVal)
+      }
+    )
+  }
+}