cloud-web-corejs-haier 1.0.43 → 1.0.45

package/src/components/hiprint/view/design/preview.vue

@@ -3,28 +3,46 @@
     :visible="visible"
     :maskClosable="false"
     @cancel="hideModal"
-    :width="width+'mm'"
+    :width="width + 'mm'"
     :append-to-body="true"
     :modal-append-to-body="true"
     custom-class="dialog-style dialog-printPreview"
     top="20px"
     v-el-dialog-center
     v-el-drag-dialog
-    @close="hideModal">
+    @close="hideModal"
+  >
     <div style="min-height: 100px" v-loading="spinning">
       <div id="preview_content_design" ref="preview_content_design"></div>
     </div>
     <template slot="title">
       <div>
         <div class="name">打印预览</div>
-        <el-button :loading="waitShowPrinter" type="primary" class="button-sty" icon="el-icon-printer"
-                   @click.stop="print">打印
+        <el-button
+          :loading="waitShowPrinter"
+          type="primary"
+          class="button-sty"
+          icon="el-icon-printer"
+          @click.stop="print"
+          >打印
         </el-button>
-        <el-button type="primary" class="button-sty" icon="el-icon-printer" @click.stop="toPdf">pdf</el-button>
+        <el-button
+          type="primary"
+          class="button-sty"
+          icon="el-icon-printer"
+          @click.stop="toPdf"
+          >pdf</el-button
+        >
       </div>
     </template>
     <template slot="footer">
-      <el-button key="close" type="info" @click="hideModal" class="button-sty" icon="el-icon-close">
+      <el-button
+        key="close"
+        type="info"
+        @click="hideModal"
+        class="button-sty"
+        icon="el-icon-close"
+      >
         关闭
       </el-button>
     </template>
@@ -32,7 +50,7 @@
 </template>
 
 <script>
-import {hiprint} from "../../../../components/hiprint";
+import { hiprint } from "../../../../components/hiprint";
 
 export default {
   name: "printPreview",
@@ -47,84 +65,89 @@ export default {
       // 模板
       hiprintTemplate: {},
       // 数据
-      printData: {}
-    }
+      printData: {},
+    };
   },
   computed: {},
   watch: {},
