cloud-web-corejs 1.0.281 → 1.1.0-dev.11

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

@@ -1,134 +1,134 @@
-<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-time-picker ref="fieldEditor" v-model="fieldModel" class="full-width-input"
-                    :disabled="field.options.disabled" :readonly="field.options.readonly"
-                    :size="field.options.size"
-                    :clearable="field.options.clearable" :editable="field.options.editable"
-                    :format="field.options.format" value-format="HH:mm:ss"
-                    :placeholder="getI18nLabel(field.options.placeholder || '选择时间')"
-                    :picker-options="pickerOptions"
-                    @focus="handleTimeFocusEvent" @blur="handleBlurCustomEvent"
-                    @change="handleTimeChangeEvent">
-    </el-time-picker>
-  </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";
-  import timeLimitMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/time-limit-mixin";
-  import utcTransformMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/utc-transform-mixin";
-  import relativeDefaultMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/relative-default-mixin";
-
-  export default {
-    name: "time-widget",
-    componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-    mixins: [emitter, fieldMixin, i18n, timeLimitMixin, utcTransformMixin, relativeDefaultMixin],
-    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'],
-    data() {
-      return {
-        oldFieldValue: null, //field组件change之前的值
-        fieldModel: null,
-        rules: [],
-        pickerOptions: {},
-      }
-    },
-    computed: {
-
-    },
-    watch: {
-      "field.options.minTime"() {
-        this.initTimeLimitPickerOptions()
-      },
-      "field.options.minTimeType"() {
-        this.initTimeLimitPickerOptions()
-      },
-    },
-    beforeCreate() {
-      /* 这里不能访问方法和属性！！ */
-    },
-
-    created() {
-      /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
-         需要在父组件created中初始化！！ */
-      this.initRelativeFieldModel()
-      this.registerToRefList()
-      this.initEventHandler()
-      this.buildFieldRules()
-
-      this.handleOnCreated()
-      this.initTimeLimitPickerOptions()
-    },
-
-    mounted() {
-      this.handleOnMounted()
-    },
-
-    beforeDestroy() {
-      this.unregisterFromRefList()
-    },
-
-    methods: {
-      handleTimeFocusEvent(event) {
-        /* 最小时间为「当前时间」时，每次展开面板都需按当前时刻重新计算 */
-        if (this.isNowTimeValueType(this.field.options.minTimeType)) {
-          this.initTimeLimitPickerOptions()
-        }
-        this.handleFocusCustomEvent(event)
-      },
-      handleTimeChangeEvent(value) {
-        if (this.isTimeLimitViolated(value)) {
-          this.$message.warning(this.getTimeLimitViolationMessage())
-          this.fieldModel = this.oldFieldValue
-          return
-        }
-        this.handleChangeEvent(value)
-      },
-      setNow() {
-        this.setValue(this.getNowTimeValue())
-      },
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
-
-  .full-width-input {
-    width: 100% !important;
-  }
-
-</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">
+    <el-time-picker ref="fieldEditor" v-model="fieldModel" class="full-width-input"
+                    :disabled="field.options.disabled" :readonly="field.options.readonly"
+                    :size="field.options.size"
+                    :clearable="field.options.clearable" :editable="field.options.editable"
+                    :format="field.options.format" value-format="HH:mm:ss"
+                    :placeholder="getI18nLabel(field.options.placeholder || '选择时间')"
+                    :picker-options="pickerOptions"
+                    @focus="handleTimeFocusEvent" @blur="handleBlurCustomEvent"
+                    @change="handleTimeChangeEvent">
+    </el-time-picker>
+  </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";
+  import timeLimitMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/time-limit-mixin";
+  import utcTransformMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/utc-transform-mixin";
+  import relativeDefaultMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/relative-default-mixin";
+
+  export default {
+    name: "time-widget",
+    componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+    mixins: [emitter, fieldMixin, i18n, timeLimitMixin, utcTransformMixin, relativeDefaultMixin],
+    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'],
+    data() {
+      return {
+        oldFieldValue: null, //field组件change之前的值
+        fieldModel: null,
+        rules: [],
+        pickerOptions: {},
+      }
+    },
+    computed: {
+
+    },
+    watch: {
+      "field.options.minTime"() {
+        this.initTimeLimitPickerOptions()
+      },
+      "field.options.minTimeType"() {
+        this.initTimeLimitPickerOptions()
+      },
+    },
+    beforeCreate() {
+      /* 这里不能访问方法和属性！！ */
+    },
+
+    created() {
+      /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+         需要在父组件created中初始化！！ */
+      this.initRelativeFieldModel()
+      this.registerToRefList()
+      this.initEventHandler()
+      this.buildFieldRules()
+
+      this.handleOnCreated()
+      this.initTimeLimitPickerOptions()
+    },
+
+    mounted() {
+      this.handleOnMounted()
+    },
+
+    beforeDestroy() {
+      this.unregisterFromRefList()
+    },
+
+    methods: {
+      handleTimeFocusEvent(event) {
+        /* 最小时间为「当前时间」时，每次展开面板都需按当前时刻重新计算 */
+        if (this.isNowTimeValueType(this.field.options.minTimeType)) {
+          this.initTimeLimitPickerOptions()
+        }
+        this.handleFocusCustomEvent(event)
+      },
+      handleTimeChangeEvent(value) {
+        if (this.isTimeLimitViolated(value)) {
+          this.$message.warning(this.getTimeLimitViolationMessage())
+          this.fieldModel = this.oldFieldValue
+          return
+        }
+        this.handleChangeEvent(value)
+      },
+      setNow() {
+        this.setValue(this.getNowTimeValue())
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+
+  .full-width-input {
+    width: 100% !important;
+  }
+
+</style>

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

@@ -26,13 +26,14 @@
       :file.sync="fieldModel"
       :hidePasteArea.sync="isH5"
       :uploadDialogCustomClass="isH5 ? 'dialog-upload-h5' : null"
+      :h5Preview="isH5"
       :pickPrivateProfile="false"
       :multi="field.options.limit !== 1"
       :limit="field.options.limit"
       :fileTypes="field.options.fileTypes || []"
       resultType="Array"
-      :edit="!field.options.disabled"
-      :remove="!field.options.hideRemoveButton"
+      :edit="!field.options.disabled && !isReadMode"
+      :remove="!field.options.hideRemoveButton && !isReadMode"
       @callback="submitFile"
       :hideInfo="field.options.hideFileInfo"
       :hideName="field.options.hideFileName"

package/src/components/xform/form-designer/indexMixin.js

@@ -93,6 +93,8 @@ modules = {
     readonly: Boolean,
     columnFlag: Boolean,
     sourceData: Object,
+    /* 进入设计器时的布局模式（模板自带 layoutType 时不覆盖）；传入即锁定，工具栏不允许再切换 */
+    defaultLayoutType: { type: String, default: "" },
   },
   data() {
     return {
@@ -147,6 +149,8 @@ modules = {
       serverFieldList: this.fieldList,
       getServerSubFormList: () => this.subFormList,
       getDesignerConfig: () => this.designerConfig,
+      /* 由表单模板等入口指定布局模式时，布局类型由模板类型决定，设计器内不可切换 */
+      getLayoutTypeLocked: () => !!this.defaultLayoutType,
       getBannedWidgets: () => this.bannedWidgets,
       saveReportTemplate: this.saveReportTemplate,
       getReportTemplate: () => this.reportTemplate,
@@ -345,23 +349,51 @@ modules = {
       baseRefUtil.changeLocale(langName);
     },
 
+    /**
+     * 应用入口指定的布局模式：模板 JSON 自带 layoutType 时以模板为准，不覆盖
+     */
+    applyDefaultLayoutType(loadedFormJson) {
+      if (!this.defaultLayoutType) {
+        return;
+      }
+      if (loadedFormJson && loadedFormJson.formConfig?.layoutType) {
+        return;
+      }
+      this.designer.changeLayoutType(this.defaultLayoutType);
+    },
+
     setFormJson(formJson) {
       let modifiedFlag = false;
+      let loadedFormJson = null;
       if (!!formJson) {
         if (typeof formJson === "string") {
           let newFormJson = JSON.parse(formJson);
           this.upgradeFormJson(newFormJson);
+          loadedFormJson = newFormJson;
           modifiedFlag = this.designer.loadFormJson(newFormJson);
         } else if (formJson.constructor === Object) {
           this.upgradeFormJson(formJson);
+          loadedFormJson = formJson;
           modifiedFlag = this.designer.loadFormJson(formJson);
         }
 
         if (modifiedFlag) {
           this.designer.emitHistoryChange();
         }
+
+        this.applyDefaultLayoutType(loadedFormJson);
+        /* 模板 JSON 里的 layoutType 此刻才写入；左侧面板 mounted 时仍是默认 PC，
+           必须再筛一次，否则进入 H5 模板时仍展示 PC 容器（data-table/detail 等） */
+        this.$nextTick(() => {
+          this.loadWidgets();
+        });
       } else {
+        /* 新建模板 formViewContent 为空会走这里，同样要落入口默认布局 */
         this.clearDesigner();
+        this.applyDefaultLayoutType(null);
+        this.$nextTick(() => {
+          this.loadWidgets();
+        });
       }
     },
 
@@ -826,7 +858,9 @@ modules = {
       });
     },
     loadWidgets() {
-      this.$refs.widgetPanelRef.loadWidgets();
+      if (this.$refs.widgetPanelRef) {
+        this.$refs.widgetPanelRef.loadWidgets();
+      }
     },
     getBdEnv() {
       getBdFlag({

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -374,7 +374,7 @@
           </el-form-item>
           <el-form-item
             v-if="formConfig.multiTabEnabled"
-            :label="i18nt('新增打开页签')"
+            :label="i18nt('新增打开页签')"
             class="el-form-item-second"
           >
             <el-switch v-model="formConfig.addTabEnabled"></el-switch>
@@ -480,7 +480,7 @@
         <el-collapse-item
           v-if="showEventCollapse()"
           name="7"
-          :title="i18nt('designer.setting.eventSetting')"
+          :title="i18nt('designer.setting.eventSetting')"
           class="form-item-label-red"
         >
           <!--          <el-form-item label="onBeforeCreated" label-width="150px">
@@ -1714,23 +1714,23 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
 
 <style lang="scss" scoped>
 .setting-form {
-  ::v-deep .el-form-item{
-    .el-form-item__label {
-      font-size: 13px;
-      //text-overflow: ellipsis;
-      overflow: hidden;
-      white-space: nowrap;
-    }
-    &.el-form-item--mini.el-form-item {
-      margin-bottom: 6px;
-    }
-    &.el-form-item-second{
-      .el-form-item__label{
-        padding-left:4px;
-        &:before{content:"";width:5px;height:2px;background:#FF4D4F;display:inline-block;margin-right:4px;}
-        span{flex:1}
-      }
-    }
+  ::v-deep .el-form-item{
+    .el-form-item__label {
+      font-size: 13px;
+      //text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    }
+    &.el-form-item--mini.el-form-item {
+      margin-bottom: 6px;
+    }
+    &.el-form-item-second{
+      .el-form-item__label{
+        padding-left:4px;
+        &:before{content:"";width:5px;height:2px;background:#FF4D4F;display:inline-block;margin-right:4px;}
+        span{flex:1}
+      }
+    }
   }
 
   .radio-group-custom {
@@ -1757,29 +1757,29 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
 
 /* 折叠组内部的二级分组标题，用于把长配置组切成几段（如「流程信息」） */
 ::v-deep .wf-group-title {
-  margin: 16px 0 8px;
-  padding-left: 8px;
-  //border-left: 3px solid #0073E5;
-  color: rgba(0,0,0,.65);
-  font-size: 13px;
-  font-weight: 600;
-  line-height: 1.3;
-  background: rgba(0,0,0,0.04);
+  margin: 16px 0 8px;
+  padding-left: 8px;
+  //border-left: 3px solid #0073E5;
+  color: rgba(0,0,0,.65);
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 1.3;
+  background: rgba(0,0,0,0.04);
   padding: 4px 0 4px 8px;
   &:first-child {
     margin-top: 0;
-  }
-  ~ .el-form-item{
-    .el-form-item__label{
-      padding-left:4px;
-      &:before{content:"";width:5px;height:2px;background:#0073e5;display:inline-block;margin-right:4px;}
-      span{flex:1}
-    }
-    &.form-item-label-red{
-      .el-form-item__label:before{
-        background:#FF4D4F
-      }
-    }
+  }
+  ~ .el-form-item{
+    .el-form-item__label{
+      padding-left:4px;
+      &:before{content:"";width:5px;height:2px;background:#0073e5;display:inline-block;margin-right:4px;}
+      span{flex:1}
+    }
+    &.form-item-label-red{
+      .el-form-item__label:before{
+        background:#FF4D4F
+      }
+    }
   }
 }
 

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue

@@ -320,7 +320,7 @@
     <el-form-item :label="i18nt('明细导出脚本编码')" class="form-item-label-top">
       <el-input v-model="optionModel.exportItemScriptCode"></el-input>
     </el-form-item>
-    <el-form-item label="自定义明细导出参数">
+    <el-form-item label="明细导出查询参数">
       <a
         href="javascript:void(0);"
         class="a-link link-oneLind"
@@ -1107,15 +1107,15 @@ export default {
 </style>
 
 <style scoped>
-.form-section-label {
-  margin: 16px 0 8px;
-  padding-left: 8px;
-  color: rgba(0, 0, 0, 0.65);
-  font-size: 13px;
-  font-weight: 600;
-  line-height: 1.3;
-  background: rgba(0, 0, 0, 0.04);
-  padding: 4px 0 4px 8px;
+.form-section-label {
+  margin: 16px 0 8px;
+  padding-left: 8px;
+  color: rgba(0, 0, 0, 0.65);
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 1.3;
+  background: rgba(0, 0, 0, 0.04);
+  padding: 4px 0 4px 8px;
 }
 
 .label-tip-icon {