cloud-web-corejs 1.0.283 → 1.0.285

package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import2-button-editor.vue

@@ -1,96 +1,236 @@
-<template>
-  <div>
-    <el-form-item label-width="0">
-      <el-divider class="custom-divider">前端导入设置</el-divider>
-    </el-form-item>
-    <el-form-item label="文件大小限制（M）" class="form-item-label-top">
-      <base-input-number v-model="optionModel.importFileLimitSize" :max="200"></base-input-number>
-    </el-form-item>
-    <el-form-item label="导入模板文件编码" class="form-item-label-top">
-      <el-input
-        class="search-input"
-        max="200"
-        :value="optionModel.importAttachCode"
-        clearable
-        @clear="optionModel.importAttachCode=null;optionModel.importAttachName=null;"
-      >
-        <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
-      </el-input>
-    </el-form-item>
-    <el-form-item label="导入模板文件名称">
-      <span>{{ optionModel.importAttachName }}</span>
-    </el-form-item>
-
-    <el-form-item label="关联表格唯一名称" class="form-item-label-top">
-      <el-input v-model="optionModel.tableRef"></el-input>
-    </el-form-item>
-    <el-form-item label="点击前置事件" label-width="150px">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('onBeforeClickButton', eventParams)">
-        <span>{{ optionModel.onBeforeClickButton }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-    <el-form-item label="启用确认回调">
-      <el-switch v-model="optionModel.onConfirmImportEnabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="确认回调" label-width="150px" v-if="optionModel.onConfirmImportEnabled" class="el-form-item-second">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('onConfirmImport', onConfirmImportParams)">
-        <span>{{ optionModel.onConfirmImport }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-    <el-form-item label="导入完成回调" label-width="150px">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('onSuccessImport', onSuccessImportParams)">
-        <span>{{ optionModel.onSuccessImport }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-    <el-form-item label="隐藏取消按钮" label-width="150px">
-      <el-switch v-model="optionModel.hideCancelButton"></el-switch>
-    </el-form-item>
-
-    <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
-                           @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>
-  </div>
-</template>
-
-<script>
-import i18n from "../../../../../../components/xform/utils/i18n";
-import eventMixin
-  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
-import bdAttachSettingDialog from "../../../../../../views/bd/setting/bd_attach_setting/dialog.vue";
-
-export default {
-  name: "import2-button-editor",
-  components: {bdAttachSettingDialog},
-  mixins: [i18n, eventMixin],
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-  },
-  data() {
-    return {
-      eventParams: ["dataId", "formCode", "done"],
-      showBdAttachSettingDialog: false,
-      onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done'],
-      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done', "close"],
-      onSuccessImportParams: ["dataId", "formCode", 'resultData', 'file']
-    };
-  },
-  methods: {
-    confirmBdAttachSettingDialog(rows) {
-      if (rows.length) {
-        let row = rows[0];
-        this.optionModel.importAttachName = row.name;
-        this.optionModel.importAttachCode = row.code;
-      }
-    }
-  }
-};
-</script>
-
-<style scoped></style>
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider">前端导入设置</el-divider>
+    </el-form-item>
+    <el-form-item label="文件大小限制（M）" class="form-item-label-top">
+      <base-input-number v-model="optionModel.importFileLimitSize" :max="200"></base-input-number>
+    </el-form-item>
+    <el-form-item label="导入模板文件编码" class="form-item-label-top">
+      <el-input
+        class="search-input"
+        max="200"
+        :value="optionModel.importAttachCode"
+        clearable
+        @clear="optionModel.importAttachCode=null;optionModel.importAttachName=null;"
+      >
+        <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
+      </el-input>
+    </el-form-item>
+    <el-form-item label="导入模板文件名称">
+      <span>{{ optionModel.importAttachName }}</span>
+    </el-form-item>
+
+    <el-form-item label="关联表格唯一名称" class="form-item-label-top">
+      <el-input v-model="optionModel.tableRef"></el-input>
+    </el-form-item>
+    <el-form-item label="入表去重字段" class="form-item-label-top">
+      <el-input v-model="optionModel.dedupField" placeholder="留空则不去重"></el-input>
+    </el-form-item>
+    <el-form-item label="必填校验方式" class="form-item-label-top">
+      <el-select v-model="optionModel.requiredCheckMode" style="width: 100%">
+        <el-option label="默认（有进度框逐行标记，否则整批拦）" value=""></el-option>
+        <el-option label="整批硬拦（一处不合规就整份不导）" value="strict"></el-option>
+        <el-option label="不校验（只信业务脚本）" value="off"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="显示导入进度">
+      <el-switch v-model="optionModel.showProgressDialog"></el-switch>
+      <el-tooltip effect="dark" placement="top">
+        <div slot="content">
+          打开后走进度弹框：逐行校验，成功/失败可点开看明细并导出，<br/>
+          校验通过的行才进表格。关闭则沿用整批导入（缺必填直接中止）。
+        </div>
+        <i class="el-icon-question label-tip-icon"></i>
+      </el-tooltip>
+    </el-form-item>
+    <el-form-item
+      label="每行处理方式"
+      class="form-item-label-top el-form-item-second"
+      v-if="optionModel.showProgressDialog"
+    >
+      <el-select v-model="optionModel.importMode" style="width: 100%">
+        <el-option label="塞入关联表格" value="table"></el-option>
+        <el-option label="逐行脚本处理" value="script"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item
+      label="启用后台校验"
+      class="el-form-item-second"
+      v-if="optionModel.showProgressDialog"
+    >
+      <el-switch v-model="optionModel.backendValidateEnabled"></el-switch>
+      <el-tooltip effect="dark" placement="top">
+        <div slot="content">
+          打开后，前台校验通过的行整批一次送给后台脚本：校验并补字段。<br/>
+          通过的行再按「每行处理方式」入表或走逐行脚本。<br/>
+          失败行进结果表，不入表格。
+        </div>
+        <i class="el-icon-question label-tip-icon"></i>
+      </el-tooltip>
+    </el-form-item>
+    <el-form-item
+      label="执行后台脚本编码"
+      class="form-item-label-top el-form-item-second"
+      v-if="optionModel.showProgressDialog && optionModel.backendValidateEnabled"
+    >
+      <el-input v-model="optionModel.importScriptCode"></el-input>
+    </el-form-item>
+    <el-form-item
+      label="请求额外参数脚本"
+      label-width="150px"
+      class="el-form-item-second"
+      v-if="optionModel.showProgressDialog && optionModel.backendValidateEnabled"
+    >
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onImportParams', onImportParamsParams)">
+        <span>{{ optionModel.onImportParams }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+      <el-tooltip effect="dark" placement="top">
+        <div slot="content">
+          发请求前整批跑一次，返回对象作为 params。<br/>
+          不要在脚本里自己发请求。
+        </div>
+        <i class="el-icon-question label-tip-icon"></i>
+      </el-tooltip>
+    </el-form-item>
+    <el-form-item
+      label="启用图片处理"
+      class="el-form-item-second"
+      v-if="optionModel.showProgressDialog"
+    >
+      <el-switch v-model="optionModel.enabledImportPreHandle"></el-switch>
+      <el-tooltip effect="dark" placement="top">
+        <div slot="content">
+          模板里 <b>attachments_</b> 开头的列用于承载附件。<br/>
+          不开：只认单元格里的 URL 文本（支持逗号/换行分隔多个）。<br/>
+          打开：Excel 里贴的内嵌图片也会被取回并填进该列 —— 需先上传整个文件，<br/>
+          导入前多出「上传/校验/存储图片」三段进度。<br/>
+          仅在「显示导入进度」打开时可用。
+        </div>
+        <i class="el-icon-question label-tip-icon"></i>
+      </el-tooltip>
+    </el-form-item>
+    <el-form-item
+      label="逐行处理脚本"
+      label-width="150px"
+      class="el-form-item-second"
+      v-if="optionModel.showProgressDialog && optionModel.importMode === 'script'"
+    >
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onImportRow', onImportRowParams)">
+        <span>{{ optionModel.onImportRow }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+      <el-tooltip effect="dark" placement="top">
+        <div slot="content">
+          每行调一次，必须调 done：done() 表示成功；<br/>
+          done({success:false, message:"未匹配到编码"}) 表示失败。<br/>
+          若启用了后台校验，row 已含后台补数字段。<br/>
+          更新：this.getWidgetRef(表格名) 比对后改现有行；插入可 addTableData([row])。<br/>
+          循环、让步与进度由组件负责，脚本里不要自己写整趟 for。
+        </div>
+        <i class="el-icon-question label-tip-icon"></i>
+      </el-tooltip>
+    </el-form-item>
+    <el-form-item label="逐行校验脚本" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onValidateRow', onValidateRowParams)">
+        <span>{{ optionModel.onValidateRow }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+      <el-tooltip effect="dark" placement="top">
+        <div slot="content">返回 true 或不返回＝通过；返回字符串＝该行的错误文案。</div>
+        <i class="el-icon-question label-tip-icon"></i>
+      </el-tooltip>
+    </el-form-item>
+    <el-form-item label="点击前置事件" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onBeforeClickButton', eventParams)">
+        <span>{{ optionModel.onBeforeClickButton }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="启用确认回调">
+      <el-switch v-model="optionModel.onConfirmImportEnabled"></el-switch>
+      <el-tooltip effect="dark" placement="top">
+        <div slot="content">
+          选完文件点确定、Excel 解析完后立刻执行。<br/>
+          进度框开：前置钩子，done() 继续导入，close() 中止；不返回 false 则自动继续。<br/>
+          进度框关：由脚本接管整批导入，done() 结束并触发导入完成回调。
+        </div>
+        <i class="el-icon-question label-tip-icon"></i>
+      </el-tooltip>
+    </el-form-item>
+    <el-form-item label="确认回调" label-width="150px" v-if="optionModel.onConfirmImportEnabled" class="el-form-item-second">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onConfirmImport', onConfirmImportParams)">
+        <span>{{ optionModel.onConfirmImport }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="导入完成回调" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onSuccessImport', onSuccessImportParams)">
+        <span>{{ optionModel.onSuccessImport }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="隐藏取消按钮" label-width="150px">
+      <el-switch v-model="optionModel.hideCancelButton"></el-switch>
+    </el-form-item>
+
+    <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
+                           @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import bdAttachSettingDialog from "../../../../../../views/bd/setting/bd_attach_setting/dialog.vue";
+
+export default {
+  name: "import2-button-editor",
+  components: {bdAttachSettingDialog},
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      eventParams: ["dataId", "formCode", "done"],
+      showBdAttachSettingDialog: false,
+      onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done'],
+      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done', "close"],
+      onSuccessImportParams: ["dataId", "formCode", 'resultData', 'file'],
+      onImportRowParams: ["dataId", "formCode", "row", "index", "done"],
+      onValidateRowParams: ["dataId", "formCode", "row", "index"],
+      onImportParamsParams: ["dataId", "formCode", "resultData", "file"]
+    };
+  },
+  methods: {
+    confirmBdAttachSettingDialog(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.optionModel.importAttachName = row.name;
+        this.optionModel.importAttachCode = row.code;
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+.label-tip-icon {
+  margin-left: 4px;
+  color: #909399;
+  cursor: pointer;
+  font-size: 14px;
+  vertical-align: middle;
+}
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/empty-number-input.vue

@@ -0,0 +1,51 @@
+<template>
+  <base-input-number
+    :value="innerValue"
+    v-bind="$attrs"
+    v-on="listeners"
+    @input="onInput"
+  />
+</template>
+
+<script>
+/**
+ * 未配置（null / undefined / 非正数）时显示空白，而不是 el-input-number 默认的 0。
+ * 清空后回写 null，运行时会回落到全局逻辑参数。
+ */
+function toDisplayNumber(value) {
+  if (value == null || value === "") return undefined;
+  let num = Number(value);
+  if (!Number.isFinite(num) || num <= 0) return undefined;
+  return num;
+}
+
+function toStoredNumber(value) {
+  if (value == null || value === "") return null;
+  let num = Number(value);
+  if (!Number.isFinite(num) || num <= 0) return null;
+  return num;
+}
+
+export default {
+  name: "empty-number-input",
+  inheritAttrs: false,
+  props: {
+    value: {},
+  },
+  computed: {
+    innerValue() {
+      return toDisplayNumber(this.value);
+    },
+    listeners() {
+      let listeners = Object.assign({}, this.$listeners);
+      delete listeners.input;
+      return listeners;
+    },
+  },
+  methods: {
+    onInput(val) {
+      this.$emit("input", toStoredNumber(val));
+    },
+  },
+};
+</script>

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/select-export-item-button-editor.vue

@@ -19,10 +19,29 @@
       ></el-switch>
     </el-form-item>
     <el-form-item label="导出每页查询数量" class="form-item-label-top">
-      <base-input-number
+      <empty-number-input
         v-model="optionModel.exportPageSize"
         :max="optionModel.showImageAtTable ? 150 : 1000"
-      ></base-input-number>
+        :placeholder="'默认 ' + defaultPageSize"
+      ></empty-number-input>
+    </el-form-item>
+    <el-form-item label="最大查询总数" class="form-item-label-top">
+      <empty-number-input
+        v-model="optionModel.maxQueryTotal"
+        :placeholder="'默认 ' + defaultMaxQueryTotal"
+      ></empty-number-input>
+      <div class="export-item-columns-tip">
+        条件导出最多拉取的行数。留空则使用全局逻辑参数（默认 {{ defaultMaxQueryTotal }}）
+      </div>
+    </el-form-item>
+    <el-form-item label="每个文件最大数据量" class="form-item-label-top">
+      <empty-number-input
+        v-model="optionModel.limitFileSize"
+        :placeholder="'默认 ' + defaultLimitFileSize"
+      ></empty-number-input>
+      <div class="export-item-columns-tip">
+        单个 Excel 最多行数，超出则分多个文件。留空则使用全局逻辑参数（默认 {{ defaultLimitFileSize }}）
+      </div>
     </el-form-item>
     <el-form-item label="导出参数" label-width="150px">
       <a
@@ -80,12 +99,15 @@
 import i18n from "../../../../utils/i18n";
 import eventMixin from "../event-handler/eventMixin";
 import exportItemColumnsDialog from "../container-data-table/exportItemColumns-dialog.vue";
+import { DEFAULT_CONDITION_EXPORT_CONFIG } from "@base/components/excelExport/conditionExportConfig";
+import emptyNumberInput from "./empty-number-input.vue";
 
 export default {
   name: "select-export-item-button-editor",
   mixins: [i18n, eventMixin],
   components: {
     exportItemColumnsDialog,
+    emptyNumberInput,
   },
   props: {
     designer: Object,
@@ -98,6 +120,9 @@ export default {
       // 与数据表格属性面板同一套：脚本里可直接用 dataId / formCode
       tableConfigParams: ["dataId", "formCode"],
       showExportItemColumnsDialog: false,
+      defaultPageSize: DEFAULT_CONDITION_EXPORT_CONFIG.pageSize,
+      defaultMaxQueryTotal: DEFAULT_CONDITION_EXPORT_CONFIG.maxQueryTotal,
+      defaultLimitFileSize: DEFAULT_CONDITION_EXPORT_CONFIG.limitFileSize,
     };
   },
   methods: {

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/table-export-button-editor.vue

@@ -13,8 +13,23 @@
       <el-switch v-model="optionModel.showImageAtTable" @change="changeShowImageAtTable"></el-switch>
     </el-form-item>
     <el-form-item label="导出每页查询数量" class="form-item-label-top">
-      <base-input-number v-model="optionModel.exportPageSize"
-                         :max="optionModel.showImageAtTable?150:1000"></base-input-number>
+      <empty-number-input v-model="optionModel.exportPageSize"
+                          :max="optionModel.showImageAtTable?150:1000"
+                          :placeholder="'默认 ' + defaultPageSize"></empty-number-input>
+    </el-form-item>
+    <el-form-item label="最大查询总数" class="form-item-label-top">
+      <empty-number-input v-model="optionModel.maxQueryTotal"
+                          :placeholder="'默认 ' + defaultMaxQueryTotal"></empty-number-input>
+      <div class="export-limit-tip">
+        条件导出最多拉取的行数。留空则使用全局逻辑参数（默认 {{ defaultMaxQueryTotal }}）
+      </div>
+    </el-form-item>
+    <el-form-item label="每个文件最大数据量" class="form-item-label-top">
+      <empty-number-input v-model="optionModel.limitFileSize"
+                          :placeholder="'默认 ' + defaultLimitFileSize"></empty-number-input>
+      <div class="export-limit-tip">
+        单个 Excel 最多行数，超出则分多个文件。留空则使用全局逻辑参数（默认 {{ defaultLimitFileSize }}）
+      </div>
     </el-form-item>
     <el-form-item label="导出参数" label-width="150px">
       <a href="javascript:void(0);" class="a-link link-oneLind"
@@ -30,10 +45,15 @@
 import i18n from "../../../../../../components/xform/utils/i18n";
 import eventMixin
   from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import { DEFAULT_CONDITION_EXPORT_CONFIG } from "@base/components/excelExport/conditionExportConfig";
+import emptyNumberInput from "./empty-number-input.vue";
 
 export default {
   name: "table-export-button-editor",
   mixins: [i18n, eventMixin],
+  components: {
+    emptyNumberInput,
+  },
   props: {
     designer: Object,
     selectedWidget: Object,
@@ -42,6 +62,9 @@ export default {
   data() {
     return {
       eventParams: [],
+      defaultPageSize: DEFAULT_CONDITION_EXPORT_CONFIG.pageSize,
+      defaultMaxQueryTotal: DEFAULT_CONDITION_EXPORT_CONFIG.maxQueryTotal,
+      defaultLimitFileSize: DEFAULT_CONDITION_EXPORT_CONFIG.limitFileSize,
     };
   },
   methods: {
@@ -57,4 +80,11 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.export-limit-tip {
+  line-height: 18px;
+  color: #909399;
+  font-size: 12px;
+  margin-top: 4px;
+}
+</style>

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

@@ -0,0 +1,51 @@
+<template>
+  <!-- 仅 H5 版式下显示：该选项在 PC/Pad 版式没有任何作用 -->
+  <el-form-item
+    v-if="showEditor"
+    :label="i18nt('designer.setting.h5Span')"
+    class="form-item-label-top"
+  >
+    <el-tooltip
+      :enterable="false"
+      effect="dark"
+      :content="i18nt('designer.setting.h5SpanHelp')"
+      placement="top"
+      popper-class="tooltip-skin"
+    >
+      <el-radio-group v-model="optionModel.h5Span" size="mini">
+        <el-radio-button label="full">
+          {{ i18nt("designer.setting.h5SpanFull") }}
+        </el-radio-button>
+        <el-radio-button label="half">
+          {{ i18nt("designer.setting.h5SpanHalf") }}
+        </el-radio-button>
+      </el-radio-group>
+    </el-tooltip>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../components/xform/utils/i18n";
+
+export default {
+  name: "h5Span-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  computed: {
+    showEditor() {
+      let formConfig = this.designer && this.designer.formConfig;
+      return !!formConfig && formConfig.layoutType === "H5";
+    },
+  },
+  // 注意：不要在 created 里给老表单自动回填 "full"。
+  // upgradeWidgetConfig 给老表单补新增 option 时补的是 null（不是默认值），
+  // 此时两个 radio 都不选中是可接受表现（等价整宽）；自动回填会把所有老表单
+  // 标记成已修改。详见 docs/2026-08 xform H5 P0 实现规格.md §3.2 / §3.4。
+};
+</script>
+
+<style scoped></style>

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

@@ -0,0 +1,39 @@
+<template>
+  <el-form-item
+    :label="i18nt('designer.setting.itemStyle')"
+    class="form-item-label-top"
+  >
+    <el-tooltip
+      :enterable="false"
+      effect="dark"
+      :content="i18nt('designer.setting.itemStyleHelp')"
+      placement="top"
+      popper-class="tooltip-skin"
+    >
+      <el-radio-group v-model="optionModel.itemStyle" size="mini">
+        <el-radio-button label="plain">
+          {{ i18nt("designer.setting.itemStylePlain") }}
+        </el-radio-button>
+        <el-radio-button label="card">
+          {{ i18nt("designer.setting.itemStyleCard") }}
+        </el-radio-button>
+      </el-radio-group>
+    </el-tooltip>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../components/xform/utils/i18n";
+
+export default {
+  name: "itemStyle-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
+</script>
+
+<style scoped></style>

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

@@ -27,6 +27,15 @@ const COMMON_PROPERTIES = {
   border: "border-editor",
   labelWidth: "labelWidth-editor",
   labelHidden: "labelHidden-editor",
+  /* 「H5 占宽」暂时隐藏（2026-09-01）。属性面板只渲染登记在这几张表里的属性
+     （setting-panel/indexMixin.js 的 hasPropEditor 逐条查），注释掉这一行，
+     面板上就不出这一项。要放出来，把注释去掉即可。
+     ★ 只动面板，不动数据与运行期：字段原型仍带 h5Span:"full"
+     （widgetsConfig 的 applyH5FieldDefaults），已经存成 "half" 的老表单
+     照旧按两列渲染（form-item-wrapper 读的是实例 options）。
+     ★ 明细列表列上那个「H5列宽」是另一处 UI（list-h5-editor 里的列表格），
+     不走这张表，不受影响。 */
+  // h5Span: "h5Span-editor",
   rows: "rows-editor",
   required: "required-editor",
   // 'requiredHint': 'requiredHint-editor',
@@ -121,6 +130,7 @@ const COMMON_PROPERTIES = {
   detailH5Container: "detail-h5-editor",
   h5Card: "h5-card-editor",
   listH5: "list-h5-editor",
+  itemStyle: "itemStyle-editor",
   formScriptEnabled: "formScriptEnabled-editor",
   textFlag: "textFlag-editor",
   showRuleFlag: "showRuleFlag-editor",

package/src/components/xform/form-designer/toolbar-panel/index.vue

@@ -17,9 +17,12 @@
       >
         <svg-icon icon-class="redo" />
       </el-button>
-      <el-button-group v-if="$store.getters.loginAccount === 'dev_徐凯'">
+      <el-button-group :title="layoutTypeLocked ? layoutTypeLockedTip : ''">
+        <!-- 锁定时只保留当前模式一个按钮，另一个不显示 -->
         <el-button
+          v-if="!layoutTypeLocked || layoutType === 'PC'"
           :type="layoutType === 'PC' ? 'info' : ''"
+          :disabled="layoutTypeLocked"
           @click="changeLayoutType('PC')"
           size="mini"
         >
@@ -27,7 +30,9 @@
         </el-button>
         <!--         <el-button :type="layoutType === 'Pad' ? 'info' : ''" @click="changeLayoutType('Pad')">{{ i18nt('designer.toolbar.padLayout') }}</el-button>-->
         <el-button
+          v-if="!layoutTypeLocked || layoutType === 'H5'"
           :type="layoutType === 'H5' ? 'info' : ''"
+          :disabled="layoutTypeLocked"
           @click="changeLayoutType('H5')"
           size="mini"
         >