cloud-web-corejs 1.0.128 → 1.0.130

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

@@ -12,7 +12,7 @@
   <div class="field-wrapper" :class="{'design-time-bottom-margin': !!this.designer}"
        v-show="!field.options.hidden || (designState === true)">
     <div>
-      <template v-if="formItemProp=='false'">
+      <template v-if="formItemProp==='false'">
         <template v-if="!field.options.hidden">
           <template v-if="isShowWidget()">
             <slot></slot>
@@ -39,7 +39,7 @@
         <el-form-item v-if="!!field.formItemFlag && (!field.options.hidden || (designState === true))"
                       :label="label" :label-width="labelWidth"
                       :title="field.options.labelTooltip"
-                      :rules="rules" :prop="getPropName()"
+                      :rules="getRules()" :prop="getPropName()"
                       :class="[selected ? 'selected' : '', labelAlign, customClass, field.options.required ? 'required' : '']"
                       @click.native.stop="selectField(field)">
 
@@ -277,13 +277,24 @@ export default {
         })
       }
     },
-
+    getIsFormItemUnabled(){
+      return this.field.type == "vabUpload" || this.field.type == "baseAttachment"
+    },
+    getRules(){
+      if(this.getIsFormItemUnabled()){
+        return null
+      }
+      return this.rules;
+    },
     getPropName() {
+      if(this.getIsFormItemUnabled()){
+        return null
+      }
       if (this.formItemProp) {
         return this.formItemProp;
       }
       let o = this.field.options.name;
-      return (
+      let propName = (
         (o
           = (this.field.options.keyNameEnabled
             && this.field.options.keyName)
@@ -298,6 +309,8 @@ export default {
               ? this.getObjectName() + "." + o
               : o
       );
+
+      return propName
     },
     getI18nLabel(label, path, param) {
       return !this.designState && label ? this.$t2(label, path, param) : label;

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

@@ -61,10 +61,14 @@ 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) => {
 
         }

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

@@ -0,0 +1,185 @@
+<template>
+  <static-content-wrapper
+    :designer="designer"
+    :field="field"
+    :design-state="designState"
+    :display-style="field.options.displayStyle"
+    :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"
+  >
+    <vxe-grid
+      ref="table-m1"
+      :data="oplogDTOs"
+      v-bind="m1Option"
+      @resizable-change="$vxeTableUtil.onColumnWitchChange"
+      @custom="$vxeTableUtil.customHandle"
+    ></vxe-grid>
+  </static-content-wrapper>
+</template>
+
+<script>
+import StaticContentWrapper from "./static-content-wrapper";
+import emitter from "../../../utils/emitter";
+import i18n from "../../../utils/i18n";
+import fieldMixin from "./fieldMixin";
+
+export default {
+  name: "oplog-widget",
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+
+    designState: {
+      type: Boolean,
+      default: false,
+    },
+
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
+    },
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
+    },
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
+    },
+  },
+  components: {
+    StaticContentWrapper,
+  },
+  computed: {
+    showLabel() {
+      return this.field.options.labelHidden ? null : this.label;
+    },
+    label() {
+      return this.field.options.isFormLabel
+        ? this.currentValue
+        : this.getI18nLabel(this.field.options.label);
+    },
+    widgetClass() {
+      let list = [];
+      let optionModel = this.field.options;
+      if (optionModel.colorClass) list.push(optionModel.colorClass);
+      if (optionModel.underline) list.push("underLine");
+      if (optionModel.disabled) list.push("is-disabled");
+      return list;
+    },
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+  data() {
+    return {
+      m1Option: {},
+      oplogDTOs: [],
+    };
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList();
+    this.initEventHandler();
+
+    this.handleOnCreated();
+  },
+
+  mounted() {
+    this.handleOnMounted();
+    this.initOplogDTOs();
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+
+  methods: {
+    initOplogDTOs() {
+      const tableOption = {
+        vue: this,
+        tableRef: "table-m1",
+        tableName: "xform-oplog-oplogList-m1Grid",
+        columns: [
+          {
+            type: "checkbox",
+            fixed: "left",
+            width: 48,
+            resizable: false,
+          },
+          {
+            title: this.$t2("操作时间", "components.oplogTable.createDate"),
+            field: "create_date",
+            width: 150,
+          },
+          {
+            title: this.$t2("操作人员", "components.oplogTable.createBy"),
+            field: "_createBy",
+            width: 150,
+          },
+          {
+            title: this.$t2("操作日志", "components.oplogTable.content"),
+            field: "content",
+            width: 250,
+          },
+          {
+            width: 47,
+            fixed: "right",
+            title: "",
+            sortable: false,
+          },
+        ],
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
+        this.m1Option = opts;
+      });
+      this.initData();
+    },
+    initData(option) {
+      let reportTemplate = this.getFormRef().reportTemplate;
+      let formCode = reportTemplate.formCode;
+      let scriptCode = this.field.options.formScriptCode;
+      let oplogTypeCode = this.field.options.oplogTypeCode || formCode;
+      let oplogBusinessKey = this.field.options.oplogBusinessKey || "id";
+      if (!scriptCode) return;
+      let business_code = this.formModel[oplogBusinessKey];
+      if (!business_code) return;
+      this.formHttp({
+        scriptCode: scriptCode,
+        data: {
+          formCode: formCode,
+          formVersion: reportTemplate.formVersion,
+          data: {
+            log_type: oplogTypeCode,
+            business_code: business_code,
+          },
+        },
+        addCreateInfo: true,
+        queryCreateInfo: true,
+        callback: (res) => {
+          let rows = res.objx || [];
+          this.oplogDTOs = rows;
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+a.is-disabled {
+  cursor: not-allowed;
+}
+</style>

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

@@ -9,7 +9,7 @@
         <span>{{ $t1('导出/打印') }}</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="_self" :disabled="field.options.disabled" v-else/>
+    <base-input-export :option="exportOption" :parent-target="getFormRef()" :disabled="field.options.disabled" v-else/>
   </static-content-wrapper>
 
 </template>

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

@@ -0,0 +1,108 @@
+<template>
+  <static-content-wrapper
+    :designer="designer"
+    :field="field"
+    :design-state="designState"
+    :display-style="field.options.displayStyle"
+    :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>
+      </el-button>
+    </el-dropdown>
+    <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 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";
+
+export default {
+  name: "print-detail-button-widget",
+  components: { StaticContentWrapper },
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+    designState: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      exportOption: {},
+    };
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+  created() {
+    this.init();
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList();
+    this.initEventHandler();
+
+    this.handleOnCreated();
+  },
+
+  mounted() {
+    this.handleOnMounted();
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+
+  methods: {
+    init() {
+      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 option = {
+        prefix: prefix,
+        codes,
+        customCondition:(exportTemplate)=>{
+          let param = {
+            formData: this.formModel
+          };
+          if (this.field.options.printCustomCondition) {
+            let param1 = this.handleCustomEvent(this.field.options.printCustomCondition,['exportTemplate'],[exportTemplate]);
+            if(param1)param = param1;
+          }
+          return param;
+        }
+      };
+      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/singleUpload-widget.vue

@@ -0,0 +1,145 @@
+<template>
+  <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">
+    <div id="uploadImage" class="upload-img" v-if="designState">
+      <div class="el-upload el-upload--picture" style="vertical-align: middle;display: inline-block;float:left">
+        <button type="button" class=" avatar-uploader">
+          <i class="el-icon-plus avatar-uploader-icon"></i>
+        </button>
+      </div>
+    </div>
+    <baseUpload accept="file" :file.sync="fieldModel" :hidePasteArea.sync="isH5"
+                :uploadDialogCustomClass="isH5?'dialog-upload-h5':null" :pickPrivateProfile="false"
+                :multi="field.options.limit!==1"
+                :limit="field.options.limit"
+                resultType="Array"
+                :edit="!field.options.disabled"
+                @callback="submitFile"
+                :hideInfo="field.options.hideFileInfo"
+                :hideName="field.options.hideFileName"
+                :showSize="!!field.options.showFileSize"
+                :createBy="!!field.options.showFileCreateBy"
+                :createDate="!!field.options.showFileCreateDate"
+                :widgetSize="field.options.fileShowImageSize"
+                v-else></baseUpload>
+  </form-item-wrapper>
+</template>
+
+<script>
+import FormItemWrapper from './form-item-wrapper'
+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";
+
+export default {
+  name: "singleUpload-widget",
+  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+
+    designState: {
+      type: Boolean,
+      default: false
+    },
+
+    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
+      type: String,
+      default: ''
+    }
+  },
+  components: {
+    FormItemWrapper,
+  },
+  inject: ['refList', 'globalOptionData', 'globalModel', 'getFormConfig'],
+  data() {
+    return {
+      oldFieldValue: [], //field组件change之前的值
+      fieldModel: [],
+      rules: [],
+      isH5: false
+    }
+  },
+  watch: {
+    fieldModel(val) {
+      this.handleChangeEvent(val);
+    }
+  },
+  computed: {
+    formDataId() {
+      let formRef = this.getFormRef();
+      return formRef.dataId;
+    }
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+
+    this.isH5 = this.getFormConfig().layoutType === 'H5';
+
+    this.initFieldModel()
+    this.registerToRefList()
+    this.initEventHandler()
+    this.buildFieldRules()
+
+    this.handleOnCreated()
+  },
+
+  mounted() {
+    this.handleOnMounted()
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+  methods: {
+    submitFile(rows, fileInfos) {
+      // this.handlLineCode(fileInfos);
+      let eventParamNames = ['attachments', 'fileInfos'];
+      let eventParamValues = [rows, fileInfos];
+      this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+
+.full-width-input {
+  width: 100% !important;
+}
+
+.hideUploadDiv {
+  ::v-deep div.el-upload--picture-card { /* 隐藏最后的图片上传按钮 */
+    display: none;
+  }
+
+  ::v-deep div.el-upload--text { /* 隐藏最后的文件上传按钮 */
+    display: none;
+  }
+
+  ::v-deep div.el-upload__tip { /* 隐藏最后的文件上传按钮提示 */
+    display: none;
+  }
+}
+
+</style>

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

@@ -4,10 +4,10 @@
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                      :sub-form-row-id="subFormRowId">
     <template v-for="(item,index) in field.options.statusParam">
-      <span
-        v-if="fieldModel===item.value"
-        :key="index" class="list-tag"
-        :class="item.type">{{ getI18nLabel(item.label) }}</span>
+      <template v-if="fieldModel===item[valueField]">
+        <span v-if="field.options.formScriptEnabled || field.options.commonAttributeEnabled"  :key="index" >{{ getI18nLabel(item[labelField]) }}</span>
+        <span v-else :key="index" class="list-tag" :class="item.type">{{ getI18nLabel(item[labelField]) }}</span>
+      </template>
     </template>
   </form-item-wrapper>
 </template>
@@ -64,6 +64,14 @@ export default {
       statusParam: [],
     }
   },
+  computed: {
+    labelField(){
+      return this.getOptionItemLabelKey();
+    },
+    valueField(){
+      return this.getOptionItemValueKey();
+    }
+  },
   watch: {
     fieldModel(val) {
       this.handleChangeEvent(val);
@@ -85,6 +93,7 @@ export default {
     this.buildFieldRules()
 
     this.handleOnCreated()
+    this.initOptionItemsHandle()
     // this.initStatusParam();
   },