-  created() {
-  },
-  mounted() {
-  },
+  created() {},
+  mounted() {},
   methods: {
     hideModal() {
-      this.visible = false
+      this.visible = false;
     },
-    show(hiprintTemplate, printData, width = '210') {
-      this.visible = true
-      this.spinning = true
-      this.width = hiprintTemplate.editingPanel ? hiprintTemplate.editingPanel.width : width;
-      this.hiprintTemplate = hiprintTemplate
-      this.printData = printData
+    show(hiprintTemplate, printData, width = "210") {
+      this.visible = true;
+      this.spinning = true;
+      this.width = hiprintTemplate.editingPanel
+        ? hiprintTemplate.editingPanel.width
+        : width;
+      this.hiprintTemplate = hiprintTemplate;
+      this.printData = printData;
       setTimeout(() => {
         // eslint-disable-next-line no-undef
         // $('#preview_content_design').html(hiprintTemplate.getHtml(printData))
-        $(this.$refs.preview_content_design).html(hiprintTemplate.getHtml(printData))
-        this.spinning = false
-      }, 500)
+        $(this.$refs.preview_content_design).html(hiprintTemplate.getHtml(printData));
+        this.spinning = false;
+      }, 500);
     },
     print() {
-      this.waitShowPrinter = true
-      this.hiprintTemplate.print(this.printData, {}, {
-        callback: () => {
-          console.log('callback')
-          this.waitShowPrinter = false
+      this.waitShowPrinter = true;
+      this.hiprintTemplate.print(
+        this.printData,
+        {},
+        {
+          callback: () => {
+            console.log("callback");
+            this.waitShowPrinter = false;
+          },
         }
-      })
+      );
     },
     toPdf() {
-      this.hiprintTemplate.toPdf({}, '打印预览');
+      this.hiprintTemplate.toPdf({}, "打印预览");
     },
-    open(printJson, printData, width = '210') {
+    open(printJson, printData, width = "210") {
       let hiprintTemplate = new hiprint.PrintTemplate({
         template: printJson,
         // 自定义可选字体
         // 或者使用 hiprintTemplate.setFontList([])
         // 或元素中 options.fontList: []
         fontList: [
-          {title: '微软雅黑', value: 'Microsoft YaHei'},
-          {title: '黑体', value: 'STHeitiSC-Light'},
-          {title: '思源黑体', value: 'SourceHanSansCN-Normal'},
-          {title: '王羲之书法体', value: '王羲之书法体'},
-          {title: '宋体', value: 'SimSun'},
-          {title: '华为楷体', value: 'STKaiti'},
-          {title: 'cursive', value: 'cursive'},
+          { title: "微软雅黑", value: "Microsoft YaHei" },
+          { title: "黑体", value: "STHeitiSC-Light" },
+          { title: "思源黑体", value: "SourceHanSansCN-Normal" },
+          { title: "王羲之书法体", value: "王羲之书法体" },
+          { title: "宋体", value: "SimSun" },
+          { title: "华为楷体", value: "STKaiti" },
+          { title: "cursive", value: "cursive" },
         ],
         dataMode: 1, // 1:getJson 其他：getJsonTid 默认1
         history: true, // 是否需要 撤销重做功能
       });
-      this.visible = true
-      this.spinning = true
-      this.width = hiprintTemplate.editingPanel ? hiprintTemplate.editingPanel.width : width;
-      this.hiprintTemplate = hiprintTemplate
-      this.printData = printData
+      this.visible = true;
+      this.spinning = true;
+      this.width = hiprintTemplate.editingPanel
+        ? hiprintTemplate.editingPanel.width
+        : width;
+      this.hiprintTemplate = hiprintTemplate;
+      this.printData = printData;
       setTimeout(() => {
         // eslint-disable-next-line no-undef
         // $('#preview_content_design').html(hiprintTemplate.getHtml(printData))
-        $(this.$refs.preview_content_design).html(hiprintTemplate.getHtml(printData))
-        this.spinning = false
-      }, 500)
+        $(this.$refs.preview_content_design).html(hiprintTemplate.getHtml(printData));
+        this.spinning = false;
+      }, 500);
     },
-  }
-}
-
+  },
+};
 </script>
-<style lang="less" scoped>
-/deep/ .ant-modal-body {
+<style lang="scss" scoped>
+::v-deep .ant-modal-body {
   padding: 0px;
 }
 
-/deep/ .ant-modal-content {
+::v-deep .ant-modal-content {
   margin-bottom: 24px;
 }
 </style>

package/src/components/hiprint/view/json-view.vue

@@ -1,26 +1,29 @@
 <template>
   <span>
-    <el-button type="primary" class="button-sty" @click="show">
-      查看模板json
-    </el-button>
-    <el-dialog :visible="visible" :maskClosable="false"
-             @cancel="hideModal">
+    <el-button type="primary" class="button-sty" @click="show"> 查看模板json </el-button>
+    <el-dialog :visible="visible" :maskClosable="false" @cancel="hideModal">
       <!-- <el-spin :spinning="spinning" style="min-height: 100px"> -->
-        <el-input type="textarea" :rows="2" style="width:40vw;" v-model:value="jsonOut"/>
+      <el-input type="textarea" :rows="2" style="width: 40vw" v-model:value="jsonOut" />
       <!-- </el-spin> -->
       <template slot="title">
         <div>
           <div style="margin-right: 20px">JSON</div>
-          <el-switch active-text="tid模式" inactive-text="默认" v-model:checked="tidMode"
-                    @change="onModeChange"/>
-          <el-switch active-text="美化" inactive-text="压缩" v-model:checked="beautify"
-                    @change="onModeChange"/>
+          <el-switch
+            active-text="tid模式"
+            inactive-text="默认"
+            v-model:checked="tidMode"
+            @change="onModeChange"
+          />
+          <el-switch
+            active-text="美化"
+            inactive-text="压缩"
+            v-model:checked="beautify"
+            @change="onModeChange"
+          />
         </div>
       </template>
       <template slot="footer">
-        <el-button key="close" type="info" @click="hideModal">
-          关闭
-        </el-button>
+        <el-button key="close" type="info" @click="hideModal"> 关闭 </el-button>
       </template>
     </el-dialog>
   </span>
@@ -32,7 +35,7 @@ export default {
   props: {
     template: {
       type: Object,
-    }
+    },
   },
   data() {
     return {
@@ -41,41 +44,38 @@ export default {
       jsonOut: "",
       tidMode: false,
       beautify: false,
-    }
+    };
   },
   computed: {},
   watch: {},
-  created() {
-  },
-  mounted() {
-  },
+  created() {},
+  mounted() {},
   methods: {
     hideModal() {
-      this.visible = false
+      this.visible = false;
     },
     show() {
-      this.visible = true
-      this.spinning = true
+      this.visible = true;
+      this.spinning = true;
       setTimeout(() => {
         let json = this.tidMode ? this.template.getJsonTid() : this.template.getJson();
         let beautify = this.beautify ? 2 : 0;
         this.jsonOut = JSON.stringify(json, null, beautify);
-        this.spinning = false
-      }, 500)
+        this.spinning = false;
+      }, 500);
     },
     onModeChange() {
       this.show();
-    }
-  }
-}
-
+    },
+  },
+};
 </script>
