npm - cloud-web-corejs - Versions diffs - 1.1.0-dev.6 → 1.1.0-dev.61 - Mend

cloud-web-corejs 1.1.0-dev.6 → 1.1.0-dev.61

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (499) hide show

package/src/components/xform/form-designer/form-widget/field-widget/slider-widget.vue CHANGED Viewed

@@ -91,7 +91,7 @@
 </script>
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
   .full-width-input {
     width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue CHANGED Viewed

@@ -159,7 +159,7 @@ export default {
 </script>
 <style lang="scss" scoped>
-@import "~@/styles/global.scss";
+@import "~@base/styles/theme-variables.scss";
 .design-time-bottom-margin {
   margin-bottom: 5px;

package/src/components/xform/form-designer/form-widget/field-widget/static-text-widget.vue CHANGED Viewed

@@ -83,6 +83,6 @@
 </script>
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/status-widget.vue CHANGED Viewed

@@ -165,5 +165,5 @@ export default {
 </script>
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/switch-widget.vue CHANGED Viewed

@@ -100,7 +100,7 @@
 </script>
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
   .full-width-input {
     width: 100% !important;

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

@@ -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 };
@@ -96,5 +97,5 @@ export default {
 </script>
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/tempStorage-widget.vue CHANGED Viewed

@@ -143,5 +143,5 @@ export default {
 </script>
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/text-widget.vue CHANGED Viewed

@@ -162,7 +162,7 @@ export default {
 </script>
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 ::v-deep .el-form-item {
   min-height: 34px;
 }

package/src/components/xform/form-designer/form-widget/field-widget/textarea-widget.vue CHANGED Viewed

@@ -94,6 +94,6 @@
 </script>
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 </style>

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

@@ -97,7 +97,7 @@
 </script>
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
   .full-width-input {
     width: 100% !important;

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

@@ -125,7 +125,7 @@
 </script>
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
   .full-width-input {
     width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/title-head-widget.vue CHANGED Viewed

@@ -77,6 +77,6 @@
 </script>
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/vabSearch-widget.vue CHANGED Viewed

@@ -30,7 +30,7 @@ export default {
 </script>
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 .full-width-input {
   width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/vabUpload-widget.vue CHANGED Viewed

@@ -32,8 +32,8 @@
       :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"
@@ -314,7 +314,7 @@ export default {
 </script>
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 .full-width-input {
   width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/vabUpload2-widget.vue CHANGED Viewed

@@ -199,6 +199,8 @@ export default {
       imageRows: [],
       chooseIndex: -1,
       showViewer: false,
+      ownedBlobUrls: [],
+      componentDestroyed: false,
     };
   },
   watch: {
@@ -236,10 +238,24 @@ export default {
   },
   beforeDestroy() {
+    this.componentDestroyed = true;
+    this.revokeOwnedBlobUrls();
     this.unregisterFromRefList();
   },
   methods: {
     //begin
+    revokeBlobUrl(url) {
+      if (typeof url === "string" && url.startsWith("blob:")) {
+        window.URL.revokeObjectURL(url);
+        this.ownedBlobUrls = this.ownedBlobUrls.filter((item) => item !== url);
+      }
+    },
+    revokeOwnedBlobUrls() {
+      [...new Set(this.ownedBlobUrls)].forEach((url) =>
+        window.URL.revokeObjectURL(url)
+      );
+      this.ownedBlobUrls = [];
+    },
     closeViewer() {
       this.showViewer = false;
     },
@@ -367,6 +383,7 @@ export default {
         isLoading: true,
         callback: (res, response) => {
           if (res.code === 1000) {
+            this.revokeBlobUrl(attachment.showUrl || attachment.url);
             this.fieldModel.splice(index, 1);
           } else {
             this.$baseAlert(res.message);
@@ -600,6 +617,12 @@ export default {
             };
           } else {
             const blobUrl = window.URL.createObjectURL(res);
+            if (this.componentDestroyed) {
+              window.URL.revokeObjectURL(blobUrl);
+              return;
+            }
+            this.revokeBlobUrl(attachment.showUrl || attachment.url);
+            this.ownedBlobUrls.push(blobUrl);
             attachment.showUrl = blobUrl;
             attachment.url = blobUrl;
             callback && callback();
@@ -610,6 +633,7 @@ export default {
     //end
     setValue(val) {
+      this.revokeOwnedBlobUrls();
       let data = val || [];
       data.forEach((item) => {
         if (!item.hasOwnProperty("showUrl")) {
@@ -728,7 +752,7 @@ export default {
 </script>
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 .full-width-input {
   width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/vue-page-widget.vue CHANGED Viewed

@@ -188,7 +188,7 @@ export default {
 </script>
 <style lang="scss" scoped>
-@import "~@/styles/global.scss";
+@import "~@base/styles/theme-variables.scss";
 .designer-vue-page-container {
   outline: 1px dashed #336699;

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

@@ -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,28 +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();
+        });
       }
     },