cloud-web-corejs 1.0.54-dev.538 → 1.0.54-dev.539

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.538",
+  "version": "1.0.54-dev.539",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/univer/button.vue

@@ -11,9 +11,9 @@
       :visiable.sync="showDialog"
       :data.sync="value"
       title="title"
-      :disabled="disabled"
+      :readonly="readonly"
       @confirm="confirmUniverDialog"
-      :options="options"
+      :univerConfig="univerConfig"
     ></univerDialog>
   </el-button>
 </template>
@@ -27,11 +27,11 @@ export default {
       type: String,
       default: "excel",
     },
-    disabled: {
+    readonly: {
       type: Boolean,
       default: false,
     },
-    options: {
+    univerConfig: {
       type: Object,
       default: () => {},
     },

package/src/components/univer/dialog.vue

@@ -10,10 +10,16 @@
     :title="title"
     custom-class="dialog-style list-dialog dialog-checkbox pd_0"
   >
-    <div class="cont" id="containt">
-      <univer ref="univer" :data="json" v-if="showUniver" :options="options"></univer>
+    <div class="cont" id="containt" :class="{ nfootBtn: readonly }">
+      <univer
+        ref="univer"
+        :data="json"
+        v-if="showUniver"
+        :readonly="readonly"
+        :options="univerConfig"
+      ></univer>
     </div>
-    <span slot="footer" class="dialog-footer" v-if="!disabled">
+    <span slot="footer" class="dialog-footer" v-if="!readonly">
       <el-button type="primary" plain class="button-sty" @click="close">
         <i class="el-icon-close el-icon"></i>
         {{ $t2("取 消", "system.button.cancel2") }}
@@ -39,11 +45,11 @@ export default {
       type: String,
       default: "excel",
     },
-    disabled: {
+    readonly: {
       type: Boolean,
       default: false,
     },
-    options: {
+    univerConfig: {
       type: Object,
       default: () => {},
     },

package/src/components/univer/index.js

@@ -1,3 +1,95 @@
+import Vue from 'vue';
+import dialogComponent from './dialog.vue';
+
 export { default as univerSheet } from "./univerSheet.vue";
 export { default as asuniverDialog } from "./dialog.vue";
 export { default as asuniverButton } from "./button.vue";
+
+/**
+ * 打开univerDialog对话框
+ * @param {Object} options - 对话框配置选项
+ * @param {Boolean} options.visiable - 是否可见
+ * @param {String} options.data - Excel数据（JSON字符串）
+ * @param {String} options.title - 对话框标题
+ * @param {Boolean} options.readonly - 是否只读
+ * @param {Object} options.options - univer配置选项
+ * @param {Function} options.onConfirm - 确认回调函数
+ * @param {Function} options.onClose - 关闭回调函数
+ * @returns {Object} 对话框实例，包含close方法
+ */
+export function openUniverSheetDialog(options = {}) {
+  const {
+    visiable = true,
+    data = '',
+    title = 'excel',
+    readonly = false,
+    onConfirm,
+    onClose,
+    univerConfig = {},
+  } = options;
+
+  // 创建组件实例
+  const DialogConstructor = Vue.extend(dialogComponent);
+  const instance = new DialogConstructor({
+    propsData: {
+      visiable,
+      data,
+      title,
+      readonly,
+      univerConfig: univerConfig,
+    }
+  });
+
+  // 挂载组件
+  instance.$mount();
+  document.body.appendChild(instance.$el);
+
+  // 定义销毁函数
+  const destroyDialog = () => {
+    // 延迟销毁，确保动画完成
+    setTimeout(() => {
+      // 从DOM中移除
+      if (instance.$el && instance.$el.parentNode) {
+        instance.$el.parentNode.removeChild(instance.$el);
+      }
+      // 销毁组件实例
+      instance.$destroy();
+    }, 300);
+  };
+
+  // 监听确认事件
+  if (onConfirm) {
+    instance.$on('confirm', (result) => {
+      onConfirm(result);
+      // 确认后也需要销毁
+      destroyDialog();
+    });
+  } else {
+    // 如果没有传入onConfirm，也要确保确认后销毁
+    instance.$on('confirm', destroyDialog);
+  }
+
+  // 监听关闭事件
+  if (onClose) {
+    instance.$on('update:visiable', (value) => {
+      if (!value) {
+        onClose();
+        // 关闭后销毁
+        destroyDialog();
+      }
+    });
+  } else {
+    // 如果没有传入onClose，也要确保关闭后销毁
+    instance.$on('update:visiable', (value) => {
+      if (!value) destroyDialog();
+    });
+  }
+
+  // 返回实例，允许外部控制
+  return {
+    instance,
+    close: () => {
+      instance.close();
+    }
+  };
+}

package/src/components/univer/univerSheet.vue

@@ -15,8 +15,6 @@ 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";
@@ -32,12 +30,11 @@ 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";
+import "@univerjs/preset-sheets-drawing/lib/index.css";
 
 export default {
   name: "univerSheet",
@@ -46,6 +43,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
     options: {
       type: Object,
       default: () => {},
@@ -70,38 +71,50 @@ export default {
   methods: {
     initStyle() {},
     init() {
+      // 基础国际化文件
+      const localeFiles = [
+        sheetsCoreZhCN,
+        SheetsSortZhCN,
+        UniverPresetSheetsFilterZhCN,
+        sheetsConditionalFormattingZhCN,
+        sheetsDataValidationZhCN,
+        UniverPresetSheetsFindReplaceZhCN,
+        sheetsHyperLinkZhCN,
+        SheetsCrosshairHighlightZhCN,
+        SheetsZenEditorZhCN,
+      ];
+
+      // 基础预设
+      const presets = [
+        UniverSheetsCorePreset({
+          container: this.$refs.container,
+          menu: {
+            "sheet.contextMenu.permission": {
+              hidden: true,
+            },
+          },
+        }),
+        UniverSheetsFindReplacePreset(),
+        UniverSheetsSortPreset(),
+        UniverSheetsFilterPreset(),
+        UniverSheetsConditionalFormattingPreset(),
+        UniverSheetsDataValidationPreset(),
+        UniverSheetsFilterPreset(),
+        UniverSheetsHyperLinkPreset(),
+      ];
+
+      // 根据options.enableImage参数条件性添加图片相关功能
+      if (this.options?.enableImage) {
+        localeFiles.push(sheetsDrawingZhCN);
+        presets.push(UniverSheetsDrawingPreset());
+      }
+
       const { univer, univerAPI } = createUniver({
         locale: LocaleType.ZH_CN,
         locales: {
-          [LocaleType.ZH_CN]: mergeLocales(
-            sheetsCoreZhCN,
-            SheetsSortZhCN,
-            UniverPresetSheetsFilterZhCN,
-            sheetsConditionalFormattingZhCN,
-            sheetsDataValidationZhCN,
-            UniverPresetSheetsFindReplaceZhCN,
-            sheetsDrawingZhCN,
-            sheetsHyperLinkZhCN,
-            UniverPresetSheetsThreadCommentZhCN,
-            SheetsCrosshairHighlightZhCN,
-            SheetsZenEditorZhCN
-          ),
+          [LocaleType.ZH_CN]: mergeLocales(...localeFiles),
         },
-        presets: [
-          UniverSheetsCorePreset({
-            container: this.$refs.container,
-            // zIndex: 3000,
-          }),
-          UniverSheetsFindReplacePreset(),
-          UniverSheetsSortPreset(),
-          UniverSheetsFilterPreset(),
-          UniverSheetsConditionalFormattingPreset(),
-          UniverSheetsDataValidationPreset(),
-          UniverSheetsDrawingPreset(),
-          UniverSheetsFilterPreset(),
-          UniverSheetsHyperLinkPreset(),
-          UniverSheetsThreadCommentPreset(),
-        ],
+        presets,
         plugins: [
           /* [
             UniverWatermarkPlugin,
@@ -133,13 +146,25 @@ export default {
 
       this.univerInstance = univer;
       this.univerAPIInstance = univerAPI;
+
+      // 获取工作表
+      const worksheets = this.workbook.getSheets();
+
+      this.$nextTick(() => {
+        const fWorkbook = univerAPI.getActiveWorkbook();
+        const permission = fWorkbook.getWorkbookPermission();
+        if (this.readonly) {
+          // 设置为只读模式
+          permission.setMode("viewer");
+          permission.setPoint(univerAPI.Enum.WorkbookPermissionPoint.CopyContent, true);
+        }
+      });
     },
     async getValue() {
       const fWorkbook = this.univerAPIInstance.getActiveWorkbook();
       await fWorkbook.endEditingAsync(true);
       const snapshot = fWorkbook.save();
       return snapshot;
-      // return this.workbook.save();
     },
   },
 };
@@ -161,7 +186,12 @@ export default {
 }
 </style>
 <style>
-div[data-radix-popper-content-wrapper] {
+div[data-radix-popper-content-wrapper],
+.univer-popup.univer-popup-enter-done,
+.univer-menu-submenu,
+[data-u-comp="rect-popup"],
+.univer-grid,
+div[role="tooltip"] {
   z-index: 999999 !important;
 }
 </style>