agilebuilder-ui 1.1.80 → 1.1.81-tmp1

package/lib/{tab-content-iframe-index-49bddc0a.js → tab-content-iframe-index-448977a0.js}

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

package/lib/{tab-content-index-e371b16f.js → tab-content-index-cdf2780f.js}

@@ -1,4 +1,4 @@
-import { a8 as y, aa as E, ab as L, ac as $, ad as N, ae as F, af as x, ag as k, ah as O, ai as W, aj as R, ak as D, al as _, am as B } from "./index-13e73297.js";
+import { a8 as y, aa as E, ab as L, ac as $, ad as N, ae as F, af as x, ag as k, ah as O, ai as W, aj as R, ak as D, al as _, am as B } from "./index-f25a0f8b.js";
 import { createVNode as g, resolveComponent as c, openBlock as u, createBlock as f, withCtx as p, renderSlot as A, createElementBlock as b, normalizeClass as q, createCommentVNode as M, Fragment as T, renderList as S, defineComponent as V, h as m, createTextVNode as U, toDisplayString as P, TransitionGroup as j, createElementVNode as v } from "vue";
 $(["sidebar", "protectedRouters"]);
 const J = y(V({ name: "MenuItem", functional: !0, props: { icon: { type: String, default: "" }, title: { type: String, default: "" }, hasChildren: { type: Boolean, default: !1 }, isRoot: { type: Boolean, default: !1 }, code: { type: Boolean, default: !1 }, undoneTaskCount: { type: Number, default: 0 }, unreadTaskCount: { type: Number, default: 0 }, undoneDeptTaskCount: { type: Number, default: 0 }, menuLayer: { type: Number, default: null } }, render(e) {

package/lib/{tache-subprocess-history-59e976f7.js → tache-subprocess-history-eeaa7770.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as l, createElementBlock as s, createElementVNode as y, createVNode as a, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { a8 as I } from "./index-13e73297.js";
+import { a8 as I } from "./index-f25a0f8b.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/lib/{timeline-definition-MYPXXCX6-gLqnWxDu-f9e9fe2e.js → timeline-definition-MYPXXCX6-gLqnWxDu-4affe323.js}

@@ -1,6 +1,6 @@
-import { _ as a, D as yt, ag as gt, z as ft, d as G, c as mt, l as S, ac as xt, ad as bt, ae as _t, af as kt } from "./mermaid.core-CAqkCmS1-1a2bb6c5.js";
-import { d as K } from "./arc-Js_tyW10-b52fc23c.js";
-import "./index-13e73297.js";
+import { _ as a, D as yt, ag as gt, z as ft, d as G, c as mt, l as S, ac as xt, ad as bt, ae as _t, af as kt } from "./mermaid.core-CAqkCmS1-889e3b7e.js";
+import { d as K } from "./arc-Js_tyW10-5f2bdd5b.js";
+import "./index-f25a0f8b.js";
 import "vue";
 var q = function() {
   var n = a(function(s, d, l, h) {

package/lib/treemap-75Q7IDZK-B2atdfMH-7cb5e6f2.js

@@ -0,0 +1,11 @@
+import { T as s, h as T } from "./mermaid-parser.core-CH9ryA1K-246804df.js";
+import "./index-f25a0f8b.js";
+import "vue";
+import "./mermaid.core-CAqkCmS1-889e3b7e.js";
+import "./_baseUniq-BXtq6_NW-195b7624.js";
+import "./min-BngCxx8g-fdc6e8f6.js";
+import "./clone-CEJtuQzg-2dcec15b.js";
+export {
+  s as TreemapModule,
+  T as createTreemapServices
+};

package/lib/{xychartDiagram-H2YORKM3-Whqa4ezL-74aac2bd.js → xychartDiagram-H2YORKM3-Whqa4ezL-7e67fbaa.js}

@@ -1,8 +1,8 @@
-import { _ as n, a1 as hi, G as gt, F as Bt, H as oi, aD as ri, l as zt, a9 as kt, i as li, t as Ot, b as ci, a as gi, q as ui, g as xi, s as di, z as pi, K as fi, e as mi } from "./mermaid.core-CAqkCmS1-1a2bb6c5.js";
+import { _ as n, a1 as hi, G as gt, F as Bt, H as oi, aD as ri, l as zt, a9 as kt, i as li, t as Ot, b as ci, a as gi, q as ui, g as xi, s as di, z as pi, K as fi, e as mi } from "./mermaid.core-CAqkCmS1-889e3b7e.js";
 import { i as yi } from "./init-ZxktEp_H-731b6c9b.js";
 import { o as bi } from "./ordinal-DSZU4PqD-57a34423.js";
-import { l as _t } from "./linear-DqgVh5FN-22bf30ca.js";
-import "./index-13e73297.js";
+import { l as _t } from "./linear-DqgVh5FN-f87c9e12.js";
+import "./index-f25a0f8b.js";
 import "vue";
 import "./defaultLocale-DVr69WTU-dbb4acef.js";
 var Tt, Rt, Dt, Lt, Pt, vt, Et, Mt, It, $t;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.80",
+  "version": "1.1.81-tmp1",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -169,8 +169,7 @@ export default {
       // 记忆选择数据, 搜索框获得焦点后，下拉显示最近选中的10个人，倒序排列，最后选中的在最上面显示。
       memoryCacheData: [],
       ElIconSearch,
-      canShowOrgTree: false,
-      isShowingAllUserAlert: false
+      canShowOrgTree: false
     }
   },
   name: 'InlineDepartmentUserMultiTree',
@@ -377,9 +376,7 @@ export default {
         }
         return null
       } else {
-        // only show the alert once per interaction
         this.alertByAllUser()
-        return null
       }
     },
     isContainAllUser() {
@@ -413,9 +410,8 @@ export default {
           // 如果没有选择所有用户，则可以继续选择用户
           this.checkedNodeToSelectResult(data)
         } else {
-          debugger
           // 如果已选择所有用户，提示用户，先移除所有用户
-          // this.alertByAllUser()
+          this.alertByAllUser()
         }
       } else {
         this.cancelChildCheckedNodes(data)
@@ -423,28 +419,17 @@ export default {
     },
     // 由于选择了所有用户，再次选择时的提示信息
     alertByAllUser() {
-      // 防止重复显示提示框，如果已显示提示框，则不再显示
-      if (this.isShowingAllUserAlert) {
-        return
-      }
-      this.isShowingAllUserAlert = true
-      // debugger
       this.$alert(
         this.$t('imatrixUIMessage.pleaseRemoveallpersonnelBeforeSelectingSpecificPersonnel'),
         this.$t('imatrixUIMessage.tips'),
         {
           confirmButtonText: this.$t('imatrixUIPublicModel.sure')
         }
-      )
-        .then(() => {
-          if (this.$refs.deparmentUserTree) {
-            this.$refs.deparmentUserTree.setCheckedKeys([])
-          }
-        })
-        .finally(() => {
-          // 无论用户点击确定还是取消，都允许再次显示提示框
-          this.isShowingAllUserAlert = false
-        })
+      ).then(() => {
+        if (this.$refs.deparmentUserTree) {
+          this.$refs.deparmentUserTree.setCheckedKeys([])
+        }
+      })
     },
     // 选中树节点处理
     checkedNodeToSelectResult(data) {

package/packages/department-user-tree-inline/src/search-result.vue

@@ -81,7 +81,7 @@
             <div :title="scope.row.name + '(' + scope.row.enName + ')' + '[' + scope.row.loginName + ']'">
               <span>{{ scope.row.name + '(' + scope.row.enName + ')' }}[{{ scope.row.loginName }}]</span>
             </div>
-            <div class="dept-name-wrap" :title="getDeptName(scope.row)">
+            <div style="color: #ccc" :title="getDeptName(scope.row)">
               {{ getDeptName(scope.row) }}
             </div>
           </div>
@@ -89,7 +89,7 @@
             <div :title="scope.row.name + '[' + scope.row.loginName + ']'">
               <span>{{ scope.row.name }}[{{ scope.row.loginName }}]</span>
             </div>
-            <div class="dept-name-wrap" :title="getDeptName(scope.row)">
+            <div style="color: #ccc" :title="getDeptName(scope.row)">
               {{ getDeptName(scope.row) }}
             </div>
           </div>
@@ -271,11 +271,4 @@ export default {
 .inline-input-custom {
   width: 98%;
 }
-
-.dept-name-wrap {
-  color: #ccc;
-  white-space: normal;
-  font-size: 12px;
-  word-break: break-word;
-}
 </style>

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

@@ -11,6 +11,7 @@
         </span>
       </template>
       <div v-if="firstFileName && !uploading" ref="toolRef" class="fs-preview-tool">
+        <slot name="tool-prefix" :item="getFirstFile()"></slot>
         <el-tooltip v-if="!disabled || !fileSetObj.disabledNoPreview" :content="$t('fsUpload.preview')">
           <super-icon @click="previewFirst()" iconValue="amb-icon-yulan" />
         </el-tooltip>
@@ -20,6 +21,7 @@
         <el-tooltip v-if="enableDelete && !disabled" :content="$t('fsUpload.delete')">
           <super-icon @click="deleteFirst()" iconValue="amb-color-icon-del" />
         </el-tooltip>
+        <slot name="tool-suffix" :item="getFirstFile()"></slot>
         <el-divider v-if="showMultipleFile" direction="vertical" />
         <el-popover :width="450" trigger="click">
           <template #reference>
@@ -186,33 +188,23 @@ export default {
       clearTimeout(this.time)
     },
     getFirstFile() {
-      return new Promise((resolve) => {
-        const { showName, serverPath } = this.getShowNameAndUuidKey()
-        if (serverPath) {
-          const uuids = serverPath.split(',')
-          if (uuids.length > 1) {
-            this.queryFileInfoByUuids(uuids).then((result) => {
-              const uuid0 = uuids[0]
-              const fileInfo = result.find((item) => item.serverPath === uuid0)
-              resolve(fileInfo)
-            })
-          } else {
-            resolve({ showName: showName, serverPath: serverPath })
-          }
+      const { showName, serverPath } = this.getShowNameAndUuidKey()
+      if (serverPath) {
+        const uuids = serverPath.split(',')
+        if (uuids.length > 1) {
+          return { showName: showName.split(',')[0], serverPath: serverPath.split(',')[0] }
         } else {
-          resolve(null)
+          return { showName: showName, serverPath: serverPath }
         }
-      })
+      }
+      return null
     },
     previewFirst() {
-      this.getFirstFile().then((fileInfo) => {
-        this.previewSingle(fileInfo)
-      })
+      this.previewSingle(this.getFirstFile())
     },
     downloadFirst() {
-      this.getFirstFile().then((fileInfo) => {
-        this.download(fileInfo.showName, fileInfo.serverPath)
-      })
+      const { showName, serverPath } = this.getFirstFile()
+      this.download(showName, serverPath)
     },
     previewSingle(fileInfo) {
       fileInfo = packageFile(fileInfo.showName, fileInfo.serverPath)
@@ -229,25 +221,23 @@ export default {
           return
         }
         const uuids = serverPath.split(',')
-        this.queryFileInfoByUuids(uuids).then((result) => {
-          const token = getToken()
-          for (let i = 0; i < result.length; i++) {
-            if (isImage(result[i].showName)) {
-              this.previewImageListInfo.push(
-                window.$vueApp.config.globalProperties.baseURL +
-                  '/common/super-form/downloads?' +
-                  'serverPath=' +
-                  result[i].serverPath +
-                  '&jwt=' +
-                  token
-              )
-              if (result[i].serverPath === fileInfo.serverPath) {
-                this.initialIndex = this.previewImageListInfo.length - 1
-              }
+        const token = getToken()
+        for (let i = 0; i < uuids.length; i++) {
+          if (isImage(showName.split(',')[i])) {
+            if (uuids[i] === fileInfo.serverPath) {
+              this.initialIndex = i
             }
+            this.previewImageListInfo.push(
+              window.$vueApp.config.globalProperties.baseURL +
+                '/common/super-form/downloads?' +
+                'serverPath=' +
+                uuids[i] +
+                '&jwt=' +
+                token
+            )
           }
-          this.showPreviewSingleImage = true
-        })
+        }
+        this.showPreviewSingleImage = true
       } else {
         this.previewDoc(fileInfo)
       }
@@ -287,8 +277,18 @@ export default {
       if (serverPath) {
         const uuids = serverPath.split(',')
         if (uuids.length > 1) {
-          this.queryFileInfoByUuids(uuids).then((result) => {
-            this.fileList = result
+          const baseURL = window.$vueApp.config.globalProperties.baseURL
+          const baseAPI = window.$vueApp.config.globalProperties.baseAPI
+          let tempAction = baseURL + '/common/fs-upload/search-file-names'
+          if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
+            tempAction = baseAPI + '/api/search-file-names'
+          }
+          tempAction = getRelativeBaseUrl(tempAction)
+          this.$http.post(tempAction, uuids).then((result) => {
+            this.fileList = []
+            uuids.forEach((uuid) => {
+              this.fileList.push({ showName: result[uuid], serverPath: uuid })
+            })
             this.showPreviewMulti = true
           })
         } else {
@@ -304,24 +304,6 @@ export default {
       // that.time = setTimeout(() => {
       // }, 200)
     },
-    queryFileInfoByUuids(uuids) {
-      return new Promise((resolve, reject) => {
-        const baseURL = window.$vueApp.config.globalProperties.baseURL
-        const baseAPI = window.$vueApp.config.globalProperties.baseAPI
-        let tempAction = baseURL + '/common/fs-upload/search-file-names'
-        if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
-          tempAction = baseAPI + '/api/search-file-names'
-        }
-        tempAction = getRelativeBaseUrl(tempAction)
-        const fileInfos = []
-        this.$http.post(tempAction, uuids).then((result) => {
-          uuids.forEach((uuid) => {
-            fileInfos.push({ showName: result[uuid], serverPath: uuid })
-          })
-          resolve(fileInfos)
-        })
-      })
-    },
     previewDoc(fileInfo) {
       const token = getToken()
       const showName = fileInfo.showName
@@ -407,6 +389,7 @@ export default {
         isShowWatermark +
         '&watermark=' +
         watermarkContent
+      debugger
       window.open(src)
     },
     analysisFileSetObj(fileSetObj, isSql) {
@@ -452,22 +435,31 @@ export default {
       if (serverPath) {
         const uuids = serverPath.split(',')
         if (uuids.length > 1) {
-          this.queryFileInfoByUuids(uuids).then((result) => {
-            this.fileList = result
+          const baseURL = window.$vueApp.config.globalProperties.baseURL
+          const baseAPI = window.$vueApp.config.globalProperties.baseAPI
+          let tempAction = baseURL + '/common/fs-upload/search-file-names'
+          if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
+            tempAction = baseAPI + '/api/search-file-names'
+          }
+          tempAction = getRelativeBaseUrl(tempAction)
+          this.$http.post(tempAction, uuids).then((result) => {
+            this.fileList = []
+            uuids.forEach((uuid) => {
+              this.fileList.push({ showName: result[uuid], serverPath: uuid })
+            })
           })
         }
       }
       return this.fileList
     },
     deleteFirst() {
-      this.getFirstFile().then((fileInfo) => {
-        this.$emit('delete-file', fileInfo)
-        this.fileList = this.fileList.filter((item) => item.serverPath !== fileInfo.serverPath)
-        this.$message({
-          showClose: true,
-          type: 'success',
-          message: getI18n().t('fsUpload.deleteSuccessful')
-        })
+      const fileInfo = this.getFirstFile()
+      this.$emit('delete-file', fileInfo)
+      this.fileList = this.fileList.filter((item) => item.serverPath !== fileInfo.serverPath)
+      this.$message({
+        showClose: true,
+        type: 'success',
+        message: getI18n().t('fsUpload.deleteSuccessful')
       })
     },
     deleteFile(fileInfo) {

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

@@ -48,13 +48,9 @@
         <el-icon><Delete /></el-icon>
       </span>
     </span>
-    <el-image-viewer
-      v-if="dialogVisible"
-      teleported
-      :url-list="previewSrcList"
-      :initial-index="initialIndex"
-      @close="dialogVisible = false"
-    />
+    <el-dialog v-model="dialogVisible" :title="t('fsUpload.preview')" width="500">
+      <el-image :preview-src-list="previewSrcList" :src="previewImageInfo.src" />
+    </el-dialog>
   </div>
 </template>
 <style scoped>
@@ -160,7 +156,6 @@ const previewImageInfo = ref<any>({})
 const previewSrcList = ref<string[]>([])
 const isMobile = ref(isMobileBrowser())
 const emits = defineEmits(['remove'])
-const initialIndex = ref(0)
 let watermarkCache = null
 getWatermarkSetting().then((data) => {
   watermarkCache = data
@@ -252,14 +247,10 @@ const preview = (showName: string, serverPath: string) => {
   if (isImg) {
     previewImageInfo.value.src = getPreviewSrc(showName, serverPath)
     const srcList: string[] = []
-    const currentIndex = props.fileList.findIndex((item: any) => item.serverPath === serverPath)
     props.fileList.forEach((item: any) => {
       const fileName = item.showName ? item.showName : item.name
-      if (isImage(fileName)) {
-        srcList.push(getPreviewSrc(fileName, item.serverPath))
-      }
+      srcList.push(getPreviewSrc(fileName, item.serverPath))
     })
-    initialIndex.value = currentIndex >= 0 ? currentIndex : 0
     previewSrcList.value = srcList
     dialogVisible.value = true
   } else {

package/packages/scan-code-input/src/scan-code-input.vue

@@ -138,7 +138,7 @@ export default {
     closeBrowserScan(value) {
       this.isShow = false
       this.value = value
-      $emit(this, 'close', value)
+      $emit(this, 'colse', value)
     },
     scanClick(){
       if(!this.isApk){

package/packages/scan-code-input-browser/src/scan-code-input.vue

@@ -1,6 +1,13 @@
 <template>
-  <div v-if="isShow" class>
-    <video id="video" ref="video" height="300" class="video vjs-fluid" autoplay @click="clickVideo" />
+  <div class>
+    <video
+      id="video"
+      ref="video"
+      height="300"
+      class="video vjs-fluid"
+      autoplay
+      @click="clickVideo"
+    />
     <div v-show="tipShow" class="tip">
       {{ tipMsg }}
     </div>
@@ -10,7 +17,6 @@
 <script type="text/ecmascript-6">
 import { $on, $off, $once, $emit } from '../../utils/gogocodeTransfer';
 import { BrowserMultiFormatReader } from '@zxing/library'
-import { getSessionCache } from '../../../src/utils/auth';
 
 export default {name: 'ScanCodeInputBrowser',
 components: {},
@@ -28,23 +34,11 @@ data() {
     vin: null,
     tipMsg: this.$t('messageVideo.attemptingToIdentify'),
     tipShow: false,
-    isVideo: false,
-    isShow: false // 是否显示浏览器拍照
+    isVideo: false
   };
 },
 created() {
-  const isCustomMediea = getSessionCache('is_custom_mediea')
-  if (window.customMediea && window.customMediea.customScan && isCustomMediea && 'true' === isCustomMediea) {
-    // 表示需要集成第三方扫码。
-    console.log('集成第三方扫码')
-    // 不需要显示浏览器拍照
-    this.isShow = false
-    const that = this
-    window.customMediea.customScan((val)=>{that.setScanResult(val)})
-  } else {
-    this.isShow = true
-    this.openScan()
-  }
+  this.openScan()
 },
 beforeUnmount() {
   console.log('销毁定时器')
@@ -112,12 +106,8 @@ methods: {
       $emit(this, "close",this.vin)
       this.codeReader.reset()
     }
-  },
-  setScanResult(value){
-    console.log('集成第三方扫码,setScanResult=', value)
-    $emit(this, "close",value)
   }
 },
-emits:['close',]
-}
+                emits:['close',]
+            }
 </script>