cloud-web-corejs 1.0.54-dev.66 → 1.0.54-dev.660

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

@@ -2,7 +2,7 @@
   <static-content-wrapper :designer="designer" :field="field" :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 ref="fieldEditor" v-html="field.options.htmlContent"></div>
+    <div :class="{'designer-html-container':designState}" ref="fieldEditor" v-html="field.options.htmlContent"></div>
   </static-content-wrapper>
 </template>
 
@@ -78,5 +78,9 @@
 
 <style lang="scss" scoped>
   @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
-
+  .designer-html-container{
+        outline: 1px dashed #336699;
+        padding: 10px;
+        margin: 5px;
+  }
 </style>

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

@@ -4,8 +4,8 @@
     :display-style="field.options.displayStyle"
     :parent-widget="parentWidget" :parent-list="parentList"
     :index-of-parent-list="indexOfParentList">
-    <el-button type="primary" class="button-sty" size="mini" icon="el-icon-download" @click="importHandle"
-               :disabled="field.options.disabled">{{$t1('导入')}}
+    <el-button :type="field.options.type" class="button-sty" size="mini" icon="el-icon-download" @click="importHandle"
+               :disabled="field.options.disabled">{{ getI18nLabel(field.options.label)}}
     </el-button>
   </static-content-wrapper>
 
