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

package/package.json

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

package/src/components/univer/button.vue

@@ -0,0 +1,57 @@
+<template>
+  <el-button
+    @click="openUniverDialog"
+    type="primary"
+    class="button-sty"
+    icon="el-icon-edit"
+  >
+    {{ !!value ? "已维护" : "" }}
+    <univerDialog
+      v-if="showDialog"
+      :visiable.sync="showDialog"
+      :data.sync="value"
+      title="title"
+      :disabled="disabled"
+      @confirm="confirmUniverDialog"
+      :options="options"
+    ></univerDialog>
+  </el-button>
+</template>
+<script>
+import univerDialog from "./dialog.vue";
+export default {
+  name: "univerButton",
+  props: {
+    value: String,
+    title: {
+      type: String,
+      default: "excel",
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    options: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  components: {
+    univerDialog,
+  },
+  data() {
+    return {
+      showDialog: false,
+    };
+  },
+  methods: {
+    openUniverDialog() {
+      this.showDialog = true;
+    },
+    confirmUniverDialog(result) {
+      this.$emit("input", result);
+      this.$emit("change", result);
+    },
+  },
+};
+</script>

package/src/components/univer/dialog.vue

@@ -0,0 +1,123 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :fullscreen="true"
+    @close="close"
+    :appendToBody="true"
+    :modalAppendToBody="true"
+    :closeOnClickModal="false"
+    :modal="false"
+    :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>
+    <span slot="footer" class="dialog-footer" v-if="!disabled">
+      <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 "./univerSheet.vue";
+
+export default {
+  name: "univerDialog",
+  components: { univer },
+  props: {
+    visiable: Boolean,
+    data: String,
+    title: {
+      type: String,
+      default: "excel",
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    options: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  mounted() {},
+  data() {
+    return {
+      showDialog: true,
+      json: {},
+      showUniver: false,
+    };
+  },
+  computed: {},
+  created() {
+    this.init();
+  },
+  methods: {
+    init() {
+      if (this.data) {
+        this.json = JSON.parse(this.data);
+      }
+      this.$nextTick(() => {
+        this.showUniver = true;
+      });
+    },
+    close() {
+      this.showDialog = false;
+      this.$emit("update:visiable", false);
+    },
+    dialogSubmit() {
+      let univerRef = this.$refs.univer;
+      this.$refs.univer.getValue().then((value) => {
+        let result = JSON.stringify(value);
+        this.$emit("confirm", result);
+        this.close();
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.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>

package/src/components/univer/index.js

@@ -0,0 +1,3 @@
+export { default as univerSheet } from "./univerSheet.vue";
+export { default as asuniverDialog } from "./dialog.vue";
+export { default as asuniverButton } from "./button.vue";

package/src/components/univer/{index.vue → univerSheet.vue}

@@ -40,11 +40,16 @@ import "@univerjs/sheets-zen-editor/lib/index.css";
 import "@univerjs/sheets-crosshair-highlight/lib/index.css";
 
 export default {
+  name: "univerSheet",
   props: {
     data: {
       type: Object,
       default: () => {},
     },
+    options: {
+      type: Object,
+      default: () => {},
+    },
   },
   data() {
     return {
@@ -129,8 +134,9 @@ export default {
       this.univerInstance = univer;
       this.univerAPIInstance = univerAPI;
     },
-    getValue() {
+    async getValue() {
       const fWorkbook = this.univerAPIInstance.getActiveWorkbook();
+      await fWorkbook.endEditingAsync(true);
       const snapshot = fWorkbook.save();
       return snapshot;
       // return this.workbook.save();

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

@@ -8,7 +8,7 @@
     @close="close"
   >
     <div class="cont designer-view" v-bind="bodyConfig" id="containt">
-      <univer ref="univer" :data="option.data"></univer>
+      <univerSheet ref="univer" :data="json" v-if="showUniver"></univerSheet>
     </div>
     <span
       slot="footer"
@@ -29,11 +29,12 @@
 </template>
 
 <script>
-import univer from "@base/components/univer";
+// import univerSheet from "@base/components/univer/univerSheet.vue";
+import { univerSheet } from "@base/components/univer/index.js";
 
 export default {
   // name: "vabSearchDialog",
-  components: { univer },
+  components: { univerSheet },
   props: {
     visiable: Boolean,
     option: Object,
@@ -41,7 +42,9 @@ export default {
   mixins: [],
   inject: ["getFormConfig"],
 
-  mounted() {},
+  mounted() {
+    this.init();
+  },
   data() {
     var that = this;
     return {
@@ -63,6 +66,8 @@ export default {
       currentLayoutType: null,
       dataId: null,
       formConfig: {},
+      showUniver: true,
+      json: {},
     };
   },
   computed: {
@@ -115,6 +120,14 @@ export default {
     this.currentLayoutType = currentFormConfig.layoutType;
   },
   methods: {
+    init() {
+      if (this.option.data) {
+        this.json = JSON.parse(this.option.data);
+      }
+      this.$nextTick(() => {
+        this.showRender = true;
+      });
+    },
     reload(e, option) {
       let updateParam = option?.updateParam || {};
       if (this.formConfig) Object.assign(this.formConfig, updateParam);
@@ -131,9 +144,12 @@ export default {
       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();
-        }
+        this.$refs.univer.getValue().then((value) => {
+          let result = JSON.stringify(value);
+          if (this.option.confirm(result, univerRef, this) !== false) {
+            this.close();
+          }
+        });
       } else {
         this.close();
       }

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

@@ -98,14 +98,13 @@
       :option="baseFormulaDialogOption"
     ></baseFormulaDialog>
     <template v-if="showQrCanvas">
-      <canvas
-        ref="qrCanvas"
-        v-show="false"
-        :width="qrWidth"
-        :height="qrHeight"
-      ></canvas>
+      <canvas ref="qrCanvas" v-show="false" :width="qrWidth" :height="qrHeight"></canvas>
     </template>
-    <univerDialog v-if="showUniverDialog" :visiable.sync="showUniverDialog" :option="univerDialogOption"></univerDialog>
+    <univerDialog
+      v-if="showUniverDialog"
+      :visiable.sync="showUniverDialog"
+      :option="univerDialogOption"
+    ></univerDialog>
   </div>
 </template>
 
@@ -114,6 +113,7 @@
 import "./container-item/index";
 import FieldComponents from "../../../components/xform/form-designer/form-widget/field-widget/index";
 import indexMixin from "../../../components/xform/form-render/indexMixin";
+import univerDialog from "../../../components/xform/form-designer/form-widget/dialog/univerDialog.vue";
 
 export default {
   name: "VFormRender",
@@ -135,8 +135,11 @@ export default {
       import(
         "../../../components/xform/form-designer/form-widget/dialog/fileReferenceDialog.vue"
       ),
-    univerDialog: () =>
-      import("../../../components/xform/form-designer/form-widget/dialog/univerDialog.vue"),
+    univerDialog,
+    /* univerDialog: () =>
+      import(
+        "../../../components/xform/form-designer/form-widget/dialog/univerDialog.vue"
+      ), */
   },
   mixins: [indexMixin],
 };

package/src/router/modules/customer.js

@@ -80,6 +80,16 @@ export const constantRoutes = [
         },
       },
 
+      {
+        path: "/test_univer2",
+        component: () =>
+          import("@/views/test/test_univer2.vue"),
+        name: "test_univer2",
+        meta: {
+          title: "测试excel",
+        },
+      },
+
       // {
       //   path: "/test_table",
       //   component: () =>