cloud-web-corejs 1.0.283 → 1.0.285

package/src/components/xform/form-designer/form-widget/dialog/searchFormDialog.vue

@@ -485,9 +485,8 @@ export default {
 </script>
 
 <style scoped lang="scss">
-::v-deep .H5 .h5-fixed-bottom-btns {
-  bottom: 95px;
-}
+/* 原 ::v-deep .H5 .h5-fixed-bottom-btns{bottom:95px} 已删：本文件从未把 H5 类
+   绑到任何元素上，该选择器从来没生效过。H5 底栏已改为流内布局。 */
 ::v-deep .tree-container {
   height: 100%;
   .tree-box {

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

@@ -11,7 +11,12 @@
 <template>
   <div
     class="field-wrapper"
-    :class="{ 'design-time-bottom-margin': !!this.designer }"
+    :class="[
+      { 'design-time-bottom-margin': !!this.designer },
+      isH5Field ? 'h5-field' : '',
+      field.options.h5Span === 'half' ? 'h5-half' : '',
+      isH5BlockField ? 'h5-block' : '',
+    ]"
     v-show="!field.options.hidden || designState === true"
   >
     <div>
@@ -258,6 +263,18 @@ import {
   resolveTextMaskFlag,
 } from "../../../../../components/xform/utils/textMaskUtil";
 
+/* H5 版式下独占整行、左对齐的「宽内容」字段（见 isH5BlockField） */
+const H5_BLOCK_FIELD_TYPES = [
+  "vabUpload",
+  "vabUpload2",
+  "baseAttachment",
+  "singleUpload",
+  "picture-upload",
+  "file-upload",
+  "rich-editor",
+  "html-text",
+];
+
 export default {
   name: "form-item-wrapper",
   mixins: [i18n],
@@ -362,6 +379,27 @@ export default {
         : "";
     },
 
+    isH5BlockField() {
+      return H5_BLOCK_FIELD_TYPES.indexOf(this.field.type) > -1;
+    },
+
+    /**
+     * H5 版式的字段行锚点。整套 H5 行版式（styles/h5.scss 块 C/C1/C2/C3/D/E）都挂在
+     * .field-wrapper.h5-field 上，与容器解耦。
+     *
+     * 原先锚在 `.h5-detail-wrap .h5-item .h5-form-box`，而 `.h5-item` 只有
+     * h5-card-pane 会吐（h5-card-pane-item.vue），h5-card 吐的是 `.grid-cell`，
+     * 字段/表格直挂 detail-h5.panes 时（设计器的 draggable 是单一 dragGroup，
+     * 任何容器都能拖进去）连 `.h5-form-box` 都没有 —— 这些摆法下整套行版式会
+     * 静默落空，表现为「标签右对齐、值左对齐」（element 默认），与卡片内的
+     * 「标签左、值右」对不上。
+     *
+     * PC 版式不打这个类，故 PC 表单零影响。
+     */
+    isH5Field() {
+      return this.formConfig?.layoutType === "H5";
+    },
+
     subFormName() {
       return !!this.parentWidget ? this.parentWidget.options.name : "";
     },

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

@@ -62,18 +62,31 @@ export default {
   methods: {
     importHandle() {
       const done = () => {
-        let multi = this.field.options.importMultiple || false;
-        let multiSize = this.field.options.importMultiSize || 1;
-        this.getFormRef().openImportDialog({
+        let options = this.field.options;
+        let multi = options.importMultiple || false;
+        let multiSize = options.importMultiSize || 1;
+        let dialogOption = {
           target: this,
-          importOption: this.field.options,
+          importOption: options,
           importFrontOnly: false,
           multi,
           multiSize,
           callback: (resultData, file, done) => {
 
           }
-        });
+        };
+        // 逐行补默认值：弹框侧读的是 option.defaultValue（此前只有手写页能传，
+        // 表单里配不了），这里把设计器上的脚本包成同一形状交过去
+        if (options.importDefaultValue) {
+          dialogOption.defaultValue = (row) => {
+            return this.handleCustomEvent(
+              options.importDefaultValue,
+              ["row"],
+              [row]
+            ) || {};
+          };
+        }
+        this.getFormRef().openImportDialog(dialogOption);
       }
       if (this.field.options.onBeforeClickButton) {
         if (this.handleCustomEvent(this.field.options.onBeforeClickButton, ["done"], [done]) !== false) {

package/src/components/xform/form-designer/form-widget/field-widget/select-export-item-button-widget.vue

@@ -44,6 +44,7 @@ import i18n from "../../../utils/i18n";
 import fieldMixin from "./fieldMixin";
 import StaticContentWrapper from "./static-content-wrapper.vue";
 import { EXPORT_TYPE } from "../../../../excelExport/exportType";
+import { pickConditionExportOverrides } from "@base/components/excelExport/conditionExportConfig";
 
 export default {
   name: "select-export-item-button-widget",
@@ -101,8 +102,8 @@ export default {
       let opt = {
         title: this.field.options.exportFileName || null,
         targetRef: this.field.options.tableRef || null,
-        pageSize: this.field.options.exportPageSize || null,
         showImageAtTable: this.field.options.showImageAtTable || null,
+        ...pickConditionExportOverrides(this.field.options),
         // 明细导出的列 / 脚本编码 / 取数参数三项各自独立：按钮上维护了哪项就以哪项为准，
         // 留空的那项沿用数据表格属性上那套。参数脚本原样下发，由数据表格求值（this 是
         // 表格组件，与配在表格属性上时同义）

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

@@ -15,7 +15,7 @@
                 :multi="field.options.limit!==1"
                 :limit="field.options.limit"
                 resultType="Array"
-                :edit="!field.options.disabled"
+                :edit="!field.options.disabled && !isReadMode"
                 @callback="submitFile"
                 :hideInfo="field.options.hideFileInfo"
                 :hideName="field.options.hideFileName"

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

@@ -32,6 +32,7 @@ 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";
+import { pickConditionExportOverrides } from "@base/components/excelExport/conditionExportConfig";
 
 export default {
   name: "table-export-button-widget",
@@ -81,8 +82,8 @@ export default {
       let opt = {
         title: this.field.options.exportFileName || null,
         targetRef: this.field.options.tableRef || null,
-        pageSize: this.field.options.exportPageSize || null,
         showImageAtTable: this.field.options.showImageAtTable || null,
+        ...pickConditionExportOverrides(this.field.options),
       };
       let tableExportParam = this.handleCustomEvent(this.field.options.tableExportParam);
       let options = { ...opt, ...tableExportParam, type: type };

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/property-editor/container-list-h5/list-h5-editor.vue

@@ -59,11 +59,10 @@
               <el-input v-model="scope.row.prop"></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('designer.setting.columnWidth')" width="100" prop="width">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.width"></el-input>
-            </template>
-          </el-table-column>
+<!-- 「列宽」已移除：H5 明细卡片是 dl/dt/dd 排版，不读列宽 —— 它当年是从数据表格
+           那套列配置沿用过来的，运行期只被塞进一个拼错的键(witdh)、无人读取。
+           列在卡片里占整行还是半行，由下面的「H5列宽」控制。
+           存量模板里残留的 width 值不用清，读不到就是了。 -->
           <el-table-column :label="i18nt('designer.setting.visibleColumn')" width="70" prop="show">
             <template slot-scope="scope">
               <el-switch v-model="scope.row.show"></el-switch>
@@ -79,6 +78,21 @@
               <el-switch v-model="scope.row.showForRow"></el-switch>
             </template>
           </el-table-column>
+          <!-- H5 明细卡片里这个字段占整行还是半行（半行=一行两个）。
+               不配即整行，运行期判等只认 'half'（存量列读到 undefined 就是整行），
+               不能写成 !== 'full'。样式见 xform/styles/h5.scss 块 I2。
+               ★ 用 :value + $set 而不是 v-model：h5Span 是后加的键，存量列上没有，
+               Vue 2 只给赋值那一刻已存在的属性装 getter/setter，直接 v-model
+               新增属性追踪不到，选完不回显。 -->
+          <el-table-column label="H5列宽" width="110" prop="h5Span">
+            <template slot-scope="scope">
+              <el-select :value="scope.row.h5Span" clearable placeholder="整行"
+                         @input="v => $set(scope.row, 'h5Span', v)">
+                <el-option value="full" label="整行"></el-option>
+                <el-option value="half" label="半行(一行两个)"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column :label="i18nt('designer.setting.formatOfColumn')" width="200" prop="formatS">
             <template slot-scope="scope">
               <el-select v-model="scope.row.formatS" @change="changeFormatS(scope.row)" clearable>

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

@@ -51,6 +51,18 @@
         :max="200"
       ></base-input-number>
     </el-form-item>
+    <el-form-item label="批量报文带附件信封">
+      <el-switch v-model="optionModel.importMultiAttachEnvelope"></el-switch>
+      <el-tooltip effect="dark" placement="top">
+        <div slot="content">
+          只在「批量导入」打开时生效。<br/>
+          关（默认）：报文里 data 是裸行数组，附件列原样留在行里。<br/>
+          打开：每行包成 { 表名: {...行}, attachments_x: [...] }，附件从实体里提到信封层，<br/>
+          与单行导入同构 —— <b>后端脚本需配套改</b>，不要在存量表单上随手打开。
+        </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)">
@@ -72,6 +84,45 @@
       </a>
     </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="逐行校验脚本" 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('importDefaultValue', importDefaultValueParams)"
+      >
+        <span>{{ optionModel.importDefaultValue }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+      <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="导入完成回调" label-width="150px">
       <a
         href="javascript:void(0);"
@@ -116,6 +167,8 @@ export default {
       onBeforeImportParams: ["dataId", "formCode", "file", "resultData", "done"],
       onConfirmImportParams: ["dataId", "formCode", "resultData", "file", "done", "close"],
       onSuccessImportParams: ["dataId", "formCode", "resultData", "file"],
+      onValidateRowParams: ["dataId", "formCode", "row", "index"],
+      importDefaultValueParams: ["dataId", "formCode", "row"],
     };
   },
   methods: {
@@ -130,4 +183,12 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.label-tip-icon {
+  margin-left: 4px;
+  color: #909399;
+  cursor: pointer;
+  font-size: 14px;
+  vertical-align: middle;
+}
+</style>