-<style lang="less" scoped>
-/deep/ .ant-modal-body {
+<style lang="scss" scoped>
+::v-deep .ant-modal-body {
   padding: 0px;
 }
 
-/deep/ .ant-modal-content {
+::v-deep .ant-modal-content {
   margin-bottom: 24px;
 }
 </style>

package/src/components/luckysheet/dialog.vue

@@ -0,0 +1,159 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :fullscreen="true"
+    @close="close"
+    :appendToBody="true"
+    :modalAppendToBody="true"
+    :closeOnClickModal="false"
+    :modal="false"
+    :title="options.title || 'excel'"
+    custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+  >
+    <div class="cont" id="containt" :class="{ nfootBtn: options.readonly }">
+      <luckysheet
+        ref="luckysheet"
+        :data="json"
+        v-if="showLuckysheet"
+        :options="options"
+      ></luckysheet>
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="!options.readonly">
+      <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 luckysheet from "./view.vue";
+import { fileToBase64, base64ToFile } from "./fileUtils.js";
+import { saveAs } from "file-saver";
+
+export default {
+  name: "luckysheetDialog",
+  components: { luckysheet },
+  props: {
+    visiable: Boolean,
+    options: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  mounted() {},
+  data() {
+    return {
+      showDialog: true,
+      json: [],
+      showLuckysheet: false,
+    };
+  },
+  computed: {},
+  created() {
+    this.init();
+  },
+  methods: {
+    init() {
+      if (this.options.data) {
+        try {
+          let data = JSON.parse(this.options.data);
+          if (Array.isArray(data)) {
+            this.json = data;
+          } else {
+            this.json = [];
+          }
+        } catch (error) {
+          this.json = [];
+          console.error(error);
+        }
+      }
+      this.$nextTick(() => {
+        this.showLuckysheet = true;
+      });
+    },
+    close() {
+      this.$refs.luckysheet.exitEditMode();
+      this.showDialog = false;
+      this.$emit("update:visiable", false);
+    },
+    dialogSubmit() {
+      let luckysheetRef = this.$refs.luckysheet;
+      let value = luckysheetRef.getValue();
+      luckysheetRef.generateExcelFile((file) => {
+        fileToBase64(file)
+          .then((base64) => {
+            let response = {
+              data: JSON.stringify(value),
+              json: value,
+              file: file,
+              base64: base64,
+              // convertedFile: convertedFile  // 添加转换后的file对象
+            };
+            let onConfirm = this.options.onConfirm;
+            if (onConfirm && typeof onConfirm === "function") {
+              let result = onConfirm(response, this.close);
+              if (result !== false) {
+                this.close();
+              }
+            } else {
+              this.close();
+            }
+          })
+          .catch((error) => {
+            console.error("文件转换失败:", error);
+            this.$message.error("文件处理失败");
+          });
+      });
+    },
+    /**
+     * 保留原有的fileToBase64Async方法以保持向后兼容
+     */
+    fileToBase64Async(file) {
+      return fileToBase64(file);
+    }
+  },
+};
+</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>