agilebuilder-ui 1.1.38-tmp1 → 1.1.39-sit1

package/lib/{tab-content-iframe-index-f3419de1.js → tab-content-iframe-index-b9c23a8b.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-4de073b5.js";
+import { _ as s } from "./index-f2020c47.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-034f8326.js → tab-content-index-289ae3af.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-4de073b5.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-f2020c47.js";
 import { resolveComponent as u, openBlock as l, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as C, renderList as T, 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-53fa49b9.js → tache-subprocess-history-3ad4baa1.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-4de073b5.js";
+import { _ as I } from "./index-f2020c47.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.38-tmp1",
+  "version": "1.1.39-sit1",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/department-tree-inline/src/department-single-tree-inline.vue

@@ -253,7 +253,9 @@ export default {
         containBranch: this.containBranch,
         zhName: department.name,
         enName: department.enName,
-        department: department
+        department: department,
+        leader: department.leader,
+        leaderName: department.leaderName
       }
       this.selectNodeInfo = selectNodeInfo
     },

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

@@ -609,7 +609,8 @@ export default {
         emails: [],
         telephones: [],
         users: [],
-        divisionManager: []
+        divisionManager: [],
+        divisionManagerName: []
       }
       // 是否需要显示提示框，默认不显示
       var showTip = false
@@ -625,6 +626,9 @@ export default {
           if (userData.divisionManager && userData.divisionManager !== '') {
             selectNodeInfo.divisionManager.push(userData.divisionManager)
           }
+          if (userData.divisionManagerName && userData.divisionManagerName !== '') {
+            selectNodeInfo.divisionManagerName.push(userData.divisionManagerName)
+          }
           if (userData.email && userData.email !== '') {
             selectNodeInfo.emails.push(userData.email)
           }

package/packages/department-user-tree-inline/src/department-user-single-tree-inline.vue

@@ -252,7 +252,8 @@ export default {
         user: user,
         enName: user.enName,
         subCompanyName: user.subCompanyName,
-        divisionManager: user.divisionManager
+        divisionManager: user.divisionManager,
+        divisionManagerName: user.divisionManagerName
       }
       // 表示是勾选单选按钮或 选中树节点
       this.selectNodeInfo = selectNodeInfo

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

@@ -183,7 +183,6 @@ 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-mobile/src/department-user-tree-inline-app.vue

@@ -368,7 +368,9 @@ function saveDept() {
       userEnNames: [],
       emails: [],
       telephones: [],
-      users: []
+      users: [],
+      divisionManager: [],
+      divisionManagerName: []
     }
     const departmentIds = []
     selectDepts.value.forEach((node) => {

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

@@ -1,14 +1,20 @@
 <template>
   <div v-if="label">
-    <div class="list-file" @dblclick="dblclickEvent">
+    <div
+      ref="filePreviewRef"
+      @dblclick="dblclickEvent"
+      style="display: flex; align-items: center; gap: 5px"
+      :style="{ cursor: disabled && fileSetObj.disabledNoPreview ? 'not-allowed' : 'pointer' }"
+      @click="previewMuti()"
+    >
       <el-icon><el-icon-paperclip /></el-icon>
       {{ label }}
-      <el-tooltip :content="$t('imatrixUIPublicModel.preview')">
+      <el-tooltip v-if="!disabled || !fileSetObj.disabledNoPreview" :content="$t('imatrixUIPublicModel.preview')">
         <el-icon style="cursor: pointer; color: #409eff; padding-right: 5px" @click="previewMuti()"
           ><el-icon-view
         /></el-icon>
       </el-tooltip>
-      <el-tooltip :content="$t('imatrixUIPublicModel.download')">
+      <el-tooltip v-if="!disabled || !fileSetObj.disabledNoDownload" :content="$t('imatrixUIPublicModel.download')">
         <el-icon style="cursor: pointer; color: #409eff" @click="donwloadViewFile()">
           <el-icon-download />
         </el-icon>
@@ -40,8 +46,10 @@
         <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)">
+              <span>
+                <super-icon :iconValue="getFileIconByName(scope.row.showName)" />
+              </span>
+              <span class="amb-list-preivew-name" @click="previewSingle(scope.row)">
                 {{ scope.row.showName }}
               </span>
             </div>
@@ -50,12 +58,24 @@
         <el-table-column width="80" align="center">
           <template v-slot="scope">
             <div style="margin: -10px 0">
-              <el-tooltip :content="$t('imatrixUIPublicModel.preview')" class="item" effect="dark" placement="top">
+              <el-tooltip
+                v-if="!fileSetObj.disabledNoPreview"
+                :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-tooltip>
-              <el-tooltip :content="$t('imatrixUIPublicModel.download')" class="item" effect="dark" placement="top">
+              <el-tooltip
+                v-if="!fileSetObj.disabledNoDownload"
+                :content="$t('imatrixUIPublicModel.download')"
+                class="item"
+                effect="dark"
+                placement="top"
+              >
                 <el-button type="text" @click="donwloadFile(scope.$index, fileList)">
                   <el-icon v-if="downloadable" style="cursor: pointer">
                     <el-icon-download />
@@ -111,6 +131,10 @@ export default {
       default: () => {
         return {}
       }
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -164,12 +188,18 @@ export default {
         serverPath = getEntityFieldValue(this.entity, this.keyValueParam.serverPath)
         showName = getEntityFieldValue(this.entity, this.keyValueParam.showName)
       }
+      if (!serverPath) {
+        ElMessage.error(this.$t('imatrixUIMessage.filePathNotFound'))
+      }
       return {
         showName: showName,
         serverPath: serverPath
       }
     },
     previewMuti() {
+      if (this.disabled && this.fileSetObj.disabledNoPreview) {
+        return
+      }
       const { showName, serverPath } = this.getShowNameAndUuidKey()
       if (serverPath) {
         const uuids = serverPath.split(',')
@@ -308,4 +338,11 @@ export default {
   width: 30px;
   height: 30px;
 }
+.amb-list-preivew-name {
+  margin-left: 10px;
+  cursor: pointer;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>

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

@@ -81,37 +81,49 @@
               <!-- <i v-if="deleteable" class="el-icon-delete" style="padding-left:5px;cursor:pointer;color:#F56C6C" @click="deleteFile()" /> -->
             </span>
           </template>
-          <el-table :data="showFileList" :show-header="false">
-            <el-table-column prop="showName" width="300" show-overflow-tooltip>
+          <el-table :show-header="false" :data="showFileList" 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)">
+                  <span>
+                    <super-icon :iconValue="getFileIconByName(scope.row.showName)" />
+                  </span>
+                  <span class="amb-list-preivew-name" @click="previewSingle(scope.row)">
                     {{ scope.row.showName }}
                   </span>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column align="right">
+            <el-table-column width="80" align="center">
               <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-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-tooltip>
+                <div style="margin: -10px 0">
+                  <el-tooltip
+                    v-if="!fileSetObj.disabledNoPreview"
+                    :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-tooltip>
+                  <el-tooltip
+                    v-if="!disabled"
+                    :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-tooltip>
+                </div>
               </template>
             </el-table-column>
           </el-table>
@@ -141,7 +153,14 @@
       />
     </template>
     <template v-else>
-      <fs-preview :entity="row" :file-set-obj="fileSetObj" :is-sql="isSql" :label="value" />
+      <fs-preview
+        :entity="row"
+        :disabled="disabled"
+        :fileInfo="fileInfo"
+        :file-set-obj="fileSetObj"
+        :is-sql="isSql"
+        :label="value"
+      />
     </template>
   </span>
 </template>
@@ -445,4 +464,11 @@ export default {
   width: 30px;
   height: 30px;
 }
+.amb-list-preivew-name {
+  margin-left: 10px;
+  cursor: pointer;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>

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

@@ -27,6 +27,8 @@
   <template v-if="fileList && fileList.length > 0">
     <fs-preview-new
       :disabled="disabled"
+      :disabled-no-preview="disabledNoPreview"
+      :disabled-no-download="disabledNoDownload"
       :file-list="fileList"
       :system-code="systemCode"
       :before-remove="beforeRemove"
@@ -117,6 +119,16 @@ const props = defineProps({
   beforeUpload: {
     type: Function,
     default: () => {}
+  },
+  // 是否禁用时也可预览
+  disabledNoPreview: {
+    type: Boolean,
+    default: false
+  },
+  // 是否禁用时也可下载
+  disabledNoDownload: {
+    type: Boolean,
+    default: false
   }
 })
 const baseURL = window.$vueApp.config.globalProperties.baseURL

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

@@ -24,6 +24,8 @@
   <template v-if="fileList && fileList.length > 0">
     <fs-preview-new
       :disabled="disabled"
+      :disabled-no-preview="disabledNoPreview"
+      :disabled-no-download="disabledNoDownload"
       :file-list="fileList"
       :system-code="systemCode"
       :before-remove="beforeRemove"
@@ -114,6 +116,16 @@ const props = defineProps({
   beforeUpload: {
     type: Function,
     default: () => {}
+  },
+  // 是否禁用时也可预览
+  disabledNoPreview: {
+    type: Boolean,
+    default: false
+  },
+  // 是否禁用时也可下载
+  disabledNoDownload: {
+    type: Boolean,
+    default: false
   }
 })
 const baseURL = window.$vueApp.config.globalProperties.baseURL

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

@@ -7,12 +7,19 @@
             <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)">
+              <template v-if="disabled && disabledNoPreview">
+                <span style="cursor: no-drop">
                   <span style="margin-left: 6.5px">{{ file.showName }}</span>
                 </span>
-              </el-tooltip>
-              <el-tooltip v-if="!disabled" content="下载" placement="top">
+              </template>
+              <template v-if="!disabled || !disabledNoPreview">
+                <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>
+              </template>
+              <el-tooltip v-if="!disabled || !disabledNoDownload" content="下载" placement="top">
                 <el-icon style="margin-left: 10px" @click="handleDownload(file)">
                   <Download />
                 </el-icon>
@@ -104,6 +111,16 @@ const props = defineProps({
   baseURL: {
     type: String,
     default: null
+  },
+  // 是否禁用时也可预览
+  disabledNoPreview: {
+    type: Boolean,
+    default: false
+  },
+  // 是否禁用时也可下载
+  disabledNoDownload: {
+    type: Boolean,
+    default: false
   }
 })
 const baseURL = props.baseURL ? props.baseURL : window.$vueApp.config.globalProperties.baseURL
@@ -179,7 +196,9 @@ const isPromise = (p: any) => {
 }
 const preview = (showName: string, serverPath: string) => {
   console.log('preview----props.fileList=', props.fileList)
-
+  if (props.disabled && props.disabledNoPreview) {
+    return
+  }
   let isImg = false
   if (showName && isImage(showName)) {
     isImg = true

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

@@ -8,6 +8,8 @@
     :openFsUpload="openFsUpload"
     :fileSetObj="{
       accept: accept,
+      disabledNoPreview: disabledNoPreview,
+      disabledNoDownload: disabledNoDownload,
       multiple: multiple,
       limitFileSize: limitFileSize,
       limit: limitNum,
@@ -23,6 +25,8 @@
     :systemCode="systemCode"
     :accept="accept"
     :multiple="multiple"
+    :disabled-no-preview="disabledNoPreview"
+    :disabled-no-download="disabledNoDownload"
     :limit="limitNum"
     :limitFileSize="limitFileSize"
     :placeholder="placeholder"
@@ -47,6 +51,8 @@
     :multiple="multiple"
     :limit="limitNum"
     :limitFileSize="limitFileSize"
+    :disabled-no-preview="disabledNoPreview"
+    :disabled-no-download="disabledNoDownload"
     :placeholder="placeholder"
     :action="action"
     :headers="headers"
@@ -70,6 +76,8 @@
     :multiple="multiple"
     :limit="limitNum"
     :limitFileSize="limitFileSize"
+    :disabled-no-preview="disabledNoPreview"
+    :disabled-no-download="disabledNoDownload"
     :placeholder="placeholder"
     :action="action"
     :headers="headers"
@@ -97,6 +105,8 @@
     :multiple="multiple"
     :limit="limitNum"
     :limitFileSize="limitFileSize"
+    :disabled-no-preview="disabledNoPreview"
+    :disabled-no-download="disabledNoDownload"
     :placeholder="placeholder"
     :action="action"
     :headers="headers"
@@ -252,6 +262,16 @@ const props = defineProps({
   openCameraOrChoosePhoto: {
     type: String,
     default: 'openCameraAndChoosePhoto'
+  },
+  // 是否禁用时也可预览
+  disabledNoPreview: {
+    type: Boolean,
+    default: false
+  },
+  // 是否禁用时也可下载
+  disabledNoDownload: {
+    type: Boolean,
+    default: false
   }
 })
 const isMobile = ref(isMobileBrowser())

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

@@ -428,11 +428,11 @@ export default {
             }
           }
           return branchDeptIds.join(this.separator)
-        } else if (orgDataType === 'divisionManager') {
+        } else if (orgDataType === 'divisionManager' || orgDataType === 'divisionManagerName') {
           let divisionManagerArr = []
           if (isUserTree) {
-            if (selectNodeInfo.divisionManager && selectNodeInfo.divisionManager.length > 0) {
-              divisionManagerArr = selectNodeInfo.divisionManager
+            if (selectNodeInfo[orgDataType] && selectNodeInfo[orgDataType].length > 0) {
+              divisionManagerArr = selectNodeInfo[orgDataType]
             }
           }
           if (divisionManagerArr && divisionManagerArr.length > 0) {

package/packages/super-grid/src/components/mobile-table-card.jsx

@@ -212,7 +212,6 @@ export default defineComponent({
 
         // 写入选中
         const setCheckedList = (value) => {
-            debugger;
             if (!isCheck.value) return
             if (checkedList.value.includes(value)) {
                 checkedList.value = checkedList.value.filter(v => v !== value)

package/packages/super-grid/src/custom-formatter.js

@@ -212,7 +212,7 @@ const customFormatter = {
       // console.log('getHyperLinkSetting--resut=', result)
       if (result && result.label && result.label !== '') {
         console.log('label存在')
-      } else {
+      } else if(result && (result.displayTextJudge === undefined || result.displayTextJudge)){
         result.label = this.objectPropValueTwo(row, column)
       }
       if (result && result.title && result.title !== '') {

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

@@ -13,6 +13,7 @@
       :additional-settings="controlConfig"
       :parent="parentFormData"
       :prop="column.prop"
+      :custom-params="myCustomParams"
       :row="row"
       :row-index="position ? position.row : null"
       :select-options="options"
@@ -545,7 +546,8 @@ import {
   getEntityFieldValue,
   setEntityFieldValue,
   getPropValueNew,
-  watchPageContextDynamicVariable
+  watchPageContextDynamicVariable,
+  formatCustomParams
 } from '../../../src/utils/util'
 import { getToken } from '../../../src/utils/auth'
 import apis from './apis'
@@ -662,16 +664,17 @@ export default {
     const gridData = gridParams.gridData
     const subTableData = gridParams.subTableData
     const isSubTableShowPage = gridParams.isSubTableShowPage
-    let controlConfig = {}
-    if (this.column.controlConfig) {
-      controlConfig = JSON.parse(this.column.controlConfig)
-    }
+
     const additionalParamMap = getAdditionalParamMap(gridParams)
     const pageContext = gridParams.options.pageContext
     const isMobile = isMobileBrowser()
 
     const componentId = this.listCode + '_' + this.column.prop
     let scanEnable = false
+    let controlConfig = {}
+    if (this.column.controlConfig) {
+      controlConfig = JSON.parse(this.column.controlConfig)
+    }
     if (controlConfig.scanEnable) {
       scanEnable = true
     }
@@ -760,7 +763,8 @@ export default {
       isShowScanIcon,
       baseURL,
       colConfigure, // v10字段配置原信息
-      designProperty // 字段配置
+      designProperty, // 字段配置
+      myCustomParams: {}
     }
   },
   computed: {},
@@ -808,6 +812,12 @@ export default {
   },
   created() {
     const gridParams = store.get(this.listCode)
+    if (this.controlConfig?.customParams) {
+      if (!this.pageContext) {
+        this.pageContext = gridParams.options.pageContext
+      }
+      this.myCustomParams = formatCustomParams(this.controlConfig.customParams, this.pageContext, this.row)
+    }
     this.gridParams = gridParams
     this.isCreateRow = gridParams.isCreateRow
     this.setTreeType()
@@ -901,14 +911,6 @@ export default {
     const that = this
     // 选择文件结束
     eventBus.$on(this.componentId + '-pickFileDone', (data) => {
-      console.log(
-        'superPage666611---pickFileDone--data.componentId=',
-        data.componentId,
-        'data.listCode=',
-        data.listCode,
-        'data=',
-        data
-      )
       if (that.$refs.fileUploadRef) {
         that.$refs.fileUploadRef.pickFileDone(data)
       }
@@ -921,14 +923,6 @@ export default {
     })
     // 扫描结束
     eventBus.$on(this.componentId + '-scanDone', (data) => {
-      console.log(
-        'superPage666611---scanDone--data.componentId=',
-        data.componentId,
-        'data.listCode=',
-        data.listCode,
-        'data=',
-        data
-      )
       that.innerValue = data.result
       that.blurEvent()
       this.callCustomEvent('afterScanDone')