cloud-web-corejs-haier 1.0.3 → 1.0.5

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

@@ -61,18 +61,27 @@ export default {
 
   methods: {
     importHandle() {
-      let multi = this.field.options.importMultiple || false;
-      let multiSize = this.field.options.importMultiSize || 1;
-      this.getFormRef().openImportDialog({
-        target: this,
-        importOption: this.field.options,
-        importFrontOnly: false,
-        multi,
-        multiSize,
-        callback: (resultData, file, done) => {
+      const done = () => {
+        let multi = this.field.options.importMultiple || false;
+        let multiSize = this.field.options.importMultiSize || 1;
+        this.getFormRef().openImportDialog({
+          target: this,
+          importOption: this.field.options,
+          importFrontOnly: false,
+          multi,
+          multiSize,
+          callback: (resultData, file, done) => {
 
+          }
+        });
+      }
+      if (this.field.options.onBeforeClickButton) {
+        if (this.handleCustomEvent(this.field.options.onBeforeClickButton, ["done"], [done]) !== false) {
+          done();
         }
-      });
+      } else {
+        done();
+      }
     }
   }
 

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

@@ -61,14 +61,23 @@ export default {
 
   methods: {
     importHandle() {
-      this.getFormRef().openImportDialog({
-        target: this,
-        importOption: this.field.options,
-        importFrontOnly: true,
-        callback: (resultData, file, done) => {
+      const done = () => {
+        this.getFormRef().openImportDialog({
+          target: this,
+          importOption: this.field.options,
+          importFrontOnly: true,
+          callback: (resultData, file, done) => {
 
+          }
+        });
+      }
+      if (this.field.options.onBeforeClickButton) {
+        if (this.handleCustomEvent(this.field.options.onBeforeClickButton, ["done"], [done]) !== false) {
+          done();
         }
-      });
+      } else {
+        done();
+      }
     }
   }
 

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

@@ -2,7 +2,7 @@
   <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
                      :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
-    <el-input v-if="!field.options.showText" ref="fieldEditor" v-model="fieldModel"
+    <el-input ref="fieldEditor" v-model="fieldModel" v-show="!isReadMode"
               :disabled="field.options.disabled" :readonly="field.options.readonly"
               :size="field.options.size" class="hide-spin-button"
               :type="inputType"
@@ -19,7 +19,9 @@
       <el-button slot="append" v-if="field.options.appendButton" :disabled="field.options.disabled || field.options.appendButtonDisabled"
                  :class="field.options.buttonIcon" @click.native="emitAppendButtonClick"></el-button>
     </el-input>
-    <span v-else>{{ fieldModel}}</span>
+    <template v-if="isReadMode">
+      <span class="readonly-mode-field pre-wrap" :title="contentForReadMode">{{contentForReadMode}}</span>
+    </template>
   </form-item-wrapper>
 </template>
 
@@ -77,6 +79,9 @@
 
         return this.field.options.type
       },
+      contentForReadMode() {
+        return this.fieldModel ? this.fieldModel : ''
+      },
 
     },
     beforeCreate() {

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

@@ -14,7 +14,7 @@
       @change="changeShowValue2"
     >
       <i slot="suffix" class="el-input__icon el-icon-search" @click="emitAppendButtonClick"></i>
-      <span v-show="false">{{ showValue }}</span>
+      <span v-show="false">{{ showValue2 }}</span>
     </el-input>
   </form-item-wrapper>
 </template>

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

@@ -14,6 +14,7 @@
     <el-input-number
       ref="fieldEditor"
       v-model="numberValue"
+      v-show="!isReadMode"
       class="full-width-input"
       :disabled="field.options.disabled"
       :size="field.options.size"
@@ -29,6 +30,9 @@
       :class="[field.options.showbutton ? '' : 'noButton']"
     >
     </el-input-number>
+    <template v-if="isReadMode">
+      <span class="readonly-mode-field">{{contentForReadMode}}</span>
+    </template>
   </form-item-wrapper>
 </template>
 
@@ -94,6 +98,9 @@ export default {
         currentData[this.fieldKeyName] = newValue;
       },
     },
+    contentForReadMode() {
+      return (this.fieldModel === null || this.fieldModel === undefined) ? '' : this.fieldModel
+    }
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */

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

@@ -147,6 +147,7 @@ export default {
       this.initData();
     },
     initData(option) {
+      if (this.designState) return;
       let reportTemplate = this.getFormRef().reportTemplate;
       let formCode = reportTemplate.formCode;
       let scriptCode = this.field.options.formScriptCode;

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

@@ -1,29 +1,38 @@
 <template>
   <static-content-wrapper
-    :designer="designer" :field="field" :design-state="designState"
+    :designer="designer"
+    :field="field"
+    :design-state="designState"
     :display-style="field.options.displayStyle"
-    :parent-widget="parentWidget" :parent-list="parentList"
-    :index-of-parent-list="indexOfParentList">
+    :parent-widget="parentWidget"
+    :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList"
+  >
     <el-dropdown trigger="hover" v-if="designState" :disabled="field.options.disabled">
       <el-button type="primary" class="button-sty" size="mini">
-        <span>{{ $t1('导出/打印') }}</span><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
+        <span>{{ getI18nLabel(field.options.label) }}</span
+        ><span class="line"></span>
+        <i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
     </el-dropdown>
-    <base-input-export :option="exportOption" :parent-target="getFormRef()" :disabled="field.options.disabled" v-else/>
+    <base-input-export
+      :option="exportOption"
+      :parent-target="getFormRef()"
+      :disabled="field.options.disabled"
+      v-else
+    />
   </static-content-wrapper>
-
 </template>
 <script>
-import emitter from '../../../../../components/xform/utils/emitter'
+import emitter from "../../../../../components/xform/utils/emitter";
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
-import StaticContentWrapper
-  from "../../../../../components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue";
+import StaticContentWrapper from "../../../../../components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue";
 
 export default {
   name: "print-button-widget",
-  components: {StaticContentWrapper},
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  components: { StaticContentWrapper },
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -33,13 +42,13 @@ export default {
     designer: Object,
     designState: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
     return {
-      exportOption: {}
-    }
+      exportOption: {},
+    };
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -48,18 +57,18 @@ export default {
     this.init();
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.registerToRefList()
-    this.initEventHandler()
+    this.registerToRefList();
+    this.initEventHandler();
 
-    this.handleOnCreated()
+    this.handleOnCreated();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
 
   methods: {
@@ -67,25 +76,33 @@ export default {
       if (this.designState) return;
       let prefix = "/" + this.getFormRef().reportTemplate.serviceName;
       // let printOption = this.handleCustomEvent(this.field.options.printOption);
-      let codes = this.field.options.printItems.filter(item => !!item.code).map(item => item.code);
+      let codes = this.field.options.printItems
+        .filter((item) => !!item.code)
+        .map((item) => item.code);
+      let label = null;
+      /* if (this.field.options.customLabelEnabled && this.field.options.label) {
+        label = this.$t1(this.field.options.label);
+      } */
+      if (this.field.options.label) {
+        label = this.$t1(this.field.options.label);
+      }
       let option = {
         prefix: prefix,
         tableTarget: () => {
           return this.getWidgetRef(this.field.options.printTableRef).getGridTable();
         },
         codes,
+        label,
         // codes: ["USEREXCEL", "USERPDF", "USERPRINT", "USERHIPRINT", "USERJDPRINT", "USERPDDPRINT", "USERVIPPRINT"],
         // ...printOption
       };
-      console.log("a:", option)
+      console.log("a:", option);
       this.exportOption = option;
-    }
-  }
-
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
-
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/print-detail-button-widget.vue

@@ -8,13 +8,9 @@
     :parent-list="parentList"
     :index-of-parent-list="indexOfParentList"
   >
-    <el-dropdown
-      trigger="hover"
-      v-if="designState"
-      :disabled="field.options.disabled"
-    >
+    <el-dropdown trigger="hover" v-if="designState" :disabled="field.options.disabled">
       <el-button type="primary" class="button-sty" size="mini">
-        <span>{{ $t1("导出/打印") }}</span
+        <span>{{ getI18nLabel(field.options.label) }}</span
         ><span class="line"></span>
         <i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
@@ -83,19 +79,31 @@ export default {
       let codes = this.field.options.printItems
         .filter((item) => !!item.code)
         .map((item) => item.code);
+      let label = null;
+      /* if (this.field.options.customLabelEnabled && this.field.options.label) {
+        label = this.$t1(this.field.options.label);
+      } */
+      if (this.field.options.label) {
+        label = this.$t1(this.field.options.label);
+      }
       let option = {
         prefix: prefix,
         codes,
-        customCondition:(exportTemplate)=>{
+        label,
+        customCondition: (exportTemplate) => {
           let param = {
-            formData: this.formModel
+            formData: this.formModel,
           };
           if (this.field.options.printCustomCondition) {
-            let param1 = this.handleCustomEvent(this.field.options.printCustomCondition,['exportTemplate'],[exportTemplate]);
-            if(param1)param = param1;
+            let param1 = this.handleCustomEvent(
+              this.field.options.printCustomCondition,
+              ["exportTemplate"],
+              [exportTemplate]
+            );
+            if (param1) param = param1;
           }
           return param;
-        }
+        },
       };
       this.exportOption = option;
     },

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

@@ -26,7 +26,14 @@
         :closable="!field.options.disabled && field.options.tabDeleteEnabled"
         @close="deleteCallback(index)"
       >
-        {{ tag[field.options.tagLabelField] }}
+        <el-tooltip
+          :enterable="false"
+          effect="dark"
+          :content="tag[field.options.tagLabelField]"
+          placement="bottom"
+        >
+          <span :style="tagStyle">{{ tag[field.options.tagLabelField] }}</span>
+        </el-tooltip>
       </el-tag>
       <el-button
         icon="el-icon-plus"
@@ -101,6 +108,17 @@ export default {
     multi() {
       return this.limit !== 1;
     },
+    tagStyle() {
+      let result = {};
+      let tagWidth = this.field.options.tagWidth;
+      if (tagWidth) {
+        result.width = tagWidth;
+        // result.overflow = "hidden";
+        result.textOverflow = "ellipsis";
+        // result.whiteSpace = "nowrap";
+      }
+      return result;
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */

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

@@ -2,7 +2,7 @@
   <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
                      :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
-    <el-radio-group ref="fieldEditor" v-model="fieldModel"
+    <el-radio-group ref="fieldEditor" v-model="fieldModel" v-show="!isReadMode"
                     :disabled="field.options.disabled" :size="field.options.size"
                     @change="handleChangeEvent">
       <template v-if="!!field.options.buttonStyle">
@@ -16,6 +16,9 @@
                   :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-radio>
       </template>
     </el-radio-group>
+    <template v-if="isReadMode">
+      <span class="readonly-mode-field">{{optionLabel}}</span>
+    </template>
   </form-item-wrapper>
 </template>
 
@@ -77,12 +80,13 @@
         return this.getOptionItems();
       },
       fieldModelLabel() {
-        let fieldModel = this.fieldModel;
-        let optionItems = this.field.options.optionItems;
-        let valueField = this.valueField;
-        let labelField = this.labelField;
-        let optionItem = optionItems.find(item => item[valueField] === fieldModel)
-        return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
+        // let fieldModel = this.fieldModel;
+        // let optionItems = this.field.options.optionItems;
+        // let valueField = this.valueField;
+        // let labelField = this.labelField;
+        // let optionItem = optionItems.find(item => item[valueField] === fieldModel)
+        // return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
+        return this.getOptionLabel();
       },
     },
     beforeCreate() {

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

@@ -3,7 +3,7 @@
                      :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                      :sub-form-row-id="subFormRowId" v-if="">
-    <el-select v-if="!field.options.showText" ref="fieldEditor" v-model="fieldModel" class="full-width-input"
+    <el-select ref="fieldEditor" v-model="fieldModel" v-show="!isReadMode" class="full-width-input"
                :disabled="field.options.disabled"
                :size="field.options.size"
                :clearable="field.options.clearable"
@@ -23,7 +23,9 @@
                  :value="item[valueField]" :disabled="item.disabled">
       </el-option>
     </el-select>
-    <span v-else>{{ fieldModelLabel }}</span>
+    <template v-if="isReadMode">
+      <span class="readonly-mode-field">{{optionLabel}}</span>
+    </template>
   </form-item-wrapper>
 </template>
 
@@ -84,12 +86,13 @@ export default {
       return (!!this.field.options.filterable && !!this.field.options.allowCreate)
     },
     fieldModelLabel() {
-      let fieldModel = this.fieldModel;
-      let optionItems = this.field.options.optionItems;
-      let valueField = this.valueField;
-      let labelField = this.labelField;
-      let optionItem = optionItems.find(item => item[valueField] === fieldModel)
-      return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
+      // let fieldModel = this.fieldModel;
+      // let optionItems = this.field.options.optionItems;
+      // let valueField = this.valueField;
+      // let labelField = this.labelField;
+      // let optionItem = optionItems.find(item => item[valueField] === fieldModel)
+      // return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
+      return this.getOptionLabel();
     },
     optionItems() {
       return this.getOptionItems();

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

@@ -14,7 +14,7 @@
       @change="changeShowValue2"
     >
       <i slot="suffix" class="el-input__icon el-icon-search" @click="emitAppendButtonClick"></i>
-      <span v-show="false">{{ showValue }}</span>
+      <span v-show="false">{{ showValue2 }}</span>
     </el-input>
   </form-item-wrapper>
 </template>

package/src/components/xform/form-designer/form-widget/field-widget/table-export-button-widget.vue

@@ -4,7 +4,7 @@
     :display-style="field.options.displayStyle"
     :parent-widget="parentWidget" :parent-list="parentList"
     :index-of-parent-list="indexOfParentList">
-    <el-dropdown trigger="hover">
+    <el-dropdown trigger="hover" :disabled="field.options.disabled">
       <el-button type="primary" class="button-sty" size="mini">
         <span>{{ getI18nLabel('列表导出') }}</span><span class="line"></span> <i
         class="el-icon-arrow-down el-icon--right"></i>

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

@@ -14,7 +14,7 @@
       @change="changeShowValue2"
     >
       <i slot="suffix" class="el-input__icon el-icon-search" @click="emitAppendButtonClick"></i>
-      <span v-show="false">{{ showValue }}</span>
+      <span v-show="false">{{ showValue2 }}</span>
     </el-input>
   </form-item-wrapper>
 </template>

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 {
@@ -329,17 +329,36 @@ export default {
         backendwriteback: "10",
       };
 
+      let param = {
+        row: attachment,
+        rowIndex: index,
+      };
       let deleteParam =
-        this.handleCustomEvent(this.field.options.vabupload2_deleteParam) || {};
+        this.handleCustomEvent(
+          this.field.options.vabupload2_deleteParam,
+          ["param"],
+          [param]
+        ) || {};
       Object.assign(reqData, deleteParam);
 
+      // let url = this.deleteUrl + "?fileName=" + filename;
+
+      var form = new FormData();
+      form.append("fileName", filename);
+      Object.keys(reqData).forEach((key) => {
+        let value = reqData[key];
+        form.append(key, value);
+      });
+
       this.getFormRef().$http({
-        url: this.deleteUrl + "?fileName=" + filename,
+        url: this.deleteUrl,
         method: "post",
-        data: reqData,
+        // data: reqData,
+        data: form,
         // responseType: "RAW",
         headers: {
-          "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+          // "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+          "Content-Type": "multipart/form-data",
           Authorization: `Bearer ${this.token}`,
         },
         useToken: false,
@@ -355,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();
       };
@@ -373,6 +400,7 @@ export default {
       // this.$commonFileUtil.downloadFile(attachment.showUrl);
     },
     initUploadInfo() {
+      if(this.designState)return
       this.getHxFileUploadConfig({
         success: (res) => {
           // {"apiToken":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiI5YzcyNTE5OS00NDdlLTQ5OTMtOGRjYy1iMWM2NjY0YmJhNDAiLCJuYW1lIjoiOWM3MjUxOTktNDQ3ZS00OTkzLThkY2MtYjFjNjY2NGJiYTQwIiwibmJmIjoxNzU0NjE1ODE1LCJleHAiOjE3NTQ3MDIyMTUsImlzcyI6IlB3YyIsImF1ZCI6IkFTLkNSTS5TZXJ2aWNlLkFwaSJ9.CX2oy7P2PPwCPy-UdhNGaTiSfBHUiVgeK13N91NRcMc","domain":"https://crm-dev.hisense.com","uploadApi":"/api/v1.0/fileoperation/UploadFilesFromPortal","deleteApi":"/api/v1.0/fileoperation/delfile"}