@@ -61,16 +61,27 @@ export default {
 
   methods: {
     importHandle() {
-      let scriptCode = this.field.options.importScriptCode;
-      let entity = this.field.options.importEntity;
-      let importAttachCode = this.field.options.importAttachCode;
-      // let importCodes = this.field.options.importCodes;
-      this.getFormRef().openImportDialog({
-        importOption: this.field.options,
-        callback: () => {
-          // this.getWidgetRef(tableTarget).searchEvent();
+      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

@@ -0,0 +1,90 @@
+<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-button :type="field.options.type" class="button-sty" size="mini" icon="el-icon-download" @click="importHandle"
+               :disabled="field.options.disabled">{{ getI18nLabel(field.options.label)}}
+    </el-button>
+  </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: "import2-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() {
+
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList()
+    this.initEventHandler()
+
+    this.handleOnCreated()
+  },
+
+  mounted() {
+    this.handleOnMounted()
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+
+  methods: {
+    importHandle() {
+      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();
+      }
+    }
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+
+</style>

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/mixins/date-limit-mixin.js

@@ -0,0 +1,157 @@
+export default {
+  methods: {
+    getDateLimitOptions() {
+      return this.field.options || {};
+    },
+    initDateLimitPickerOptions() {
+      const pickerOptions = { ...(this.pickerOptions || {}) };
+      if (["year", "month", "date", "datetime"].includes(this.field.options.type)) {
+        if (!pickerOptions.shortcuts) {
+          pickerOptions.shortcuts = [
+            {
+              text: this.$t1("此刻"),
+              onClick(picker) {
+                picker.$emit("pick", new Date());
+              },
+            },
+          ];
+        }
+      }
+      pickerOptions.disabledDate = (time) => this.isDateLimitDisabled(time);
+      this.pickerOptions = pickerOptions;
+    },
+    initDateLimitWatch() {
+      if (this.designState) {
+        return;
+      }
+      const { limitStartField, limitEndField } = this.getDateLimitOptions();
+      if (limitStartField) {
+        this.$watch(
+          () => this.getDateLimitLinkedValue(limitStartField),
+          () => {
+            this.initDateLimitPickerOptions();
+          }
+        );
+      }
+      if (limitEndField) {
+        this.$watch(
+          () => this.getDateLimitLinkedValue(limitEndField),
+          () => {
+            this.initDateLimitPickerOptions();
+          }
+        );
+      }
+    },
+    getDateLimitDataSource() {
+      return this.tableParam && this.tableParam.row
+        ? this.tableParam.row
+        : this.formModel;
+    },
+    getDateLimitLinkedValue(fieldName) {
+      if (!fieldName) {
+        return null;
+      }
+      const dataSource = this.getDateLimitDataSource();
+      return dataSource ? dataSource[fieldName] : null;
+    },
+    parseDateLimitValue(val) {
+      if (val === null || val === undefined || val === "") {
+        return null;
+      }
+      const date = new Date(String(val).replace(/-/g, "/"));
+      return isNaN(date.getTime()) ? null : date.getTime();
+    },
+    normalizeDateLimitDayTime(time, isEnd) {
+      const date = new Date(time);
+      if (this.field.options.type === "datetime") {
+        return date.getTime();
+      }
+      date.setHours(isEnd ? 23 : 0, isEnd ? 59 : 0, isEnd ? 59 : 0, isEnd ? 999 : 0);
+      return date.getTime();
+    },
+    isDateLimitDisabled(time) {
+      const options = this.getDateLimitOptions();
+      const currentTime = time.getTime();
+
+      const minDate = this.parseDateLimitValue(options.minDate);
+      if (minDate !== null && currentTime < this.normalizeDateLimitDayTime(minDate, false)) {
+        return true;
+      }
+
+      const maxDate = this.parseDateLimitValue(options.maxDate);
+      if (maxDate !== null && currentTime > this.normalizeDateLimitDayTime(maxDate, true)) {
+        return true;
+      }
+
+      if (options.limitStartField) {
+        const startTime = this.parseDateLimitValue(
+          this.getDateLimitLinkedValue(options.limitStartField)
+        );
+        if (startTime !== null && currentTime < this.normalizeDateLimitDayTime(startTime, false)) {
+          return true;
+        }
+      }
+
+      if (options.limitEndField) {
+        const endTime = this.parseDateLimitValue(
+          this.getDateLimitLinkedValue(options.limitEndField)
+        );
+        if (endTime !== null && currentTime > this.normalizeDateLimitDayTime(endTime, true)) {
+          return true;
+        }
+      }
+
+      return false;
+    },
+    isDateLimitViolated(value) {
+      if (value === null || value === undefined || value === "") {
+        return false;
+      }
+      const currentTime = this.parseDateLimitValue(value);
+      if (currentTime === null) {
+        return false;
+      }
+
+      const options = this.getDateLimitOptions();
+      const minDate = this.parseDateLimitValue(options.minDate);
+      if (minDate !== null && currentTime < this.normalizeDateLimitDayTime(minDate, false)) {
+        return true;
+      }
+
+      const maxDate = this.parseDateLimitValue(options.maxDate);
+      if (maxDate !== null && currentTime > this.normalizeDateLimitDayTime(maxDate, true)) {
+        return true;
+      }
+
+      if (options.limitStartField) {
+        const startTime = this.parseDateLimitValue(
+          this.getDateLimitLinkedValue(options.limitStartField)
+        );
+        if (startTime !== null && currentTime < this.normalizeDateLimitDayTime(startTime, false)) {
+          return true;
+        }
+      }
+
+      if (options.limitEndField) {
+        const endTime = this.parseDateLimitValue(
+          this.getDateLimitLinkedValue(options.limitEndField)
+        );
+        if (endTime !== null && currentTime > this.normalizeDateLimitDayTime(endTime, true)) {
+          return true;
+        }
+      }
+
+      return false;
+    },
+    getDateLimitViolationMessage() {
+      const options = this.getDateLimitOptions();
+      if (options.limitEndField && !options.limitStartField) {
+        return "开始时间不能大于结束时间";
+      }
+      if (options.limitStartField && !options.limitEndField) {
+        return "结束时间不能小于开始时间";
+      }
+      return "日期超出允许范围";
+    },
+  },
+};

package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-bar-mixin.js

@@ -242,7 +242,8 @@ modules = {
       })
     },
     getColors(){
-      let colors = [...this.field.options.echarBarOption.colors, ...this.colors];
+      let chartColors = this.field.options.echarBarOption.colors || [];
+      let colors = [...chartColors, ...this.colors];
       return colors
     },
     adjustColor() {

package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-category-mixin.js

@@ -111,7 +111,8 @@ modules = {
 
   methods: {
     getColors() {
-      let colors = [...this.field.options.echarCategoryOption.colors, ...this.colors];
+      let chartColors = this.field.options.echarCategoryOption.colors || [];
+      let colors = [...chartColors, ...this.colors];
       return colors
     },
     adjustColor() {

package/src/components/xform/form-designer/form-widget/field-widget/mixins/utc-transform-mixin.js

@@ -0,0 +1,75 @@
+import { deepClone, isNilOrEmptyStr } from "../../../../utils/util";
+import fieldMixin from "../fieldMixin";
+
+export default {
+  methods: {
+    isUtcTransformEnabled() {
+      return !!this.field?.options?.utcTransformEnabled;
+    },
+    transformUtcToLocalValue(value) {
+      if (isNilOrEmptyStr(value) || !this.isUtcTransformEnabled()) {
+        return value;
+      }
+      if (Array.isArray(value)) {
+        return value.map((item) => this.transformUtcToLocalSingle(item));
+      }
+      return this.transformUtcToLocalSingle(value);
+    },
+    transformUtcToLocalSingle(value) {
+      if (isNilOrEmptyStr(value)) {
+        return value;
+      }
+      const localValue = this.$utcToLocal(value);
+      if (!localValue) {
+        return localValue;
+      }
+      const widgetType = this.field?.type;
+      const options = this.field?.options || {};
+      if (widgetType === "time") {
+        const parts = String(localValue).split(" ");
+        return parts.length > 1 ? parts[1] : localValue;
+      }
+      if (widgetType === "time-range") {
+        return localValue;
+      }
+      const dateType = options.type;
+      const valueFormat = options.valueFormat || "";
+      if (widgetType === "date" || widgetType === "date-range") {
+        if (
+          dateType === "datetime"
+          || (valueFormat && /[HhmSs]/.test(valueFormat))
+        ) {
+          return localValue;
+        }
+        return String(localValue).split(" ")[0];
+      }
+      return localValue;
+    },
+    getUtcTransformedFieldValue() {
+      if (!this.isUtcTransformEnabled()) {
+        return this.fieldModel;
+      }
+      return this.transformUtcToLocalValue(this.fieldModel);
+    },
+    initFieldModel(flag) {
+      fieldMixin.methods.initFieldModel.call(this, flag);
+      // flag=true 来自 initValueWatchEvent；行数据已是本地时间，再转换会重复偏移并触发 watch 死循环
+      if (this.designState || !this.isUtcTransformEnabled() || flag) {
+        return;
+      }
+      const transformed = this.getUtcTransformedFieldValue();
+      if (transformed === this.fieldModel) {
+        return;
+      }
+      const currentData =
+        this.tableParam && this.tableParam.row
+          ? this.tableParam.row
+          : this.formModel;
+      this.fieldModel = transformed;
+      this.oldFieldValue = deepClone(transformed);
+      if (transformed !== currentData[this.fieldKeyName]) {
+        this.syncUpdateFormModel(transformed);
+      }
+    },
+  },
+};

package/src/components/xform/form-designer/form-widget/field-widget/mixins/vabsearch-mixin.js

@@ -0,0 +1,179 @@
+import FormItemWrapper from '@base/components/xform/form-designer/form-widget/field-widget/form-item-wrapper'
+import emitter from '@base/components/xform/utils/emitter'
+import i18n from "@base/components/xform/utils/i18n";
+import {deepClone} from "@base/components/xform/utils/util";
+import fieldMixin from "@base/components/xform/form-designer/form-widget/field-widget/fieldMixin";
+
+export default {
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+
+    designState: {
+      type: Boolean,
+      default: false
+    },
+    columnConfig: {
+      type: Object,
+      default: null
+    },
+    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
+      type: Number,
+      default: -1
+    },
+    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
+      type: String,
+      default: ''
+    }
+  },
+  components: {
+    FormItemWrapper
+  },
+  data() {
+    let multipleChoices = this.field.options.multipleChoices || false;
+    let defaultValue = !multipleChoices ? null : [];
+    return {
+      oldFieldValue: defaultValue, //field组件change之前的值
+      fieldModel: defaultValue,
+      showValue2: null,
+      rules: [],
+      showSearchialog: false,
+      dialogContent: null,
+      showSysSearchialog: false,
+      systemDialogParam: {},
+      showVformDialog: false,
+      code: null,
+      formDialogOption: {}
+    }
+  },
+  watch: {
+    fieldModel(val) {
+      // this.handleChangeEvent(val);
+      let currentData = this.currentData;
+      let fieldKeyName = this.fieldKeyName;
+      currentData[fieldKeyName] = val;
+    },
+    showValue(val) {
+      this.setShowValue(val);
+    }
+  },
+  computed: {
+    showValue() {
+      let currentData = this.currentData;
+      let fieldKeyName = this.fieldKeyName;
+      let vabSearchName = this.field.options.vabSearchName;
+      let multipleChoices = this.field.options.multipleChoices || false;
+      let labelField = this.field.options.vabSearchName || fieldKeyName;
+      let value = null;
+      if (!multipleChoices) {
+        value = currentData[labelField] ?? null;
+      } else {
+        if (this.fieldModel) {
+          value = this.fieldModel.map(item => item[labelField]).join(",");
+        }
+      }
+      this.showValue2 = value;
+      return value
+    },
+    tableRow() {
+      let tableParam = this.tableParam;
+      return tableParam && tableParam.row ? tableParam.row : null;
+    },
+    currentData() {
+      let tableParam = this.tableParam;
+      return tableParam && tableParam.row ? tableParam.row : this.formModel;
+    }
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    if (this.field.options.readonly == undefined) {
+      this.$set(this.field.options, "readonly", true);
+    }
+    this.initFieldModel()
+    this.registerToRefList()
+    this.initEventHandler()
+    this.buildFieldRules()
+
+    this.handleOnCreated()
+    // this.initValue();
+  },
+
+  mounted() {
+    this.handleOnMounted()
+
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+  methods: {
+    setShowValue(val = null) {
+      let multipleChoices = this.field.options.multipleChoices || false;
+      if (!multipleChoices) {
+        let fieldKeyName = this.fieldKeyName;
+        let labelField = this.field.options.vabSearchName || fieldKeyName;
+        // this.$set(this.currentData, labelField, val)
+
+        this.currentData[labelField] = val
+        this.showValue2 = val;
+      }
+    },
+    setValue: function (e) {
+      if (this.field.formItemFlag) {
+        let data = this.tableRow || this.formModel;
+        var t = deepClone(this.fieldModel);
+        this.fieldModel = e,
+          this.initFileList(),
+          this.syncUpdateFormModel(e),
+          this.emitFieldDataChange(e, t);
+      }
+    },
+    clearHandle() {
+      let multipleChoices = this.field.options.multipleChoices || false;
+      let defaultValue = !multipleChoices ? null : [];
+      this.setShowValue(null)
+      this.setValue(defaultValue)
+      if (this.field.options.onSearchClear) {
+        let tableParam = this.tableParam;
+        let eventParamNames = [];
+        let eventParamValues = [];
+        if (tableParam) {
+          eventParamNames = ['rowData', 'rowIndex'];
+          eventParamValues = [tableParam.row, tableParam.rowIndex];
+        }
+        this.handleCustomEvent(this.field.options.onSearchClear, eventParamNames, eventParamValues)
+
+        /* var e = new Function(this.field.options.onSearchClear);
+         e.call(this);*/
+      }
+      this.handleClearSearchDialog();
+    },
+    changeShowValue2(val) {
+      if (this.field.options.readonly === false) {
+        let multipleChoices = this.field.options.multipleChoices || false;
+        if (!multipleChoices) {
+          let fieldKeyName = this.fieldKeyName;
+          let vabSearchName = this.field.options.vabSearchName;
+          let labelField = this.field.options.vabSearchName || fieldKeyName;
+          this.currentData[labelField] = val;
+        }
+      }
+    },
+    fieldModelLabel() {
+      return this.showValue;
+    },
+  }
+}

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

@@ -0,0 +1,53 @@
+<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">
+    <el-input
+      class="search-input"
+      max="200"
+      v-model="showValue2"
+      @clear="clearHandle"
+      v-el-readonly="field.options.readonly"
+      clearable
+      :disabled="field.options.disabled"
+      @change="changeShowValue2"
+    >
+      <i slot="suffix" class="el-input__icon el-icon-search" @click="emitAppendButtonClick"></i>
+      <span v-show="false">{{ showValue2 }}</span>
+    </el-input>
+  </form-item-wrapper>
+</template>
+
+<script>
+import mixins from "@base/components/xform/form-designer/form-widget/field-widget/mixins/vabsearch-mixin";
+
+export default {
+  name: "multiSearch-widget",
+  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [mixins],
+}
+</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>