cloud-web-corejs 1.0.54-dev.533 → 1.0.54-dev.535

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.533",
+  "version": "1.0.54-dev.535",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",
@@ -16,6 +16,12 @@
     "publishDev": "npm publish --tag dev"
   },
   "dependencies": {
+    "@univerjs/preset-sheets-core": "^0.15.0",
+    "@univerjs/preset-sheets-drawing": "^0.15.0",
+    "@univerjs/presets": "^0.15.0",
+    "@univerjs/sheets-crosshair-highlight": "^0.15.0",
+    "@univerjs/sheets-zen-editor": "^0.15.0",
+    "@univerjs/watermark": "^0.15.0",
     "@codemirror/lang-javascript": "^6.1.9",
     "@formulajs/formulajs": "^4.3.1",
     "@vue/preload-webpack-plugin": "^2.0.0",
@@ -152,6 +158,7 @@
     "src/components/table",
     "src/components/tempStorage",
     "src/components/Tinymce",
+    "src/components/univer",
     "src/components/obsUpload",
     "src/components/VabUpload",
     "src/components/vb-tabs",

package/src/components/excelExport/exportFieldDialog.vue

@@ -42,6 +42,7 @@
   </el-dialog>
 </template>
 <script>
+import xeUtils from "xe-utils";
 export default {
   name: "exportFieldDialog",
   props: ["param"],
@@ -75,14 +76,76 @@ export default {
         Math.random() * 100000 + Math.random() * 20000 + Math.random() * 5000
       );
     },
+    filterExportVisible(items) {
+      if (!Array.isArray(items)) return [];
+
+      return items
+        .filter((item) => item.exportItemVisible === true) // 只保留 exportItemVisible 严格等于 true 的项
+        .map((item) => {
+          // 如果有 children，递归过滤
+          if (Array.isArray(item.children)) {
+            return {
+              ...item,
+              children: this.filterExportVisible(item.children),
+            };
+          }
+          return item;
+        });
+    },
     init() {
       let target = this.getGrid();
-      let { fullColumn, collectColumn: columns } = target.getTableColumn();
+      let { fullColumn, collectColumn: column1s } = target.getTableColumn();
+
+      let checkMethod = target.$refs.xTable.customOpts?.checkMethod;
+      // var checkMethod = $xetable ? $xetable.customOpts.checkMethod : null;
       // let columns = target.getTableColumn().collectColumn;
+      let columns = [];
+      let allFields = [];
+      if (checkMethod) {
+        const handleColumnVisible = (column) => {
+          if (!column.title) return false;
+          let visible = true;
+
+          let isColGroup = column.children && column.children.length;
+
+          if (isColGroup) {
+            // 如果是分组字段，则根据子字段的显示状态来处理
+            let parentVisible = false;
+            column.children.forEach((item) => {
+              let itemVisible = handleColumnVisible(item);
+              if (itemVisible) {
+                parentVisible = true;
+              }
+            });
+            visible = parentVisible;
+            /* visible = column.children.some((item) => {
+              return handleColumnVisible(item);
+            }); */
+          } else {
+            let isDisabled = !checkMethod({
+              column: column,
+            });
+            if (isDisabled) {
+              // 如果字段被禁用勾选，根据显示状态来处理
+              visible = column.visible;
+            }
+            if (column.field && visible) {
+              allFields.push(column.field);
+            }
+          }
+          column.exportItemVisible = visible;
+          return visible;
+        };
+        column1s.forEach((column) => {
+          return handleColumnVisible(column);
+        });
+        columns = this.filterExportVisible(column1s);
+      } else {
+        columns = column1s;
+      }
 
       let exportItem = this.param.type === "exportItem";
 
-      let allFields = [];
       let defaultCheckedKeys = [];
       let cols = [];
 
@@ -92,6 +155,7 @@ export default {
       let exportColumns = !exportItem
         ? target.exportColumns || []
         : target.exportItemColumns || [];
+      debugger;
 
       this.loopColumnHandle(exportColumns, (item) => {
         if (item.field) {
@@ -113,7 +177,6 @@ export default {
             } else if (!noFields.includes(column.field) && column.visible) {
               defaultCheckedKeys.push(column.id);
             }
-            allFields.push(column.field);
           }
         });
         columns.forEach((column) => {
@@ -129,13 +192,13 @@ export default {
 
         this.loopColumnHandle(oriExportItemColumns, (item) => {
           item.id = this.generateId();
-          if (item.field) {
+          if (item.field && allFields.includes(item.field)) {
             if (yesFields.includes(item.field)) {
               defaultCheckedKeys.push(item.id);
             } else if (!noFields.includes(item.field)) {
               defaultCheckedKeys.push(item.id);
             }
-            allFields.push(item.field);
+            // allFields.push(item.field);
           }
         });
         oriExportItemColumns.forEach((column) => {
@@ -197,9 +260,8 @@ export default {
           });
           $grid.exportItemColumns = exportItemColumns;
         }
-
-        this.$vxeTableUtil.addTableJson(originOption.vue, $grid, originOption.tableName);
       }
+      this.$vxeTableUtil.addTableJson(originOption.vue, $grid, originOption.tableName);
     },
     handleBeforeClose(hide) {
       // this.$emit('cancel');

package/src/components/table/index.js

@@ -825,6 +825,7 @@ function addTableJson(that, $grid, tableName, columns, success) {
   }
   let json = encodeURIComponent(JSON.stringify(jsonData));
 
+  debugger
   var url = USER_PREFIX + "/table_column/addTableJson";
   var data = {
     tableName: tableName,

package/src/components/univer/index.vue

@@ -0,0 +1,161 @@
+<script>
+import { UniverSheetsConditionalFormattingPreset } from "@univerjs/preset-sheets-conditional-formatting";
+import sheetsConditionalFormattingZhCN from "@univerjs/preset-sheets-conditional-formatting/locales/zh-CN";
+import { UniverSheetsCorePreset } from "@univerjs/preset-sheets-core";
+import sheetsCoreZhCN from "@univerjs/preset-sheets-core/locales/zh-CN";
+import { UniverSheetsDataValidationPreset } from "@univerjs/preset-sheets-data-validation";
+import sheetsDataValidationZhCN from "@univerjs/preset-sheets-data-validation/locales/zh-CN";
+import { UniverSheetsDrawingPreset } from "@univerjs/preset-sheets-drawing";
+import sheetsDrawingZhCN from "@univerjs/preset-sheets-drawing/locales/zh-CN";
+import { UniverSheetsFilterPreset } from "@univerjs/preset-sheets-filter";
+import UniverPresetSheetsFilterZhCN from "@univerjs/preset-sheets-filter/locales/zh-CN";
+import { UniverSheetsFindReplacePreset } from "@univerjs/preset-sheets-find-replace";
+import UniverPresetSheetsFindReplaceZhCN from "@univerjs/preset-sheets-find-replace/locales/zh-CN";
+import { UniverSheetsHyperLinkPreset } from "@univerjs/preset-sheets-hyper-link";
+import sheetsHyperLinkZhCN from "@univerjs/preset-sheets-hyper-link/locales/zh-CN";
+import { UniverSheetsSortPreset } from "@univerjs/preset-sheets-sort";
+import SheetsSortZhCN from "@univerjs/preset-sheets-sort/locales/zh-CN";
+import { UniverSheetsThreadCommentPreset } from "@univerjs/preset-sheets-thread-comment";
+import UniverPresetSheetsThreadCommentZhCN from "@univerjs/preset-sheets-thread-comment/locales/zh-CN";
+import { createUniver, LocaleType, mergeLocales } from "@univerjs/presets";
+import { UniverSheetsCrosshairHighlightPlugin } from "@univerjs/sheets-crosshair-highlight";
+import SheetsCrosshairHighlightZhCN from "@univerjs/sheets-crosshair-highlight/locale/zh-CN";
+import { UniverSheetsZenEditorPlugin } from "@univerjs/sheets-zen-editor";
+import SheetsZenEditorZhCN from "@univerjs/sheets-zen-editor/locale/zh-CN";
+// import { UniverWatermarkPlugin } from "@univerjs/watermark";
+
+// import { WORKBOOK_DATA } from "./data";
+
+// import "./styles.css";
+import "@univerjs/preset-sheets-core/lib/index.css";
+import "@univerjs/preset-sheets-sort/lib/index.css";
+import "@univerjs/preset-sheets-filter/lib/index.css";
+import "@univerjs/preset-sheets-conditional-formatting/lib/index.css";
+import "@univerjs/preset-sheets-data-validation/lib/index.css";
+import "@univerjs/preset-sheets-drawing/lib/index.css";
+import "@univerjs/preset-sheets-hyper-link/lib/index.css";
+import "@univerjs/preset-sheets-find-replace/lib/index.css";
+import "@univerjs/preset-sheets-thread-comment/lib/index.css";
+import "@univerjs/sheets-zen-editor/lib/index.css";
+import "@univerjs/sheets-crosshair-highlight/lib/index.css";
+
+export default {
+  props: {
+    data: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      univerInstance: null,
+      univerAPIInstance: null,
+      workbook: null,
+    };
+  },
+  mounted() {
+    this.init();
+  },
+  beforeUnmount() {
+    this.univerInstance?.dispose();
+    this.univerAPIInstance?.dispose();
+    this.univerInstance = null;
+    this.univerAPIInstance = null;
+  },
+  methods: {
+    initStyle() {},
+    init() {
+      const { univer, univerAPI } = createUniver({
+        locale: LocaleType.ZH_CN,
+        locales: {
+          [LocaleType.ZH_CN]: mergeLocales(
+            sheetsCoreZhCN,
+            SheetsSortZhCN,
+            UniverPresetSheetsFilterZhCN,
+            sheetsConditionalFormattingZhCN,
+            sheetsDataValidationZhCN,
+            UniverPresetSheetsFindReplaceZhCN,
+            sheetsDrawingZhCN,
+            sheetsHyperLinkZhCN,
+            UniverPresetSheetsThreadCommentZhCN,
+            SheetsCrosshairHighlightZhCN,
+            SheetsZenEditorZhCN
+          ),
+        },
+        presets: [
+          UniverSheetsCorePreset({
+            container: this.$refs.container,
+            // zIndex: 3000,
+          }),
+          UniverSheetsFindReplacePreset(),
+          UniverSheetsSortPreset(),
+          UniverSheetsFilterPreset(),
+          UniverSheetsConditionalFormattingPreset(),
+          UniverSheetsDataValidationPreset(),
+          UniverSheetsDrawingPreset(),
+          UniverSheetsFilterPreset(),
+          UniverSheetsHyperLinkPreset(),
+          UniverSheetsThreadCommentPreset(),
+        ],
+        plugins: [
+          /* [
+            UniverWatermarkPlugin,
+            {
+              textWatermarkSettings: {
+                content: "Hello, Univer!",
+                fontSize: 16,
+                color: "rgb(0,0,0)",
+                bold: false,
+                italic: false,
+                direction: "ltr",
+                x: 60,
+                y: 36,
+                repeat: true,
+                spacingX: 200,
+                spacingY: 100,
+                rotate: 0,
+                opacity: 0.15,
+              },
+            },
+          ], */
+          UniverSheetsCrosshairHighlightPlugin,
+          UniverSheetsZenEditorPlugin,
+        ],
+      });
+
+      // univerAPI.createWorkbook(WORKBOOK_DATA);
+      this.workbook = univerAPI.createWorkbook(this.data);
+
+      this.univerInstance = univer;
+      this.univerAPIInstance = univerAPI;
+    },
+    getValue() {
+      const fWorkbook = this.univerAPIInstance.getActiveWorkbook();
+      const snapshot = fWorkbook.save();
+      return snapshot;
+      // return this.workbook.save();
+    },
+  },
+};
+</script>
+
+<template>
+  <div id="univer" ref="container" />
+</template>
+
+<style scoped>
+#univer {
+  height: 100%;
+  margin: 0;
+  padding: 0;
+}
+::v-deep aside.univer-h-full {
+  padding-left: 0;
+  padding-right: 0;
+}
+</style>
+<style>
+div[data-radix-popper-content-wrapper] {
+  z-index: 999999 !important;
+}
+</style>

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

@@ -0,0 +1,184 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    v-el-drag-dialog
+    v-el-dialog-center
+    v-bind="dialogConfig"
+    :fullscreen="true"
+    @close="close"
+  >
+    <div class="cont designer-view" v-bind="bodyConfig" id="containt">
+      <univer ref="univer" :data="option.data"></univer>
+    </div>
+    <span
+      slot="footer"
+      class="dialog-footer"
+      v-if="option.showFooter !== false"
+      v-bind="option.footerConfig"
+    >
+      <el-button type="primary" plain class="button-sty" @click="close">
+        <i class="el-icon-close el-icon"></i>
+        {{ $t2("取 消", "system.button.cancel2") }}
+      </el-button>
+      <el-button type="primary" @click="dialogSubmit" class="button-sty">
+        <i class="el-icon-check el-icon"></i>
+        {{ $t2("确 定", "system.button.confirm2") }}
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import univer from "@base/components/univer";
+
+export default {
+  // name: "vabSearchDialog",
+  components: { univer },
+  props: {
+    visiable: Boolean,
+    option: Object,
+  },
+  mixins: [],
+  inject: ["getFormConfig"],
+
+  mounted() {},
+  data() {
+    var that = this;
+    return {
+      showFormField: "_tt",
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+
+      formJson: {},
+      formData: {},
+      optionData: {},
+      showRender: false,
+      formTemplate: {},
+      /*      formCode: null,*/
+      layoutType: null,
+      conditionParam: null,
+      formInsData: null,
+      $grid: null,
+      currentLayoutType: null,
+      dataId: null,
+      formConfig: {},
+    };
+  },
+  computed: {
+    formCode() {
+      return this.option.formCode;
+    },
+    dialogParam() {
+      return this.option?.param;
+    },
+    /* formConfig() {
+      return this.option?.formConfig;
+    }, */
+    dialogConfig() {
+      let customClass = "dialog-style list-dialog dialog-checkbox pd_0";
+      if (this.option.dialogConfig?.customClass) {
+        customClass = customClass + " " + this.option.dialogConfig.customClass;
+      }
+      let config = {
+        title: this.formTemplate.formName,
+        appendToBody: true,
+        modalAppendToBody: true,
+        // appendToBody: false,
+        // modalAppendToBody: false,
+        closeOnClickModal: false,
+        modal: false,
+        width: "1200px",
+        fullscreen: this.option.fullscreen,
+      };
+      config = Object.assign({}, config, this.option.dialogConfig, { customClass });
+      config.title = this.$t1(config.title);
+      return config;
+    },
+    bodyConfig() {
+      let config = {};
+      let classStr = this.currentLayoutType;
+      if (this.option.bodyConfig?.class) {
+        classStr = classStr + " " + this.option.bodyConfig.class;
+      }
+      if (this.option.showFooter == false) {
+        classStr = classStr + " nfootBtn";
+      }
+      config = Object.assign({}, config, this.option.bodyConfig, { class: classStr });
+      return config;
+    },
+  },
+  created() {
+    this.formConfig = this.option?.formConfig || {};
+
+    let currentFormConfig = this.getFormConfig();
+    this.currentLayoutType = currentFormConfig.layoutType;
+  },
+  methods: {
+    reload(e, option) {
+      let updateParam = option?.updateParam || {};
+      if (this.formConfig) Object.assign(this.formConfig, updateParam);
+      this.showRender = false;
+    },
+
+    close() {
+      let univerRef = this.$refs.univer;
+      this.showDialog = false;
+      this.$emit("update:visiable", false);
+      this.option.close && this.option.close(univerRef, this);
+    },
+    dialogSubmit() {
+      let univerRef = this.$refs.univer;
+      if (this.option.confirm) {
+        let excelJson = this.$refs.univer.getValue();
+        if (this.option.confirm(excelJson, univerRef, this) !== false) {
+          this.close();
+        }
+      } else {
+        this.close();
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .H5 .h5-fixed-bottom-btns {
+  bottom: 95px;
+}
+
+.list-dialog {
+  .el-dialog__body {
+    height: calc(100% - 42px);
+    .cont {
+      height: calc(100vh - 210px);
+
+      &.nfootBtn {
+        height: calc(100vh - 158px);
+      }
+      &#containt {
+        padding: 0;
+        ::v-deep .grid-container {
+          outline: none;
+          &.detail-wrap .d-cont {
+            height: calc(100vh - 150px);
+            .title .field-wrapper {
+              display: inline-block !important;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  &.is-fullscreen .el-dialog__body {
+    .cont {
+      height: calc(100vh - 110px);
+
+      &.nfootBtn {
+        height: calc(100vh - 58px);
+      }
+    }
+  }
+}
+</style>