cloud-web-corejs 1.0.54-dev.790 → 1.0.54-dev.791

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.790",
+  "version": "1.0.54-dev.791",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

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

@@ -203,6 +203,7 @@ let chartContainers = [],
           "vf-box": "widgetList",
           card: "widgetList",
           detail: "panes",
+          "detail-plain": "panes",
           "detail-pane": "widgetList",
           "detail-h5": "panes",
           "h5-card": "panes",
@@ -1404,19 +1405,22 @@ let chartContainers = [],
             newCon.options.name +
             "').openEditDialog();";
           newCon.buttons.push(add_button);
-        } else if (newCon.type === "detail") {
-          let buttonCon1 = this.copyNewFieldWidget(
-            this.getFieldWidgetByType("reset_button")
-          );
-          // buttonCon1.options.label = "重置";
+        } else if (newCon.type === "detail" || newCon.type === "detail-plain") {
+          /* detail-plain 无标题栏,不预置标题栏按钮;其余 panes 结构与 detail 一致 */
+          if (newCon.type === "detail") {
+            let buttonCon1 = this.copyNewFieldWidget(
+              this.getFieldWidgetByType("reset_button")
+            );
+            // buttonCon1.options.label = "重置";
 
-          let buttonCon2 = this.copyNewFieldWidget(
-            this.getFieldWidgetByType("save_button")
-          );
-          buttonCon2.options.label = "保存";
+            let buttonCon2 = this.copyNewFieldWidget(
+              this.getFieldWidgetByType("save_button")
+            );
+            buttonCon2.options.label = "保存";
 
-          newCon.widgetList.push(buttonCon1);
-          newCon.widgetList.push(buttonCon2);
+            newCon.widgetList.push(buttonCon1);
+            newCon.widgetList.push(buttonCon2);
+          }
 
           let newCol = baseRefUtil.deepClone(
             this.getContainerByType("detail-pane")

package/src/components/xform/form-designer/form-widget/container-widget/detail-plain-widget.vue

@@ -0,0 +1,76 @@
+<!--
+/**
+ * 简洁详情模块(detail-plain)设计态：无标题栏、无按钮拖放区，仅 panes(详情tab)。
+ */
+-->
+
+<template>
+  <container-wrapper :designer="designer" :widget="widget" :parent-widget="parentWidget" :parent-list="parentList"
+                     :index-of-parent-list="indexOfParentList" :class="widget.options.isFullscreen ? 'full-height':''">
+    <div class="detail-wrap grid-container" :key="widget.id"
+         :class="{'selected': selected}" @click.stop="selectWidget(widget)">
+      <baseTabs style="height: auto;" :showNav="!widget.options.hideNav">
+        <detail-pane-widget v-for="(paneWidget, index) in widget.panes" :key="index" :widget="paneWidget"
+                            :designer="designer" :parent-list="widget.panes"
+                            :index-of-parent-list="index" :parent-widget="widget"
+                            :col-height="widget.options.colHeight" tabRef="baseTabRef"
+                            :tabPaneGrade="2"></detail-pane-widget>
+      </baseTabs>
+    </div>
+  </container-wrapper>
+</template>
+
+<script>
+  import i18n from "../../../../../components/xform/utils/i18n"
+  import detailPaneWidget from "../../../../../components/xform/form-designer/form-widget/container-widget/detail-pane-widget"
+  import containerMixin from "../../../../../components/xform/form-designer/form-widget/container-widget/containerMixin"
+  import ContainerWrapper from "../../../../../components/xform/form-designer/form-widget/container-widget/container-wrapper"
+  import refMixinDesign from "../../../../../components/xform/form-designer/refMixinDesign"
+  import FieldComponents from "../../../../../components/xform/form-designer/form-widget/field-widget";
+
+  export default {
+    name: "detail-plain-widget",
+    componentName: 'ContainerWidget',
+    mixins: [i18n, containerMixin, refMixinDesign],
+    inject: ['refList'],
+    components: {
+      ContainerWrapper,
+      detailPaneWidget,
+      ...FieldComponents,
+    },
+    props: {
+      widget: Object,
+      parentWidget: Object,
+      parentList: Array,
+      indexOfParentList: Number,
+      designer: Object,
+    },
+    computed: {
+      selected() {
+        return this.widget.id === this.designer.selectedId
+      },
+
+      customClass() {
+        return this.widget.options.customClass || ''
+      },
+    },
+    created() {
+      this.initRefList()
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+  .grid-container {
+    min-height: 50px;
+    outline: 1px dashed #336699;
+    > div{height:100%;}
+    .form-widget-list {
+      height: 100%;
+    }
+  }
+
+  .grid-container.selected, .grid-cell.selected {
+    outline: 2px solid $--color-primary !important;
+  }
+</style>

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

@@ -0,0 +1,92 @@
+/* 时间组件的最小时间、默认值支持配置为「当前时间」，此处统一解析 */
+export const TIME_VALUE_TYPE_NOW = "now";
+
+const MAX_TIME_VALUE = "23:59:59";
+
+export default {
+  methods: {
+    getTimeLimitOptions() {
+      return this.field.options || {};
+    },
+    isNowTimeValueType(valueType) {
+      return valueType === TIME_VALUE_TYPE_NOW;
+    },
+    getNowTimeValue() {
+      const now = new Date();
+      const pad = (val) => (val < 10 ? "0" + val : String(val));
+      return `${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(
+        now.getSeconds()
+      )}`;
+    },
+    normalizeTimeValue(val) {
+      if (val === null || val === undefined || val === "") {
+        return null;
+      }
+      const matched = /^(\d{1,2}):(\d{1,2})(?::(\d{1,2}))?$/.exec(String(val).trim());
+      if (!matched) {
+        return null;
+      }
+      const hour = Number(matched[1]);
+      const minute = Number(matched[2]);
+      const second = Number(matched[3] || 0);
+      if (hour > 23 || minute > 59 || second > 59) {
+        return null;
+      }
+      const pad = (v) => (v < 10 ? "0" + v : String(v));
+      return `${pad(hour)}:${pad(minute)}:${pad(second)}`;
+    },
+    parseTimeLimitValue(val) {
+      const normalized = this.normalizeTimeValue(val);
+      if (normalized === null) {
+        return null;
+      }
+      const parts = normalized.split(":");
+      return Number(parts[0]) * 3600 + Number(parts[1]) * 60 + Number(parts[2]);
+    },
+    /* 最小时间：固定时间或当前时间 */
+    getTimeLimitMinValue() {
+      const options = this.getTimeLimitOptions();
+      if (this.isNowTimeValueType(options.minTimeType)) {
+        return this.getNowTimeValue();
+      }
+      return this.normalizeTimeValue(options.minTime);
+    },
+    initTimeLimitPickerOptions() {
+      const pickerOptions = { ...(this.pickerOptions || {}) };
+      const minTime = this.getTimeLimitMinValue();
+      if (minTime === null) {
+        delete pickerOptions.selectableRange;
+      } else {
+        pickerOptions.selectableRange = `${minTime} - ${MAX_TIME_VALUE}`;
+      }
+      this.pickerOptions = pickerOptions;
+    },
+    isTimeLimitViolated(value) {
+      const currentTime = this.parseTimeLimitValue(value);
+      if (currentTime === null) {
+        return false;
+      }
+      const minTime = this.parseTimeLimitValue(this.getTimeLimitMinValue());
+      return minTime !== null && currentTime < minTime;
+    },
+    getTimeLimitViolationMessage() {
+      return `时间不能小于${this.getTimeLimitMinValue()}`;
+    },
+    /* 默认值配置为「当前时间」时，临时替换 defaultValue 后再走通用的取值逻辑 */
+    initTimeFieldModel() {
+      const options = this.getTimeLimitOptions();
+      if (!this.isNowTimeValueType(options.defaultValueType)) {
+        this.initFieldModel();
+        return;
+      }
+
+      const rawDefaultValue = options.defaultValue;
+      options.defaultValue = this.getNowTimeValue();
+      try {
+        this.initFieldModel();
+      } finally {
+        options.defaultValue = rawDefaultValue;
+      }
+    },
+  },
+};

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

@@ -8,8 +8,9 @@
                     :clearable="field.options.clearable" :editable="field.options.editable"
                     :format="field.options.format" value-format="HH:mm:ss"
                     :placeholder="getI18nLabel(field.options.placeholder || '选择时间')"
-                    @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
-                    @change="handleChangeEvent">
+                    :picker-options="pickerOptions"
+                    @focus="handleTimeFocusEvent" @blur="handleBlurCustomEvent"
+                    @change="handleTimeChangeEvent">
     </el-time-picker>
   </form-item-wrapper>
 </template>
@@ -19,12 +20,13 @@
   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";
 
   export default {
     name: "time-widget",
     componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-    mixins: [emitter, fieldMixin, i18n, utcTransformMixin],
+    mixins: [emitter, fieldMixin, i18n, timeLimitMixin, utcTransformMixin],
     props: {
       field: Object,
       parentWidget: Object,
@@ -60,10 +62,19 @@
         oldFieldValue: null, //field组件change之前的值
         fieldModel: null,
         rules: [],
+        pickerOptions: {},
       }
     },
     computed: {
 
+    },
+    watch: {
+      "field.options.minTime"() {
+        this.initTimeLimitPickerOptions()
+      },
+      "field.options.minTimeType"() {
+        this.initTimeLimitPickerOptions()
+      },
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */
@@ -72,12 +83,13 @@
     created() {
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
-      this.initFieldModel()
+      this.initTimeFieldModel()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()
 
       this.handleOnCreated()
+      this.initTimeLimitPickerOptions()
     },
 
     mounted() {
@@ -89,7 +101,34 @@
     },
 
     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())
+      },
+      refreshDefaultValue() {
+        if (this.designState !== true) {
+          return
+        }
+        if (this.isNowTimeValueType(this.field.options.defaultValueType)) {
+          this.fieldModel = this.getNowTimeValue()
+        } else if (this.field.options.defaultValue !== undefined) {
+          this.fieldModel = this.field.options.defaultValue
+        }
+      },
     }
   }
 </script>

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

@@ -133,6 +133,7 @@ modules = {
         "vf-box": "widgetList",
         card: "widgetList",
         detail: "panes",
+        "detail-plain": "panes",
         "detail-pane": "widgetList",
         "detail-h5": "panes",
         "h5-card": "panes",

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

@@ -410,6 +410,7 @@ export default {
         "vf-box": "区块",
         panel: "面板",
         detail: "单据详情",
+        "detail-plain": "单据详情(简洁)",
         "detail-pane": "详情面板",
         "detail-h5": "H5详情",
         "h5-card": "H5卡片",

package/src/components/xform/form-designer/setting-panel/property-editor/container-detail-plain/detail-plain-editor.vue

@@ -0,0 +1,75 @@
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider">{{ i18nt('designer.setting.columnSetting') }}</el-divider>
+    </el-form-item>
+    <el-form-item :label="i18nt('隐藏导航')">
+      <el-switch v-model="optionModel.hideNav"></el-switch>
+      <span style="margin-left: 8px; color: #999; font-size: 12px">
+        简洁详情默认隐藏模块导航
+      </span>
+    </el-form-item>
+    <el-form-item :label="i18nt('designer.setting.colsOfGrid')"></el-form-item>
+    <el-form-item label-width="0">
+      <draggable tag="ul" class="draggable-box" :list="selectedWidget.panes"
+                 v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }">
+        <li v-for="(colItem, colIdx) in selectedWidget.panes" :key="colIdx" class="col-item">
+          <i class="el-icon-s-operation drag-option"></i>
+          <el-input v-model="colItem.options.label" class="cell-span-input"></el-input>
+          <el-button circle plain size="mini" type="danger" @click="deleteCol(selectedWidget, colIdx)"
+                     icon="el-icon-minus" class="col-delete-button" style="position: unset;"></el-button>
+        </li>
+      </draggable>
+      <div>
+        <el-button type="text" @click="addNewCol(selectedWidget)" icon="el-icon-circle-plus-outline" class="add-option">
+          {{ i18nt('designer.setting.addColumn') }}
+        </el-button>
+      </div>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import Draggable from 'vuedraggable';
+import i18n from "../../../../../../components/xform/utils/i18n"
+
+export default {
+  name: "detail-plain-editor",
+  mixins: [i18n],
+  components: {
+    Draggable,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  methods: {
+    deleteCol(curGrid, colIdx) {
+      this.designer.deletePaneOfDetail(curGrid, colIdx)
+      this.designer.emitHistoryChange()
+    },
+
+    addNewCol(curGrid) {
+      this.designer.addNewPaneOfDetail(curGrid)
+      this.designer.emitHistoryChange()
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+li.col-item {
+  list-style: none;
+
+  span.col-span-title {
+    display: inline-block;
+    font-size: 13px;
+    width: 120px;
+  }
+
+  .col-delete-button {
+    margin-left: 6px;
+  }
+}
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-time/time-defaultValue-editor.vue

@@ -1,7 +1,13 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.defaultValue')">
-    <el-time-picker v-model="optionModel.defaultValue" @change="emitDefaultValueChange"
-                    :format="optionModel.format" value-format="HH:mm:ss" style="width: 100%">
+    <el-radio-group v-model="defaultValueType" size="mini">
+      <el-radio-button label="">固定时间</el-radio-button>
+      <el-radio-button label="now">当前时间</el-radio-button>
+    </el-radio-group>
+    <el-time-picker v-if="defaultValueType !== 'now'" v-model="optionModel.defaultValue"
+                    @change="emitDefaultValueChange"
+                    :format="optionModel.format" value-format="HH:mm:ss"
+                    style="width: 100%; margin-top: 5px">
     </el-time-picker>
   </el-form-item>
 </template>
@@ -18,6 +24,21 @@
       selectedWidget: Object,
       optionModel: Object,
     },
+    computed: {
+      /* 老表单的options可能没有defaultValueType属性，用$set赋值保证响应式 */
+      defaultValueType: {
+        get() {
+          return this.optionModel.defaultValueType || ''
+        },
+        set(value) {
+          this.$set(this.optionModel, 'defaultValueType', value)
+          if (value === 'now') {
+            this.$set(this.optionModel, 'defaultValue', null)
+          }
+          this.emitDefaultValueChange()
+        },
+      },
+    },
   }
 </script>
 

package/src/components/xform/form-designer/setting-panel/property-editor/field-time/time-timeLimit-editor.vue

@@ -0,0 +1,56 @@
+<template>
+  <div>
+    <el-form-item label="最小时间">
+      <el-radio-group v-model="minTimeType" size="mini">
+        <el-radio-button label="">固定时间</el-radio-button>
+        <el-radio-button label="now">当前时间</el-radio-button>
+      </el-radio-group>
+      <el-time-picker v-if="minTimeType !== 'now'" v-model="minTime"
+                      :format="optionModel.format" value-format="HH:mm:ss"
+                      style="width: 100%; margin-top: 5px"
+                      clearable placeholder="留空则不限制">
+      </el-time-picker>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+  import i18n from "../../../../../../components/xform/utils/i18n"
+  import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+
+  export default {
+    name: "time-timeLimit-editor",
+    mixins: [i18n, propertyMixin],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+    computed: {
+      /* 老表单的options可能没有这些属性，统一用$set赋值，保证响应式 */
+      minTimeType: {
+        get() {
+          return this.optionModel.minTimeType || ''
+        },
+        set(value) {
+          this.$set(this.optionModel, 'minTimeType', value)
+          if (value === 'now') {
+            this.$set(this.optionModel, 'minTime', null)
+          }
+        },
+      },
+      minTime: {
+        get() {
+          return this.optionModel.minTime || null
+        },
+        set(value) {
+          this.$set(this.optionModel, 'minTime', value || null)
+        },
+      },
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -44,6 +44,7 @@ const COMMON_PROPERTIES = {
   format: "format-editor",
   valueFormat: "valueFormat-editor",
   dateLimit: "dateLimit-editor",
+  timeLimit: "timeLimit-editor",
   utcTransformEnabled: "utcTransformEnabled-editor",
   defaultTime: "defaultTime-editor",
   filterable: "filterable-editor",
@@ -106,6 +107,7 @@ const COMMON_PROPERTIES = {
   pull: "pull-editor",
   height: "height-editor",
   detailContainer: "detail-editor",
+  detailPlainContainer: "detail-plain-editor",
   detailPaneContainer: "detail-pane-editor",
   vabSearchField: "vabSearchField-editor",
   fullWidth: "table-fullWidth-editor",

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -453,6 +453,27 @@ export const containers = [
       onMounted: "",
     },
   },
+  {
+    /* 简洁详情：与 detail 同构，去标题栏(标题/按钮区)，模块导航默认关闭 */
+    type: "detail-plain",
+    category: "container",
+    icon: "form",
+    commonFlag: !0,
+    layoutType: "PC",
+    panes: [],
+    widgetList: [],
+    options: {
+      name: "",
+      hidden: !1,
+      label: "单据详情",
+      detailPlainContainer: true,
+      hideNav: true,
+      // colHeight: null,
+      customClass: "",
+      onCreated: "",
+      onMounted: "",
+    },
+  },
   {
     type: "detail-pane",
     category: "container",
@@ -1601,6 +1622,7 @@ export const basicFields = [
       formField: "",
       labelAlign: "",
       defaultValue: null,
+      defaultValueType: "", //默认值类型：空为固定时间，now为当前时间
       placeholder: "",
       columnWidth: "200px",
       size: "",
@@ -1612,6 +1634,9 @@ export const basicFields = [
       clearable: !0,
       editable: !0,
       format: "HH:mm:ss",
+      timeLimit: null,
+      minTime: null,
+      minTimeType: "", //最小时间类型：空为固定时间，now为当前时间
       utcTransformEnabled: !1,
       required: !1,
       requiredHint: "",
@@ -4437,6 +4462,7 @@ export const widgetPanelOrder = {
     "data-table",
     "table-column",
     "detail",
+    "detail-plain",
     "detail-pane",
     "tree-pane",
     "tree",

package/src/components/xform/form-render/container-item/detail-plain-item.vue

@@ -0,0 +1,92 @@
+<!--
+/**
+ * 简洁详情模块(detail-plain)：与 detail 同构，但不渲染标题栏(标题/翻单/流程/按钮控件)，
+ * 模块导航默认关闭。仅保留 panes(详情tab)内容区。
+ */
+-->
+
+<template>
+  <container-item-wrapper :widget="widget">
+    <div
+      class="detail-wrap grid-container"
+      :class="[customClass]"
+      :ref="widget.id"
+    >
+      <baseTabs :showNav="!widget.options.hideNav && !plainMode">
+        <detail-pane-widget
+          v-for="(paneWidget, index) in widget.panes"
+          :key="index"
+          :widget="paneWidget"
+          :parent-list="widget.panes"
+          :index-of-parent-list="index"
+          :parent-widget="widget"
+          :col-height="widget.options.colHeight"
+          tabRef="baseTabRef"
+          :tabPaneGrade="2"
+        ></detail-pane-widget>
+      </baseTabs>
+    </div>
+  </container-item-wrapper>
+</template>
+
+<script>
+import emitter from "../../../../components/xform/utils/emitter";
+import i18n from "../../../../components/xform/utils/i18n";
+import refMixin from "../../../../components/xform/form-render/refMixin";
+import ContainerItemWrapper from "./container-item-wrapper";
+import containerItemMixin from "./containerItemMixin";
+import detailPaneWidget from "../../../../components/xform/form-render/container-item/detail-pane-item";
+import FieldComponents from "../../../../components/xform/form-designer/form-widget/field-widget/index";
+
+export default {
+  name: "detail-plain-item",
+  componentName: "ContainerItem",
+  mixins: [emitter, i18n, refMixin, containerItemMixin],
+  components: {
+    ContainerItemWrapper,
+    detailPaneWidget,
+    ...FieldComponents,
+  },
+  props: {
+    widget: Object,
+  },
+  inject: ["refList", "sfRefList", "globalModel", "previewState"],
+  created() {
+    this.initRefList();
+    this.handleOnCreated();
+  },
+  mounted() {
+    this.handleOnMounted();
+  },
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+  computed: {
+    // 素身详情模式（宿主 VFormRender 传 plainDetailMode）：强制关闭模块导航
+    plainMode() {
+      let formRef = this.getFormRef && this.getFormRef();
+      return !!(formRef && formRef.plainDetailMode);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.grid-container {
+  min-height: 50px;
+  outline: 1px dashed #336699;
+
+  > div {
+    height: 100%;
+  }
+
+  .form-widget-list {
+    height: 100%;
+  }
+}
+
+.grid-container.selected,
+.grid-cell.selected {
+  outline: 2px solid $--color-primary !important;
+}
+</style>

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

@@ -1660,7 +1660,7 @@ modules = {
                   t.buildDataFromWidget(e);
                 });
             });
-        else if ("detail" === e.type)
+        else if ("detail" === e.type || "detail-plain" === e.type)
           e.panes &&
             e.panes.length > 0 &&
             e.panes.forEach(function (e) {
@@ -3601,6 +3601,7 @@ modules = {
         "vf-box": "widgetList",
         card: "widgetList",
         detail: "panes",
+        "detail-plain": "panes",
         "detail-pane": "widgetList",
         "detail-h5": "panes",
         "h5-card": "panes",
@@ -3787,6 +3788,7 @@ modules = {
         "vf-box": "widgetList",
         card: "widgetList",
         detail: "panes",
+        "detail-plain": "panes",
         "detail-pane": "widgetList",
         "detail-h5": "panes",
         "h5-card": "panes",

package/src/components/xform/lang/zh-CN.js

@@ -92,6 +92,7 @@ export default {
       panel: "面板",
       query: "查询模块",
       detail: "详情模块",
+      "detail-plain": "详情模块(简洁)",
       "detail-pane": "详情tab",
       "detail-h5": "H5详情",
       "list-h5": "H5列表",

package/src/components/xform/utils/util.js

@@ -1554,7 +1554,7 @@ function loopHandleWidgetItem(e, p, callback) {
               loopHandleWidgetItem(childItem, e, callback);
             });
         });
-    } else if ("detail" === e.type) {
+    } else if ("detail" === e.type || "detail-plain" === e.type) {
       if (e.panes) {
         e.panes.forEach(function (childItem) {
           loopHandleWidgetItem(childItem, e, callback);

package/src/index.js

@@ -189,13 +189,16 @@ Vue.component("advancedSearchDialog", () =>
   import("@base/components/advancedSearchDialog/index.vue")
 );
 
-Vue.component("baseTabs", () =>
-  import("@base/components/baseTabs/index.vue")
-);
-
-Vue.component("baseTabPane", () =>
-  import("@base/components/baseTabs/baseTabPane.vue")
-);
+// baseTabs/baseTabPane 必须同步注册，不可懒注册：
+// xform 详情容器(detail-item)把所有 detail-pane 及其内部字段组件放在 <baseTabs> 的默认插槽里。
+// 异步组件未解析时 Vue 只渲染占位注释节点，插槽内的组件不会被实例化，
+// 于是 detail-item 的 mounted 早于内部字段组件的 created(registerToRefList)执行，
+// 模板脚本 onMounted 里的 getWidgetRef('xxx') 首次进入必然拿到 undefined（二次进入因异步工厂已缓存而正常）。
+import baseTabs from "@base/components/baseTabs/index.vue";
+import baseTabPane from "@base/components/baseTabs/baseTabPane.vue";
+
+Vue.component(baseTabs.name, baseTabs);
+Vue.component(baseTabPane.name, baseTabPane);
 
 import vb_tabs from "@base/components/vb-tabs/index.vue";
 import vb_tab_pane from "@base/components/vb-tabs/tab-pane.vue";

package/src/views/bd/setting/formVersion/button.vue

@@ -13,6 +13,7 @@
       :objType="objType"
       :objCode="objCode"
       :relationCode="relationCode"
+      :sid="sid"
       @reverCallback="reverCallback"
     />
   </el-button>
@@ -33,6 +34,10 @@ export default {
       type: String,
       default: null,
     },
+    sid: {
+      type: String,
+      default: null,
+    },
   },
   components: {
     ftHistoryDialog: () =>

package/src/views/bd/setting/formVersion/ftHistoryDialog.vue

@@ -199,7 +199,7 @@ import { selectDialogMixins } from "@base/mixins/selectDialog";
 
 export default {
   name: "ftHistoryDialog",
-  props: ["visiable", "objType", "objCode", "relationCode"],
+  props: ["visiable", "objType", "objCode", "relationCode", "sid"],
   mixins: [selectDialogMixins],
   components: {
     formDesignerDialog: () =>
@@ -326,8 +326,7 @@ export default {
           return {
             ...this.formData,
             objType: this.objType,
-            objCode: this.objCode,
-            relationCode: this.relationCode,
+            sid: this.sid,
           };
         },
         columns: [
@@ -373,6 +372,16 @@ export default {
             field: "modifyDate",
             width: 150,
           },
+          {
+            title: this.$t1("导入发布人"),
+            field: "importBy",
+            width: 150,
+          },
+          {
+            title: this.$t1("导入发布时间"),
+            field: "importDate",
+            width: 150,
+          },
           {
             width: 90,
             fixed: "right",
@@ -478,13 +487,13 @@ export default {
   },
 };
 </script>
-<style scoped lang="scss">
-  .designer-drawer{
-    left:0;top:50px;
-  }
-  ::v-deep .dialog-style.list-dialog{
-    .designer-drawer .el-drawer__body .designer-box{
-      height:100%
-    }
-  }
+<style scoped lang="scss">
+  .designer-drawer{
+    left:0;top:50px;
+  }
+  ::v-deep .dialog-style.list-dialog{
+    .designer-drawer .el-drawer__body .designer-box{
+      height:100%
+    }
+  }
 </style>

package/src/views/bd/setting/formVersion/link.vue

@@ -14,6 +14,7 @@
           :objType="objType"
           :objCode="objCode"
           :relationCode="relationCode"
+          :sid="sid"
           @reverCallback="reverCallback"
         />
       </i>
@@ -36,6 +37,10 @@ export default {
       type: String,
       default: null,
     },
+    sid: {
+      type: String,
+      default: null,
+    },
   },
   components: {
     ftHistoryDialog: () =>

package/src/views/bd/setting/form_script/edit.vue

@@ -13,6 +13,7 @@
               objType="FormScript"
               :objCode="formScript.scriptCode"
               :relationCode="formScript.formCode"
+              :sid="formScript.sid"
               @reverCallback="$baseReload()"
             ></formVersionButton>
             <reverButton

package/src/views/bd/setting/form_script/edit1.vue

@@ -12,6 +12,7 @@
             objType="FormScript"
             :objCode="formScript.scriptCode"
             :relationCode="formScript.formCode"
+            :sid="formScript.sid"
             @reverCallback="$baseReload()"
           ></formVersionButton>
           <reverButton

package/src/views/bd/setting/form_script/form_list.vue

@@ -122,6 +122,7 @@
                 objType="FormScript"
                 :objCode="row.scriptCode"
                 :relationCode="row.formCode"
+                :sid="row.sid"
                 @reverCallback="searchEvent"
               ></formVersionButton>
             </template>

package/src/views/bd/setting/form_script/list.vue

@@ -76,6 +76,7 @@
                 objType="FormScript"
                 :objCode="row.scriptCode"
                 :relationCode="row.formCode"
+                :sid="row.sid"
                 @reverCallback="searchEvent"
               ></formVersionButton>
               <a

package/src/views/bd/setting/form_script/list1.vue

@@ -144,6 +144,7 @@
                   objType="FormScript"
                   :objCode="row.scriptCode"
                   :relationCode="row.formCode"
+                  :sid="row.sid"
                   @reverCallback="searchEvent"
                 ></formVersionButton>
                 <a

package/src/views/bd/setting/form_template/edit.vue

@@ -11,6 +11,7 @@
             v-if="!hData && formTemplate.id && !readonly"
             objType="FormTemplate"
             :objCode="formTemplate.formCode"
+            :sid="formTemplate.sid"
             @reverCallback="$baseReload()"
           ></formVersionButton>
           <reverButton

package/src/views/bd/setting/form_template/list.vue

@@ -159,6 +159,7 @@
                 <formVersionButton
                   objType="FormTemplate"
                   :objCode="row.formCode"
+                  :sid="row.sid"
                   @reverCallback="searchEvent"
                 ></formVersionButton>
                 <a

package/src/views/bd/setting/table_model/edit.vue

@@ -11,6 +11,7 @@
             v-if="!hData && szTaMb.id && !readonly"
             objType="SzTaMb"
             :objCode="szTaMb.taCode"
+            :sid="szTaMb.sid"
             @reverCallback="$baseReload()"
           ></formVersionButton>
           <reverButton

package/src/views/bd/setting/table_model/list.vue

@@ -148,6 +148,7 @@
                 <formVersionButton
                   objType="SzTaMb"
                   :objCode="row.taCode"
+                  :sid="row.sid"
                   @reverCallback="searchEvent"
                 ></formVersionButton>
                 <a

package/src/views/user/wf/wfReport/index.vue

@@ -526,8 +526,31 @@ export default {
   }
 }
 .filter-btns {
+  display: flex;
+  align-items: center;
+  flex-wrap: nowrap;
+  gap: 8px;
   .f-btn {
-    margin-right: 25px;
+    margin-right: 0;
+  }
+  // 内联的 128px !important 无法被覆盖，但 flex-shrink 依然生效，
+  // 让各查询项按比例收缩，保证刷新/搜索按钮不换行掉下去
+  ::v-deep .el-select,
+  ::v-deep .el-input,
+  ::v-deep .el-date-editor {
+    flex: 0 1 auto;
+    min-width: 76px;
+  }
+  .button-sty {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    min-width: 0;
+    margin: 0;
+  }
+  > .el-button {
+    flex: none;
+    white-space: nowrap;
   }
 }
 .sum-statistics {