cloud-web-corejs 1.0.159 → 1.0.160

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.159",
+  "version": "1.0.160",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/field-widget/vabUpload-widget.vue

@@ -31,6 +31,7 @@
       :limit="field.options.limit"
       resultType="Array"
       :edit="!field.options.disabled"
+      :remove="!field.options.hideRemoveButton"
       @callback="submitFile"
       :hideInfo="field.options.hideFileInfo"
       :hideName="field.options.hideFileName"

package/src/components/xform/form-designer/form-widget/field-widget/vabUpload2-widget.vue

@@ -69,7 +69,7 @@
                   <div
                     class="el-icon-close"
                     @click="deleteFile(index)"
-                    v-if="!field.options.disabled"
+                    v-if="!field.options.disabled && !field.options.hideRemoveButton"
                   >
                     <i
                       class="el-tooltip iconfont iconshanchu"
@@ -244,13 +244,13 @@ export default {
       this.showViewer = false;
     },
     hasPreview(attachment) {
-      return this.$commonFileUtil.isPictureFile(attachment.name);
+      return this.$commonFileUtil.isPictureFile(attachment.filename);
     },
     openPreview(attachment, index) {
-      let typeStr = Object.prototype.toString.call(attachment);
+      /* let typeStr = Object.prototype.toString.call(attachment);
       let url =
-        typeStr == "[object Object]" ? attachment.domain + attachment.url : attachment;
-      if (this.$commonFileUtil.isPictureFile(attachment.name)) {
+        typeStr == "[object Object]" ? attachment.domain + attachment.url : attachment; */
+      if (this.$commonFileUtil.isPictureFile(attachment.filename)) {
         this.openImagePreView(index);
       }
     },
@@ -260,12 +260,12 @@ export default {
       let rows = [];
 
       this.fieldModel.forEach((item, i) => {
-        if (this.$commonFileUtil.isPictureFile(item.name)) {
+        if (this.$commonFileUtil.isPictureFile(item.filename)) {
           rows.push(item.showUrl);
         }
       });
       this.fieldModel.find((item, i) => {
-        if (this.$commonFileUtil.isPictureFile(item.name)) {
+        if (this.$commonFileUtil.isPictureFile(item.filename)) {
           pictureIndex++;
         }
         return index == i;
@@ -302,7 +302,7 @@ export default {
       return name;
     },
     getShowUrl(attachment) {
-      return this.$commonFileUtil.getFileIconRequire(attachment.name);
+      return this.$commonFileUtil.getFileIconRequire(attachment.filename);
       /* if (this.$commonFileUtil.isPictureFile(attachment.name)) {
         return attachment.showUrl;
       } else {
@@ -374,10 +374,18 @@ export default {
         },
       });
     },
+    getDownloadName(attachment){
+      let suffix = this.$commonFileUtil.getFileSuffix(attachment.filename)
+      let fileName = attachment.name;
+      if(fileName.lastIndexOf(`.${suffix}`)<0){
+        fileName = fileName + "." + suffix;
+      }
+      return fileName
+    },
     downloadFile(attachment) {
       const toDo = () => {
         const a = document.createElement("a");
-        a.download = attachment.name;
+        a.download = this.getDownloadName(attachment);
         a.href = attachment.showUrl;
         a.click();
       };

package/src/components/xform/form-designer/setting-panel/property-editor/field-vabUpload/field-vabUpload-editor.vue

@@ -27,6 +27,9 @@
         <el-option :value="5" label="5"></el-option>
       </el-select>
     </el-form-item>
+    <!-- <el-form-item :label="i18nt('隐藏删除按钮')">
+      <el-switch v-model="optionModel.hideRemoveButton"></el-switch>
+    </el-form-item> -->
 
   </div>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/field-vabUpload2/field-vabUpload2-editor.vue

@@ -37,6 +37,9 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
+    <el-form-item :label="i18nt('隐藏删除按钮')">
+      <el-switch v-model="optionModel.hideRemoveButton"></el-switch>
+    </el-form-item>
   </div>
 </template>
 

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -2739,6 +2739,7 @@ export const advancedFields = [
       labelWidth: null,
       labelHidden: !0,
       limit: null,
+      hideRemoveButton: false,
       accessType: "1",
       entityTableCode: null,
       entityTableDesc: null,
@@ -3744,6 +3745,7 @@ export const businessFields = [
       labelWidth: null,
       labelHidden: !0,
       limit: null,
+      hideRemoveButton: false,
       accessType: "1",
       entityTableCode: null,
       entityTableDesc: null,