cloud-web-corejs 1.0.276 → 1.0.277

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

@@ -1,125 +1,129 @@
-<template>
-  <container-item-wrapper
-    :widget="widget"
-    :class="widget.options.isFullscreen ? 'full-height' : ''"
-  >
-    <div :key="widget.id" class="tab-container mHeight" v-show="!widget.options.hidden">
-      <el-tabs
-        v-model="activeTabName"
-        :type="widget.displayType"
-        :ref="widget.id"
-        :class="[customClass, widget.options.tabClass]"
-        :style="{
-          height: widget.options.isFullscreen ? '' : widget.options.height || '300px',
-        }"
-      >
-        <el-tab-pane
-          v-for="tab in visibleTabs"
-          :key="tab.options.name"
-          :label="getI18nLabel(tab.options.label)"
-          :disabled="tab.options.disabled"
-          :name="tab.options.name"
-        >
-          <template v-for="(subWidget, swIdx) in tab.widgetList">
-            <template v-if="'container' === subWidget.category">
-              <component
-                :is="subWidget.type + '-item'"
-                :widget="subWidget"
-                :key="subWidget.id || swIdx"
-                :parent-list="tab.widgetList"
-                :index-of-parent-list="swIdx"
-                :parent-widget="widget"
-                :tableParam="tableParam"
-                :formItemProp="formItemProp"
-              >
-                <!-- 递归传递插槽！！！ -->
-                <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                  <slot :name="slot" v-bind="scope" />
-                </template>
-              </component>
-            </template>
-            <template v-else>
-              <component
-                :is="subWidget.type + '-widget'"
-                :field="subWidget"
-                :key="subWidget.id || swIdx"
-                :parent-list="tab.widgetList"
-                :index-of-parent-list="swIdx"
-                :parent-widget="widget"
-                :tableParam="tableParam"
-                :formItemProp="formItemProp"
-              >
-                <!-- 递归传递插槽！！！ -->
-                <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                  <slot :name="slot" v-bind="scope" />
-                </template>
-              </component>
-            </template>
-          </template>
-        </el-tab-pane>
-      </el-tabs>
-    </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 FieldComponents from "../../../../components/xform/form-designer/form-widget/field-widget/index";
-
-export default {
-  name: "tab-item",
-  componentName: "ContainerItem",
-  mixins: [emitter, i18n, refMixin, containerItemMixin],
-  components: {
-    ContainerItemWrapper,
-    ...FieldComponents,
-  },
-  props: {
-    widget: Object,
-  },
-  inject: ["refList", "sfRefList", "globalModel"],
-  data() {
-    return {
-      activeTabName: "",
-    };
-  },
-  computed: {
-    visibleTabs() {
-      return this.widget.tabs.filter((tp) => {
-        return !tp.options.hidden;
-      });
-    },
-  },
-  created() {
-    this.initRefList();
-  },
-  mounted() {
-    this.initActiveTab();
-  },
-  beforeDestroy() {
-    this.unregisterFromRefList();
-  },
-  methods: {
-    initActiveTab() {
-      if (this.widget.type === "tab" && this.widget.tabs.length > 0) {
-        let activePanes = this.widget.tabs.filter((tp) => {
-          return tp.options.active === true;
-        });
-        if (activePanes.length > 0) {
-          this.activeTabName = activePanes[0].options.name;
-        } else {
-          this.activeTabName = this.widget.tabs[0].options.name;
-        }
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-  ::v-deep .mHeight .el-tabs .el-tabs__content{min-height:312px}
-</style>
+<template>
+  <container-item-wrapper
+    :widget="widget"
+    :class="widget.options.isFullscreen ? 'full-height' : ''"
+  >
+    <div :key="widget.id" class="tab-container mHeight" v-show="!widget.options.hidden">
+      <!-- 高度默认 auto(跟随内容)：没在属性面板配 height 就不设。
+           原来兜底成固定 300px，内容多了内部滚动、少了留白，装详情内容模块时尤其别扭 -->
+      <el-tabs
+        v-model="activeTabName"
+        :type="widget.displayType"
+        :ref="widget.id"
+        :class="[customClass, widget.options.tabClass]"
+        :style="{
+          height: widget.options.isFullscreen ? '' : widget.options.height,
+        }"
+      >
+        <el-tab-pane
+          v-for="tab in visibleTabs"
+          :key="tab.options.name"
+          :label="getI18nLabel(tab.options.label)"
+          :disabled="tab.options.disabled"
+          :name="tab.options.name"
+        >
+          <template v-for="(subWidget, swIdx) in tab.widgetList">
+            <template v-if="'container' === subWidget.category">
+              <component
+                :is="subWidget.type + '-item'"
+                :widget="subWidget"
+                :key="subWidget.id || swIdx"
+                :parent-list="tab.widgetList"
+                :index-of-parent-list="swIdx"
+                :parent-widget="widget"
+                :tableParam="tableParam"
+                :formItemProp="formItemProp"
+              >
+                <!-- 递归传递插槽！！！ -->
+                <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+                  <slot :name="slot" v-bind="scope" />
+                </template>
+              </component>
+            </template>
+            <template v-else>
+              <component
+                :is="subWidget.type + '-widget'"
+                :field="subWidget"
+                :key="subWidget.id || swIdx"
+                :parent-list="tab.widgetList"
+                :index-of-parent-list="swIdx"
+                :parent-widget="widget"
+                :tableParam="tableParam"
+                :formItemProp="formItemProp"
+              >
+                <!-- 递归传递插槽！！！ -->
+                <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+                  <slot :name="slot" v-bind="scope" />
+                </template>
+              </component>
+            </template>
+          </template>
+        </el-tab-pane>
+      </el-tabs>
+    </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 FieldComponents from "../../../../components/xform/form-designer/form-widget/field-widget/index";
+
+export default {
+  name: "tab-item",
+  componentName: "ContainerItem",
+  mixins: [emitter, i18n, refMixin, containerItemMixin],
+  components: {
+    ContainerItemWrapper,
+    ...FieldComponents,
+  },
+  props: {
+    widget: Object,
+  },
+  inject: ["refList", "sfRefList", "globalModel"],
+  data() {
+    return {
+      activeTabName: "",
+    };
+  },
+  computed: {
+    visibleTabs() {
+      return this.widget.tabs.filter((tp) => {
+        return !tp.options.hidden;
+      });
+    },
+  },
+  created() {
+    this.initRefList();
+  },
+  mounted() {
+    this.initActiveTab();
+  },
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+  methods: {
+    initActiveTab() {
+      if (this.widget.type === "tab" && this.widget.tabs.length > 0) {
+        let activePanes = this.widget.tabs.filter((tp) => {
+          return tp.options.active === true;
+        });
+        if (activePanes.length > 0) {
+          this.activeTabName = activePanes[0].options.name;
+        } else {
+          this.activeTabName = this.widget.tabs[0].options.name;
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+  /* 内容区高度跟随内容。原来写死 min-height:312px，会把上面 height:auto 的效果整个抵消掉
+     （无论内容多少都至少 312px）。这里只留一个小兜底，保证空标签页不塌成一条线。 */
+  ::v-deep .mHeight .el-tabs .el-tabs__content{min-height:60px}
+</style>

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

@@ -53,9 +53,6 @@ export default {
   },
   created() {
     this.initRefList()
-  },
-  mounted() {
-
   },
   beforeDestroy() {
     this.unregisterFromRefList()

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

@@ -207,13 +207,26 @@ export default {
       this.widget.rows.length = 0;
       this.widget.rows.push(...widgetRows);
     },
+    /**
+     * 构造表单脚本请求的 data 参数（通用）。
+     * 勾选"请求去掉data层"(removeDataLevel)时，内层参数平铺到外层，不再包一层 data。
+     */
+    buildFormScriptData(reportTemplate, innerData, taBm) {
+      let base = {
+        formCode: reportTemplate.formCode,
+        formVersion: reportTemplate.formVersion,
+        taBm: taBm || this.fieldKeyName,
+      };
+      return this.widget.options.removeDataLevel
+        ? { ...base, ...(innerData || {}) }
+        : { ...base, data: innerData || {} };
+    },
     loadDataDefaultHandle(flag) {
       // this.init();
       // return
       let dataId = this.formDataId;
       if (flag !== true && !dataId) return;
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.widget.options.formScriptEnabled || false;
       let scriptCode = this.widget.options.formScriptCode;
       if (!scriptCode) return;
@@ -222,15 +235,10 @@ export default {
       );
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            id: dataId,
-            ...accessParam,
-          },
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          id: dataId,
+          ...accessParam,
+        }),
         success: (res) => {
           let rows = res.objx || [];
           this.handleCustomEvent(

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

@@ -1,9 +1,9 @@
-import i18n from '../../../components/xform/utils/i18n';
+import i18n from "../../../components/xform/utils/i18n";
 
-let modules = {}
+let modules = {};
 const baseRefUtil = {
-  i18n
-}
+  i18n,
+};
 modules = {
   name: "dynamic-dialog",
   mixins: [baseRefUtil.i18n],
@@ -12,64 +12,64 @@ modules = {
       type: Object,
       default: function () {
         return {};
-      }
+      },
     },
     formJson: {
-      type: Object
+      type: Object,
     },
     formData: {
       type: Object,
       default: function () {
         return {};
-      }
+      },
     },
     optionData: {
       type: Object,
       default: function () {
         return {};
-      }
+      },
     },
     globalDsv: {
       type: Object,
       default: function () {
         return {};
-      }
+      },
     },
     parentFormRef: {
       type: Object,
-      default: null
-    }
+      default: null,
+    },
   },
   data: function () {
     return {
-      dialogVisible: !1
-    }
+      dialogVisible: !1,
+    };
   },
   computed: {
     cancelBtnLabel: function () {
-      return this.options.cancelButtonLabel || this.i18nt("designer.hint.cancel");
+      return (
+        this.options.cancelButtonLabel || this.i18nt("designer.hint.cancel")
+      );
     },
     okBtnLabel: function () {
       return this.options.okButtonLabel || this.i18nt("designer.hint.confirm");
-    }
-  },
-  mounted: function () {
+    },
   },
+  mounted: function () {},
   methods: {
     show: function () {
       var e = this;
-      this.dialogVisible = !0,
-        this.$nextTick((function () {
+      (this.dialogVisible = !0),
+        this.$nextTick(function () {
           e.options.readMode && e.$refs["dFormRef"].setReadMode(!0),
             e.$refs["dFormRef"].setDialogOrDrawerRef(e);
-        }));
+        });
     },
     close: function () {
       if (this.options.onDialogBeforeClose) {
         var e = new Function("done", this.options.onDialogBeforeClose),
           t = e.call(this);
-        if (!1 === t)
-          return;
+        if (!1 === t) return;
       }
       this.$destroy();
     },
@@ -94,8 +94,7 @@ modules = {
       if (this.options.onCancelButtonClick) {
         var e = new Function(this.options.onCancelButtonClick),
           t = e.call(this);
-        if (!1 === t)
-          return;
+        if (!1 === t) return;
       }
       this.$destroy();
     },
@@ -103,8 +102,7 @@ modules = {
       if (this.options.onOkButtonClick) {
         var e = new Function(this.options.onOkButtonClick),
           t = e.call(this);
-        if (!1 === t)
-          return;
+        if (!1 === t) return;
       }
       this.$destroy();
     },
@@ -117,83 +115,126 @@ modules = {
     getWidgetRef: function (e) {
       var t = arguments.length > 1 && void 0 !== arguments[1] && arguments[1];
       return this.$refs["dFormRef"].getWidgetRef(e, t);
-    }
+    },
   },
   render: function (i) {
     let e = this;
-    return i("el-dialog", {
-      directives: [{
-        name: "dialog-drag",
-        rawName: "v-dialog-drag"
-      }],
-      attrs: {
-        title: e.options.title,
-        visible: e.dialogVisible,
-        "append-to-body": "",
-        "destroy-on-close": "",
-        width: e.options.width,
-        fullscreen: e.options.fullscreen,
-        modal: e.options.showModal,
-        "show-close": e.options.showClose,
-        "close-on-click-modal": e.options.closeOnClickModal,
-        "close-on-press-escape": e.options.closeOnPressEscape,
-        center: e.options.center,
-        "before-close": e.handleBeforeClose,
-        "custom-class": "dialog-style list-dialog"
-      },
-      on: {
-        "update:visible": function (t) {
-          e.dialogVisible = t
-        },
-        close: e.handleCloseEvent,
-        opened: e.handleOpenedEvent
-      }
-    }, [i("div", {
-        staticClass: 'cont',
-      }, [i("VFormRender", {
-        ref: "dFormRef",
+    return i(
+      "el-dialog",
+      {
+        directives: [
+          {
+            name: "dialog-drag",
+            rawName: "v-dialog-drag",
+          },
+        ],
         attrs: {
-          "form-json": e.formJson,
-          "form-data": e.formData,
-          "option-data": e.optionData,
-          "global-dsv": e.globalDsv,
-          "parent-form": e.parentFormRef,
-          "disabled-mode": e.options.disabledMode,
-          "dynamic-creation": !0
-        }
-      })]
-    ), i("span", {
-      staticClass: "dialog-footer",
-      attrs: {
-        slot: "footer"
-      },
-      slot: "footer"
-    }, [e.options.cancelButtonHidden ? "" : i("el-button", {
-      attrs: {
-        class: "button-sty el-button el-button--default el-button--medium is-plain",
-        plain: ""
-      },
-      on: {
-        click: e.handleCancelClick
-      }
-    }, [i("i", {
-      attrs: {
-        class: "el-icon-close el-icon"
-      }
-    }), e.options.cancelButtonLabel]), e.options.okButtonHidden ? "" : i("el-button", {
-      attrs: {
-        type: "primary",
-        class: "button-sty el-button el-button--primary el-button--medium"
+          title: e.options.title,
+          visible: e.dialogVisible,
+          "append-to-body": "",
+          "destroy-on-close": "",
+          width: e.options.width,
+          fullscreen: e.options.fullscreen,
+          modal: e.options.showModal,
+          "show-close": e.options.showClose,
+          "close-on-click-modal": e.options.closeOnClickModal,
+          "close-on-press-escape": e.options.closeOnPressEscape,
+          center: e.options.center,
+          "before-close": e.handleBeforeClose,
+          "custom-class": "dialog-style list-dialog",
+        },
+        on: {
+          "update:visible": function (t) {
+            e.dialogVisible = t;
+          },
+          close: e.handleCloseEvent,
+          opened: e.handleOpenedEvent,
+        },
       },
-      on: {
-        click: e.handleOkClick
-      }
-    }, [i("i", {
-      attrs: {
-        class: "el-icon-check el-icon"
-      }
-    }), e.options.okButtonLabel])], 1)], 1);
-  }
-}
+      [
+        i(
+          "div",
+          {
+            staticClass: "cont",
+          },
+          [
+            i("VFormRender", {
+              ref: "dFormRef",
+              attrs: {
+                "form-json": e.formJson,
+                "form-data": e.formData,
+                "option-data": e.optionData,
+                "global-dsv": e.globalDsv,
+                "parent-form": e.parentFormRef,
+                "disabled-mode": e.options.disabledMode,
+                "dynamic-creation": !0,
+              },
+            }),
+          ]
+        ),
+        i(
+          "span",
+          {
+            staticClass: "dialog-footer",
+            attrs: {
+              slot: "footer",
+            },
+            slot: "footer",
+          },
+          [
+            e.options.cancelButtonHidden
+              ? ""
+              : i(
+                  "el-button",
+                  {
+                    attrs: {
+                      class:
+                        "button-sty el-button el-button--default el-button--medium is-plain",
+                      plain: "",
+                    },
+                    on: {
+                      click: e.handleCancelClick,
+                    },
+                  },
+                  [
+                    i("i", {
+                      attrs: {
+                        class: "el-icon-close el-icon",
+                      },
+                    }),
+                    e.options.cancelButtonLabel,
+                  ]
+                ),
+            e.options.okButtonHidden
+              ? ""
+              : i(
+                  "el-button",
+                  {
+                    attrs: {
+                      type: "primary",
+                      class:
+                        "button-sty el-button el-button--primary el-button--medium",
+                    },
+                    on: {
+                      click: e.handleOkClick,
+                    },
+                  },
+                  [
+                    i("i", {
+                      attrs: {
+                        class: "el-icon-check el-icon",
+                      },
+                    }),
+                    e.options.okButtonLabel,
+                  ]
+                ),
+          ],
+          1
+        ),
+      ],
+      1
+    );
+  },
+};
 
 export default modules;

