cloud-web-corejs 1.0.54-dev.77 → 1.0.54-dev.770

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

@@ -1,184 +1,216 @@
-<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">
-    <a href="javascript:void(0);" class="a-link nums" v-if="designState">
-      <i class="iconfont icon-fujian3"/>
-    </a>
-    <base-attachment :option.sync="option" v-else></base-attachment>
-  </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: "baseAttachment-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;
-    },
-    option() {
-      return {
-        title: '附件',
-        edit: !this.field.options.disabled,
-        uploadConfig: {
-          limit: this.field.options.limit,
-          resultType: "Array"
-        },
-        rows: (done) => {
-          done(this.fieldModel);
-        },
-        confirm: (rows, fileInfos) => {
-          this.fieldModel = rows;
-          // this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
-          let eventParamNames = ['attachments', 'fileInfos'];
-          let eventParamValues = [rows, fileInfos];
-          this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
-        }
-      };
-    }
-  },
-  beforeCreate() {
-    /* 这里不能访问方法和属性！！ */
-  },
-
-  created() {
-    /*this.option = {
-      title: '附件',
-      edit: !this.field.options.disabled,
-      rows: (done) => {
-        done(this.fieldModel);
-      },
-      confirm: (attachments) => {
-        this.fieldModel = attachments;
-      }
-    };
-    let a = 1;*/
-    /* 注意：子组件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: {
-    setValue(val) {
-      let data = val || []
-      this.fieldModel = data;
-      this.getFormRef().formDataModel[this.fieldKeyName] = data;
-    },
-    loadDataDefaultHandle() {
-      let dataId = this.formDataId;
-      if (!dataId) return;
-      let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
-      if (dataId) {
-        let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
-        return this.formHttp({
-          url: "/" + reportTemplate.serviceName + "/form_ins/getList",
-          data: {
-            formCode: formCode,
-            formVersion: reportTemplate.formVersion,
-            taBm: this.fieldKeyName,
-            data: {
-              ...accessParam,
-              id: dataId
-            }
-          },
-          callback: res => {
-            let rows = res.objx || [];
-            this.setValue(rows)
-          }
-        });
-      }
-    },
-  }
-}
-</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>
+<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">
+    <a href="javascript:void(0);" class="a-link nums" v-if="designState">
+      <i class="iconfont icon-fujian3"/>
+    </a>
+    <base-attachment :option.sync="option" v-else></base-attachment>
+  </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: "baseAttachment-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,
+      option:{}
+    }
+  },
+  watch: {
+    fieldModel(val) {
+      this.handleChangeEvent(val);
+    },
+    'option':function(){
+
+    }
+  },
+  computed: {
+    formDataId() {
+      let formRef = this.getFormRef();
+      return formRef.dataId;
+    }/*,
+    option() {
+      return {
+        title: '附件',
+        edit: !this.field.options.disabled,
+        uploadConfig: {
+          limit: this.field.options.limit,
+          resultType: "Array"
+        },
+        rows: (done) => {
+          done(this.fieldModel);
+        },
+        confirm: (rows, fileInfos) => {
+          this.fieldModel = rows;
+          // this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+          let eventParamNames = ['attachments', 'fileInfos'];
+          let eventParamValues = [rows, fileInfos];
+          this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
+        }
+      };
+    }*/
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /*this.option = {
+      title: '附件',
+      edit: !this.field.options.disabled,
+      rows: (done) => {
+        done(this.fieldModel);
+      },
+      confirm: (attachments) => {
+        this.fieldModel = attachments;
+      }
+    };
+    let a = 1;*/
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+
+    this.isH5 = this.getFormConfig()?.layoutType === 'H5';
+
+    this.initFieldModel()
+    this.registerToRefList()
+    this.initEventHandler()
+    this.buildFieldRules()
+
+    this.handleOnCreated()
+    this.initOption();
+  },
+
+  mounted() {
+    this.handleOnMounted()
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+  methods: {
+    initOption(){
+      this.option = {
+        title: '附件',
+        edit: !this.field.options.disabled,
+        showViewButton: this.field.options.showViewButton !== false,
+        uploadConfig: {
+          limit: this.field.options.limit,
+          resultType: "Array"
+        },
+        rows: (done) => {
+          done(this.fieldModel);
+        },
+        confirm: (rows, fileInfos) => {
+          this.fieldModel = rows;
+          // this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+          let eventParamNames = ['attachments', 'fileInfos'];
+          let eventParamValues = [rows, fileInfos];
+          this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
+        }
+      }
+    },
+    setValue(val) {
+      let data = val || []
+      // 按 tableParam 决定落点：行内附件写回当前行对象，主表写回表单模型。
+      // 旧实现固定写 getFormRef().formDataModel（顶层），行内附件会写错位置并丢失联动，
+      // 且多行会互相覆盖同一个顶层字段。
+      let currentData = this.tableParam && this.tableParam.row
+        ? this.tableParam.row
+        : this.formModel;
+      if (currentData[this.fieldKeyName] === undefined) {
+        this.$set(currentData, this.fieldKeyName, [])
+      }
+      // 赋值 fieldModel 会触发 watch.fieldModel -> handleChangeEvent（内部再走
+      // syncUpdateFormModel + emitFieldDataChange，异步一次）。这里再同步写一次模型，
+      // 保证 setValue 返回后立即可读到最新值，且落点与 watcher 一致，不会重复触发变更事件。
+      this.fieldModel = data;
+      this.syncUpdateFormModel(data);
+    },
+    loadDataDefaultHandle() {
+      let dataId = this.formDataId;
+      if (!dataId) return;
+      let reportTemplate = this.getFormRef().reportTemplate;
+      if (dataId) {
+        let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
+        return this.formHttp({
+          url: "/" + reportTemplate.serviceName + "/form_ins/getList",
+          data: this.buildFormScriptData(reportTemplate, {
+            ...accessParam,
+            id: dataId
+          }),
+          callback: res => {
+            let rows = res.objx || [];
+            this.setValue(rows)
+          }
+        });
+      }
+    },
+  }
+}
+</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/button-widget.vue

