cloud-web-corejs 1.0.54-dev.685 → 1.0.54-dev.686

package/src/components/VabUpload/mixins.js

@@ -65,9 +65,13 @@ tmixins = {
       type: Boolean,
       default: false,
     },
+    showFileLibraryButton: Boolean,
+    storeAreaPrefix: String,
+    storeAreaCode: String,
   },
   data() {
     return {
+      fileLibraryName: null,
       show: false,
       loading: false,
       dialogVisible: false,
@@ -145,6 +149,32 @@ tmixins = {
     },
   },
   methods: {
+    openFileLibraryDialog() {
+      this.$openFileLibraryDialog({
+        prefix: this.storeAreaPrefix,
+        storeAreaCode: this.storeAreaCode,
+        callback: ({ rows, fileRows }) => {
+          this.addFileLibraryFiles(rows);
+        },
+      });
+    },
+    initFileLibraryTitle() {
+      this.fileLibraryName = null;
+      this.$http({
+        method: "post",
+        url: USER_PREFIX + "/file_store_area/getByCode",
+        data: {
+          stringOne: this.storeAreaCode,
+        },
+        isLoading: true,
+        success: (res) => {
+          let fileStoreArea = res.objx;
+          if (fileStoreArea) {
+            this.fileLibraryName = fileStoreArea.storeAreaName;
+          }
+        },
+      });
+    },
     updateUploadingStatus() {
       var target = this.$refs.upload;
       let uploading, hasReadyFile;
@@ -224,8 +254,8 @@ tmixins = {
       if (fileList.length === this.imgNum) {
         this.fileList = fileList;
 
-      // 添加自动确认功能
-    // 当所有文件上传完成且 autoConfirmAfterUpload 为 true 时，自动调用 submitImage 方法
+        // 添加自动确认功能
+        // 当所有文件上传完成且 autoConfirmAfterUpload 为 true 时，自动调用 submitImage 方法
         if (this.autoConfirmAfterUpload) {
           // 使用 nextTick 确保所有文件状态已更新
           this.$nextTick(() => {
@@ -233,7 +263,6 @@ tmixins = {
           });
           return; // 自动确认后直接返回，不执行后续的 setTimeout
         }
-
       }
 
       setTimeout(() => {
@@ -286,15 +315,16 @@ tmixins = {
 
       this.removePasteEvent();
       this.addPasteEvent();
-      if(!option.files?.length){
-          this.initUploadUrl();
-      }else{
-        this.initUploadUrl(()=>{
-          this.handleUpload(option.files)
+      this.initFileLibraryTitle();
+      if (!option.files?.length) {
+        this.initUploadUrl();
+      } else {
+        this.initUploadUrl(() => {
+          this.handleUpload(option.files);
         });
       }
     },
-    handleUpload(fileRawList){
+    handleUpload(fileRawList) {
       let target = this.$refs.upload;
       let innerTarget = target.$refs["upload-inner"];
       if (fileRawList.length) {
@@ -500,19 +530,19 @@ tmixins = {
         // resolve(ev.target.result);
       };
     },
-    getFileMd5(file, callback){
+    getFileMd5(file, callback) {
       // 判断是否为大文件（例如大于10MB）
       const isLargeFile = file.size > 20 * 1024 * 1024;
 
       if (!isLargeFile) {
-        this.fileParse(file,"buffer", (buffer)=>{
+        this.fileParse(file, "buffer", (buffer) => {
           let spark = new imFun.SparkMD5.ArrayBuffer();
           spark.append(buffer);
           let hash = spark.end();
-          callback(hash)
-        })
-      }else{
-        this.calculateFileMD5(file, callback)
+          callback(hash);
+        });
+      } else {
+        this.calculateFileMD5(file, callback);
       }
     },
     calculateFileMD5(file, callback) {
@@ -523,15 +553,15 @@ tmixins = {
       const fileReader = new FileReader();
 
       // 处理读取错误
-      fileReader.onerror = function() {
-        console.error('文件读取错误');
+      fileReader.onerror = function () {
+        console.error("文件读取错误");
         callback(null);
       };
 
       // 处理进度回调（可选）
       const onProgress = (progress) => {
         // 可以在这里更新进度条
-        console.log('MD5计算进度: ' + Math.round(progress * 100) + '%');
+        console.log("MD5计算进度: " + Math.round(progress * 100) + "%");
       };
 
       // 递归读取下一块
@@ -543,7 +573,7 @@ tmixins = {
       };
 
       // 每块读取完成后的处理
-      fileReader.onload = function(e) {
+      fileReader.onload = function (e) {
         spark.append(e.target.result);
         currentChunk++;
 
@@ -621,7 +651,7 @@ tmixins = {
       // HASH_2.mp4
       // ...
 
-      this.getFileMd5(file,  (md5) => {
+      this.getFileMd5(file, (md5) => {
         /* let spark = new imFun.SparkMD5.ArrayBuffer(),
           chunkSize = this.chunkSize * 1024 * 1024, // Read in chunks of 2MB
           chunks = Math.ceil(file.size / chunkSize),
@@ -631,9 +661,9 @@ tmixins = {
         hash = spark.end(); */
 
         let chunkSize = this.chunkSize * 1024 * 1024, // Read in chunks of 2MB
-        chunks = Math.ceil(file.size / chunkSize),
-        hash = md5,
-        suffix;
+          chunks = Math.ceil(file.size / chunkSize),
+          hash = md5,
+          suffix;
 
         let nameSplit = /\.([0-9a-zA-Z]+)$/i.exec(file.name);
 
@@ -989,7 +1019,7 @@ tmixins = {
       }
       return showUrl;
     },
-    addPrivateFiles(rows) {
+    addFileLibraryFiles(rows) {
       var target = this.$refs.upload;
       let uploadFiles = target.uploadFiles;
       let sourceSns = uploadFiles
@@ -1033,6 +1063,12 @@ tmixins = {
                 medium: row.medium,
                 url: row.url,
                 sourceSn: row.sn,
+
+                attachCode: row.attachCode,
+                docCategory: row.docCategory,
+                drawingCode: row.drawingCode,
+                version: row.version,
+                rev: row.rev,
               },
               content: "success",
               rmid: null,
@@ -1045,7 +1081,7 @@ tmixins = {
       uploadFiles.push(...newFiles);
     },
     confirmPrivateProfileDialog(rows) {
-      this.addPrivateFiles(rows);
+      this.addFileLibraryFiles(rows);
     },
     initPrivateUploadBt() {
       if (settingConfig.privateProfileCode && this.pickPrivateProfile) {
@@ -1074,14 +1110,16 @@ tmixins = {
           let value = !res.objx || !res.objx.value ? "2" : res.objx.value;
           if (value == "0") {
             //启用本地上传，个人文档上传
-            this.showLocalUploadBtn = true;
+            if (this.option.showLocalUploadBtn !== false)
+              this.showLocalUploadBtn = true;
             this.initPrivateUploadBt();
           } else if (value == "1") {
             //启用个人文档上传
             this.initPrivateUploadBt();
           } else if (value == "2") {
             //启用本地上传
-            this.showLocalUploadBtn = true;
+            if (this.option.showLocalUploadBtn !== false)
+              this.showLocalUploadBtn = true;
           }
         },
       });
@@ -1240,7 +1278,7 @@ tViewMixins = {
       type: Boolean,
       default: () => {
         return settingConfig.isPartUpload ?? true;
-      }
+      },
     },
     autoConfirmAfterPasteUpload: {
       type: Boolean,
@@ -1257,14 +1295,14 @@ tViewMixins = {
       showViewer: false,
       chooseIndex: 0,
       fileServerInfo: {},
-      model: null
+      model: null,
     };
   },
   computed: {
-    fileServerPreviewEnabled(){
+    fileServerPreviewEnabled() {
       return this.getFileServerPreviewEnabled();
     },
-    fileShowImageEnabled(){
+    fileShowImageEnabled() {
       return this.getFileShowImageEnabled();
     },
     fileMaxSize() {
@@ -1326,35 +1364,48 @@ tViewMixins = {
     pasteEvent(e) {
       e.stopPropagation();
       if (!(e.clipboardData && e.clipboardData.items)) {
-        return
+        return;
       }
       let files = Array.from(e.clipboardData.files);
       if (files.length) {
-        this.openUploadDialog(files, this.autoConfirmAfterPasteUpload)
+        this.openUploadDialog(files, this.autoConfirmAfterPasteUpload);
       }
     },
     uploadEnterOver() {
       // if (this.isLoading) return;
-      document.addEventListener('paste', this.pasteEvent);
+      document.addEventListener("paste", this.pasteEvent);
     },
     uploadEnterLeave() {
-      document.removeEventListener('paste', this.pasteEvent);
+      document.removeEventListener("paste", this.pasteEvent);
     },
-    getFileServerPreviewEnabled(){
-      let value =  window.$vueRoot.$store.getters.fileServerInfo?.fileServerPreviewEnabled ?? (settingConfig.fileServerPreviewEnabled ?? true);
-      if(this.$attrs.fileServerPreviewEnabled!== null && this.$attrs.fileServerPreviewEnabled!== undefined){
-        value = this.$attrs.fileServerPreviewEnabled
+    getFileServerPreviewEnabled() {
+      let value =
+        window.$vueRoot.$store.getters.fileServerInfo
+          ?.fileServerPreviewEnabled ??
+        settingConfig.fileServerPreviewEnabled ??
+        true;
+      if (
+        this.$attrs.fileServerPreviewEnabled !== null &&
+        this.$attrs.fileServerPreviewEnabled !== undefined
+      ) {
+        value = this.$attrs.fileServerPreviewEnabled;
       }
       return value;
     },
-    getFileShowImageEnabled(){
-      let value =  window.$vueRoot.$store.getters.fileServerInfo?.fileShowImageEnabled ?? (settingConfig.fileShowImageEnabled ?? true);
-      if(this.$attrs.fileShowImageEnabled!== null && this.$attrs.fileShowImageEnabled!== undefined){
-        value = this.$attrs.fileShowImageEnabled
+    getFileShowImageEnabled() {
+      let value =
+        window.$vueRoot.$store.getters.fileServerInfo?.fileShowImageEnabled ??
+        settingConfig.fileShowImageEnabled ??
+        true;
+      if (
+        this.$attrs.fileShowImageEnabled !== null &&
+        this.$attrs.fileShowImageEnabled !== undefined
+      ) {
+        value = this.$attrs.fileShowImageEnabled;
       }
       return value;
     },
-    openUploadDialog(files,autoConfirmAfterUpload) {
+    openUploadDialog(files, autoConfirmAfterUpload) {
       this.$baseUpload.open({
         files,
         autoConfirmAfterUpload,
@@ -1378,7 +1429,8 @@ tViewMixins = {
         this.model = this.$attrs.model;
         // this.fileServerInfo = this.$attrs.fileServerInfo;
       } else {
-        this.model = window.$vueRoot.$store.getters.fileServerInfo?.model ?? null;
+        this.model =
+          window.$vueRoot.$store.getters.fileServerInfo?.model ?? null;
         /* getFileServerInfo(this, (res) => {
           if (res) {
             let fileServerInfo = res;
@@ -1573,7 +1625,10 @@ tViewMixins = {
           : attachment;
       if (this.$commonFileUtil.isPictureFile(url)) {
         this.openImagePreView(index);
-      } else if (fileServerPreviewEnabled && this.$commonFileUtil.isPreviewFile(url)) {
+      } else if (
+        fileServerPreviewEnabled &&
+        this.$commonFileUtil.isPreviewFile(url)
+      ) {
         this.$openFilePreview(url);
       }
     },
@@ -1599,7 +1654,11 @@ tViewMixins = {
       let typeStr = Object.prototype.toString.call(attachment);
       if (typeStr == "[object Object]") {
         let showField = field ? field : "medium";
-        let fullUrl = attachment.domain + (showImagePreview && attachment[showField] ? attachment[showField] : attachment.url);
+        let fullUrl =
+          attachment.domain +
+          (showImagePreview && attachment[showField]
+            ? attachment[showField]
+            : attachment.url);
         showUrl = this.$commonFileUtil.getShowUrl(fullUrl, showImagePreview);
       } else {
         showUrl = this.$commonFileUtil.getShowUrl(attachment, showImagePreview);

package/src/components/xform/form-designer/designer.js

@@ -98,6 +98,13 @@ let chartContainers = [],
         otherTabList: [],
         customListTabLabel: null,
         globalConfig: null,
+        // 表单级动态字段规则
+        dynamicFieldEnabled: false,
+        dynamicFieldSourceType: "local",
+        dynamicFieldRules: [],
+        dynamicFieldScriptCode: null,
+        dynamicFieldScriptParam: null,
+        dynamicFieldTriggerFields: [],
       },
       dataSources: [], //数据源