package/src/components/xform/form-render/index.vue

@@ -77,11 +77,6 @@
       :param="importDialogOption"
       :parentTarget="_self"
     ></importDialog>
-    <formDrawer
-      v-if="showFormDrawer"
-      :visiable.sync="showFormDrawer"
-      :option="formDrawerOption"
-    ></formDrawer>
     <fileReferenceDialog
       v-if="showFileReferenceDialog"
       :visiable.sync="showFileReferenceDialog"
@@ -105,6 +100,11 @@
       :visiable.sync="showUniverDialog"
       :option="univerDialogOption"
     ></univerDialog>
+    <compareDelList
+      v-if="showCompareDelList"
+      :visiable.sync="showCompareDelList"
+      :option="compareDelListOption"
+    ></compareDelList>
   </div>
 </template>
 
@@ -129,12 +129,12 @@ export default {
       import(
         "../../../components/xform/form-designer/form-widget/dialog/importDialog.vue"
       ),
-    formDrawer: () =>
-      import("../../../components/xform/form-designer/form-widget/dialog/formDrawer.vue"),
     fileReferenceDialog: () =>
       import(
         "../../../components/xform/form-designer/form-widget/dialog/fileReferenceDialog.vue"
-      )
+      ),
+    compareDelList: () =>
+      import("../../../components/xform/form-render/compareDelList.vue"),
   },
   mixins: [indexMixin, formDynamicFieldMixin],
 };