cloud-web-corejs 1.0.54-dev.797 → 1.0.54-dev.799

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

@@ -301,7 +301,7 @@ let chartContainers = [],
       handleKeyNameSuffix(selected) {
         if (!selected) return;
         let optionModel = selected.options;
-        let prefix = this.getKeyNamePrefix(selected.type);
+        let prefix = this.getKeyNamePrefix(selected.type, optionModel);
         if (
           optionModel.keyNameEnabled &&
           !!prefix &&
@@ -1298,9 +1298,9 @@ let chartContainers = [],
         this.emitEvent("canvas-add-field", newWidget.options.name);
         return newWidget;
       },
-      createKeyName(type, suffix) {
+      createKeyName(type, suffix, options) {
         let keyNameSuffix = suffix ? suffix : this.createKeyNameSuffix(type);
-        let keyNamePrefix = this.getKeyNamePrefix(type);
+        let keyNamePrefix = this.getKeyNamePrefix(type, options);
         let keyName = null;
         if (keyNamePrefix) {
           keyName = keyNamePrefix + keyNameSuffix;
@@ -1317,7 +1317,13 @@ let chartContainers = [],
         }*/
         return suffix;
       },
-      getKeyNamePrefix(type) {
+      /* 开了「值存为URL」的附件字段存的是主表普通列（值是 URL 字符串），不再走
+         attachments_ 独立附件通道，keyName 不能带前缀——否则保存时会被
+         data-table-mixin 的 attachments_ 提取逻辑当附件包发走，主表列存不到 */
+      getKeyNamePrefix(type, options) {
+        if (options && options.urlValueEnabled) {
+          return null;
+        }
         return keyNamePrefixMap[type] ?? null;
       },
       getFormCodePrefix(type) {
@@ -1492,6 +1498,39 @@ let chartContainers = [],
           ); //vabUpload
           newCol.widgetList.push(vabUploadCon);
           newCon.panes.push(newCol);
+
+          /* 「详情模块(标签)」面板条目：type=detail-tabs + targetType=detail，落地后就是 detail，
+             不是新的容器类型。与「详情模块」的区别是内容模块不直接挂在正文区,而是收进标签里,
+             详见 docs/详情模块标签承载方案.md */
+          if (newCon.sourceType === "detail-tabs") {
+            // 上面已按 detail 的默认骨架建好一批内容模块,整体挪进第一个标签——
+            // 标签形态下正文区只放标签容器,不留散在标签外面的模块。
+            let presetPanes = newCon.panes.splice(0);
+
+            // 标签内的模块由 detail-plain 承载:它自带一套独立锚点导航,
+            // 外层 baseTabs 探测不到标签内的模块(tab-item 不满足 getTabs 的两个条件)。
+            let plainCon = this.copyNewContainerWidget(
+              this.getContainerByType("detail-plain")
+            );
+            plainCon.panes = presetPanes; // 丢掉 detail-plain 自带的默认模块，用上面建好的这批
+            plainCon.options.hideNav = false; // schema 默认关导航,标签内要开
+
+            let tabCon = this.copyNewContainerWidget(
+              this.getContainerByType("tab")
+            );
+            tabCon.tabs[0].widgetList.push(plainCon);
+
+            // copyNewContainerWidget 只预置 1 个 tab-pane，只有一个标签页的标签栏看着像 bug，补第二个
+            let secondPane = baseRefUtil.deepClone(
+              this.getContainerByType("tab-pane")
+            );
+            secondPane.id = "tab-pane-" + baseRefUtil.generateId();
+            secondPane.options.name = "tab2";
+            secondPane.options.label = "tab 2";
+            tabCon.tabs.push(secondPane);
+
+            newCon.panes.push(tabCon);
+          }
         } else if (newCon.type === "table-column") {
           newCon.options.label = "tableColumn";
         } else if (newCon.type === "h5-card") {
@@ -1682,10 +1721,19 @@ let chartContainers = [],
         this.emitEvent("canvas-add-field", newWidget.options.name),
           this.emitHistoryChange();
       },
-      deletePaneOfDetail(gridWidget, colIdx) {
-        if (!!gridWidget && !!gridWidget.panes) {
-          gridWidget.panes.splice(colIdx, 1);
-        }
+      /**
+       * 删除详情容器下的一个 pane。
+       * @param gridWidget 详情容器(detail / detail-plain)
+       * @param paneOrIdx  pane 的 widget 引用，或它在 panes 中的下标。
+       *   detail 的属性面板按 type 做了显隐，下标不再可靠，故走引用；
+       *   detail-plain 的属性面板仍传下标，这里一并兼容。
+       */
+      deletePaneOfDetail(gridWidget, paneOrIdx) {
+        if (!gridWidget || !gridWidget.panes) return;
+        let isIdx = typeof paneOrIdx === "number";
+        let colIdx = isIdx ? paneOrIdx : gridWidget.panes.indexOf(paneOrIdx);
+        if (colIdx < 0) return;
+        gridWidget.panes.splice(colIdx, 1);
       },
       cloneDetailPane(widget, parentWidget) {
         let newGridCol = baseRefUtil.deepClone(

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

@@ -65,11 +65,57 @@
             <el-button type="primary" class="button-sty" icon="el-icon-check">保存</el-button>
           </div>-->
         </div>
-        <baseTabs style="height: auto;">
-          <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>
+        <!-- 正文区：通用容器列表。panes 里既可以直接挂 detail-pane(模块)，也可以挂 tab 等
+             其它容器(标签承载)。设计期这里不套 baseTabs——draggable 会隔断 baseTabs.getTabs()
+             对 slot 子级的探测(见 baseTabs/mixins.js getTabs)，导航拿不到 pane，索性不渲染，
+             左侧导航预览只在运行期有。 -->
+        <draggable
+          :list="widget.panes"
+          v-bind="{ group: 'dragGroup', ghostClass: 'ghost', animation: 200 }"
+          handle=".drag-handler"
+          @add="evt => onContainerDragAdd(evt, widget.panes)"
+          @update="onContainerDragUpdate"
+          :move="checkContainerMove"
+        >
+          <transition-group name="fade" tag="div" class="detail-pane-list">
+            <template v-for="(paneWidget, index) in widget.panes">
+              <!-- 模块：额外要 tabRef/tabPaneGrade,这两个 props 是 baseTabs 探测用的,只给 detail-pane -->
+              <detail-pane-widget
+                v-if="paneWidget.type === 'detail-pane'"
+                :key="paneWidget.id"
+                :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>
+              <component
+                v-else-if="'container' === paneWidget.category"
+                :is="paneWidget.type + '-widget'"
+                :key="paneWidget.id"
+                :widget="paneWidget"
+                :designer="designer"
+                :parent-list="widget.panes"
+                :index-of-parent-list="index"
+                :parent-widget="widget"
+              ></component>
+              <component
+                v-else
+                :is="paneWidget.type + '-widget'"
+                :key="paneWidget.id"
+                :field="paneWidget"
+                :designer="designer"
+                :parent-list="widget.panes"
+                :index-of-parent-list="index"
+                :parent-widget="widget"
+                :design-state="true"
+              ></component>
+            </template>
+          </transition-group>
+        </draggable>
     </div>
   </container-wrapper>
 </template>
@@ -140,6 +186,14 @@
       height: 100%;
     }
 
+    /* 正文区(panes)的拖放区。不能复用上面的 .form-widget-list——那条是 height:100% 且
+       min-height 被注释掉的，空态会塌成一条线，没有地方往里拖组件。
+       这里给足高度，保证空态也是个看得见、拖得进的落区。 */
+    .detail-pane-list {
+      min-height: 150px;
+      height: auto;
+    }
+
   }
 
   .grid-container.selected, .grid-cell.selected {

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

@@ -19,6 +19,12 @@ 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 {
+  normalizeAttachmentValue,
+  isSameAttachmentRows,
+  isSameModelValue,
+  toModelValue,
+} from "../../../../../components/xform/utils/attachmentValueUtil";
 
 export default {
   name: "baseAttachment-widget",
@@ -65,7 +71,20 @@ export default {
   },
   watch: {
     fieldModel(val) {
-      this.handleChangeEvent(val);
+      /* fieldMixin.initValueWatchEvent 监听模型值，一变就 initFieldModel(true) 把
+         模型值原样灌回 fieldModel——URL 模式下灌回来的是字符串/字符串数组，会打破
+         「fieldModel 恒为附件对象数组」这个内部约定，所以这里兜底归一。 */
+      let rows = normalizeAttachmentValue(val);
+      if (!isSameAttachmentRows(rows, val)) {
+        this.fieldModel = rows;
+        return;
+      }
+      /* 落到表单模型的值由 urlValueEnabled 决定是对象数组还是 URL 字符串。
+         默认模式下 rows 就是 val 本身(归一未改动任何东西)，写回模型的是同一个
+         引用，模型值身份不变，不会触发 initValueWatchEvent 回灌。 */
+      let modelValue = this.toModelValue(rows);
+      if (this.isSameFieldModelValue(modelValue)) return;
+      this.handleChangeEvent(modelValue);
     },
     'option':function(){
 
@@ -119,6 +138,7 @@ export default {
     this.isH5 = this.getFormConfig()?.layoutType === 'H5';
 
     this.initFieldModel()
+    this.initAttachmentValue()
     this.registerToRefList()
     this.initEventHandler()
     this.buildFieldRules()
@@ -146,7 +166,9 @@ export default {
           resultType: "Array"
         },
         rows: (done) => {
-          done(this.fieldModel);
+          /* base-attachment 对数组只走 domain + url 的对象分支，数组里混进
+             URL 字符串会得到 undefinedhttp://...，所以这里再兜一次归一 */
+          done(normalizeAttachmentValue(this.fieldModel));
         },
         confirm: (rows, fileInfos) => {
           this.fieldModel = rows;
@@ -157,24 +179,54 @@ export default {
         }
       }
     },
+    /* 模型里存的可能是 URL 字符串/数组(urlValueEnabled)或外部塞进来的 URL，
+       统一归一成附件对象数组，组件内部只处理这一种形态 */
+    initAttachmentValue() {
+      let rows = normalizeAttachmentValue(this.fieldModel);
+      /* 归一前后等价就不重新赋值，换新数组会让 watcher 白触发一次 onChange */
+      if (!isSameAttachmentRows(rows, this.fieldModel)) {
+        this.fieldModel = rows;
+      }
+    },
+    toModelValue(rows) {
+      return toModelValue(rows, this.field.options);
+    },
+    /* URL 模式下 toModelValue 每次都产出新数组，值没变也回写模型的话，会和
+       initValueWatchEvent 形成「写模型 → 灌回 fieldModel → 又写模型」的死循环
+       （多值模式页面直接卡死）。默认模式模型值就是 fieldModel 本身、身份不变，
+       不存在这个问题，行为保持原样。 */
+    isSameFieldModelValue(modelValue) {
+      if (!this.field.options.urlValueEnabled) return false;
+      let currentData = this.tableRow ? this.tableRow : this.formModel;
+      let current = currentData ? currentData[this.fieldKeyName] : undefined;
+      return isSameModelValue(current, modelValue);
+    },
     setValue(val) {
-      let data = val || []
+      let data = normalizeAttachmentValue(val)
+      let modelValue = this.toModelValue(data);
       // 按 tableParam 决定落点：行内附件写回当前行对象，主表写回表单模型。
       // 旧实现固定写 getFormRef().formDataModel（顶层），行内附件会写错位置并丢失联动，
       // 且多行会互相覆盖同一个顶层字段。
-      let currentData = this.tableParam && this.tableParam.row
-        ? this.tableParam.row
-        : this.formModel;
+      let currentData = this.tableRow ? this.tableRow : this.formModel;
       if (currentData[this.fieldKeyName] === undefined) {
-        this.$set(currentData, this.fieldKeyName, [])
+        this.$set(currentData, this.fieldKeyName, modelValue)
       }
       // 赋值 fieldModel 会触发 watch.fieldModel -> handleChangeEvent（内部再走
       // syncUpdateFormModel + emitFieldDataChange，异步一次）。这里再同步写一次模型，
       // 保证 setValue 返回后立即可读到最新值，且落点与 watcher 一致，不会重复触发变更事件。
       this.fieldModel = data;
-      this.syncUpdateFormModel(data);
+      this.syncUpdateFormModel(modelValue);
+    },
+    /* 脚本 API：直接用 URL 赋值，支持单个 URL、逗号/换行分隔的多个 URL、URL 数组。
+       非法输入会被忽略并在控制台告警，不抛异常。 */
+    setValueByUrl(fileUrl) {
+      this.setValue(normalizeAttachmentValue(fileUrl));
     },
     loadDataDefaultHandle() {
+      /* URL 模式下值就存在主表列上、随表单 getOne 一起回来，不存在独立附件记录。
+         再发这一包不仅多余，查不到还会 setValue([]) 把主表带回来的 URL 清掉。
+         在这里拦截而不是改 onCreated 脚本，已有表单不用逐个改配置。 */
+      if (this.field.options.urlValueEnabled) return;
       let dataId = this.formDataId;
       if (!dataId) return;
       let reportTemplate = this.getFormRef().reportTemplate;

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

@@ -382,9 +382,15 @@ export default {
       return (opts.keyNameEnabled && opts.keyName) || opts.name || "";
     },
     compareExcluded() {
-      // 按类型排除
+      // 按类型排除。附件类天然不参与对比，但开了「值存为URL」的附件字段存的是主表
+      // 普通列上的 URL 字符串，与普通字段无异，应照常参与对比
       let types = this.getCompareExcludeTypes() || [];
-      if (types.indexOf(this.field.type) !== -1) return true;
+      if (
+        types.indexOf(this.field.type) !== -1 &&
+        !this.field.options.urlValueEnabled
+      ) {
+        return true;
+      }
       // 按字段名排除（系统字段 + 主表黑白名单 + 所在明细表的黑白名单）
       let fieldKeyName =
         (this.field.options.keyNameEnabled && this.field.options.keyName) ||

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

@@ -1,92 +1,120 @@
-<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-upload2"
-      @click="toDo('exportItem')"
-      :disabled="field.options.disabled"
-      >{{ getI18nLabel(field.options.label) }}
-    </el-button>
-  </static-content-wrapper>
-</template>
-<script>
-import emitter from "../../../utils/emitter";
-import i18n from "../../../utils/i18n";
-import fieldMixin from "./fieldMixin";
-import StaticContentWrapper from "./static-content-wrapper.vue";
-
-export default {
-  name: "select-export-item-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 {};
-  },
-  beforeCreate() {
-    /* 这里不能访问方法和属性！！ */
-  },
-
-  created() {
-    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
-       需要在父组件created中初始化！！ */
-    this.registerToRefList();
-    this.initEventHandler();
-
-    this.handleOnCreated();
-  },
-
-  mounted() {
-    this.handleOnMounted();
-  },
-
-  beforeDestroy() {
-    this.unregisterFromRefList();
-  },
-
-  methods: {
-    toDo(type = null) {
-      if (this.designState) {
-        return;
-      }
-      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,
-      };
-      let tableExportParam = this.handleCustomEvent(this.field.options.tableExportParam);
-      let options = { ...opt, ...tableExportParam, type: type };
-      let tableRef = options?.targetRef;
-      delete options.targetRef;
-      let tableWidget = this.getWidgetRef(tableRef);
-      tableWidget.exportData(options);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
-</style>
+<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-dropdown
+      v-if="field.options.exportItemConditionEnabled"
+      trigger="hover"
+      :disabled="field.options.disabled"
+    >
+      <el-button :type="field.options.type" class="button-sty" size="mini">
+        <span>{{ getI18nLabel(field.options.label) }}</span
+        ><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
+      </el-button>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item icon="el-icon-upload2" @click.native="toConditionExport">
+          {{ getI18nLabel("条件导出") }}
+        </el-dropdown-item>
+        <el-dropdown-item icon="el-icon-upload2" @click.native="toSelectedExport">
+          {{ getI18nLabel("选择导出") }}
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+    <el-button
+      v-else
+      :type="field.options.type"
+      class="button-sty"
+      size="mini"
+      icon="el-icon-upload2"
+      @click="toSelectedExport"
+      :disabled="field.options.disabled"
+      >{{ getI18nLabel(field.options.label) }}
+    </el-button>
+  </static-content-wrapper>
+</template>
+<script>
+import emitter from "../../../utils/emitter";
+import i18n from "../../../utils/i18n";
+import fieldMixin from "./fieldMixin";
+import StaticContentWrapper from "./static-content-wrapper.vue";
+import { EXPORT_TYPE } from "../../../../excelExport/exportType";
+
+export default {
+  name: "select-export-item-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 {};
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList();
+    this.initEventHandler();
+
+    this.handleOnCreated();
+  },
+
+  mounted() {
+    this.handleOnMounted();
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+
+  methods: {
+    /** 明细·条件导出：按当前搜索条件导出，无需勾选。仅在开启「支持条件导出」时可达。 */
+    toConditionExport() {
+      this.toDo(EXPORT_TYPE.ITEM_CONDITION);
+    },
+    /** 明细·选择导出：以勾选行为范围，历史默认行为。 */
+    toSelectedExport() {
+      this.toDo(EXPORT_TYPE.ITEM_SELECTED);
+    },
+    toDo(type = null) {
+      if (this.designState) {
+        return;
+      }
+      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,
+      };
+      let tableExportParam = this.handleCustomEvent(this.field.options.tableExportParam);
+      let options = { ...opt, ...tableExportParam, type: type };
+      let tableRef = options?.targetRef;
+      delete options.targetRef;
+      let tableWidget = this.getWidgetRef(tableRef);
+      tableWidget.exportData(options);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+</style>