@@ -1,87 +1,97 @@
 <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">
-    <el-button ref="fieldEditor" :type="field.options.type" :size="field.options.size" class="button-sty"
-               :plain="field.options.plain" :round="field.options.round"
-               :circle="field.options.circle" :icon="field.options.icon"
-               :disabled="field.options.disabled"
-               @click.native="handleButtonWidgetClick">
-      {{ getI18nLabel(field.options.label)}}</el-button>
+  <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"
+  >
+    <el-button
+      ref="fieldEditor"
+      :type="field.options.type"
+      :size="field.options.size"
+      class="button-sty"
+      :plain="field.options.plain"
+      :round="field.options.round"
+      :circle="field.options.circle"
+      :icon="field.options.icon"
+      :disabled="!designState && field.options.disabled"
+      @click.native="handleButtonWidgetClick"
+    >
+      {{ getI18nLabel(field.options.label) }}</el-button
+    >
   </static-content-wrapper>
 </template>
 
 <script>
-  import StaticContentWrapper from './static-content-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";
+import StaticContentWrapper from "./static-content-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: "button-widget",
-    componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-    mixins: [emitter, fieldMixin, i18n],
-    props: {
-      field: Object,
-      parentWidget: Object,
-      parentList: Array,
-      indexOfParentList: Number,
-      designer: Object,
+export default {
+  name: "button-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,
+    designState: {
+      type: Boolean,
+      default: false,
     },
-    computed: {
 
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    beforeCreate() {
-      /* 这里不能访问方法和属性！！ */
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-
-    created() {
-      /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
-         需要在父组件created中初始化！！ */
-      this.registerToRefList()
-      this.initEventHandler()
-
-      this.handleOnCreated()
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
+  },
+  components: {
+    StaticContentWrapper,
+  },
+  computed: {},
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
 
-    mounted() {
-      this.handleOnMounted()
-    },
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+         需要在父组件created中初始化！！ */
+    this.registerToRefList();
+    this.initEventHandler();
 
-    beforeDestroy() {
-      this.unregisterFromRefList()
-    },
+    this.handleOnCreated();
+  },
 
-    methods: {
+  mounted() {
+    this.handleOnMounted();
+  },
 
-    }
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
 
-  }
+  methods: {},
+};
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
-
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 </style>