From 11b4b81d919fd7804cf63e9ae0d56336c8ad383b Mon Sep 17 00:00:00 2001
From: zhaozhenyang <1286393078@qq.com>
Date: Wed, 2 Jul 2025 16:31:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3hiprintTemplate.setPaper?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=20=E9=9C=80=E5=90=8C=E6=AD=A5=E7=94=9F?=
 =?UTF-8?q?=E6=88=90hiprintTemplate=202.init=E7=9A=84template=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E8=8E=B7=E5=8F=96=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue               | 28 +++-----------------
 src/demo/custom/index.vue | 55 ++++++++++++++++++++-------------------
 src/demo/tasks/index.vue  |  7 ++---
 3 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e93ab0c..2f6d5cb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,44 +1,22 @@
 <template>
   <div id="app">
-    <a-space class="logos" style="float: left;">
-      <img src="./assets/logo.png">
-      <img src="./assets/hi.png">
-      <div>期待大家的参与😁</div>
-    </a-space>
-    <a-row type="flex" class="menus">
-      <a-button-group>
-        <template v-for="demo in demoList">
-          <a-button :type="demo.name === curDemo ? 'primary' : 'info'" @click="curDemo = demo.name" :key="demo.name">
-            {{ demo.title }}
-          </a-button>
-        </template>
-      </a-button-group>
-    </a-row>
     <!-- 动态渲染组件，懒得去弄路由了 -->
     <keep-alive :include='keepInclude' :max="10">
-      <component :is="curDemo"/>
+      <component :is="keepInclude"/>
     </keep-alive>
   </div>
 </template>
 
 <script>
 
-import printDesign from '@/demo/design/index'
-import printCustom from '@/demo/custom/index'
 import printTasks from '@/demo/tasks/index'
 
 export default {
   name: 'App',
-  components: {printDesign, printCustom, printTasks},
+  components: {printTasks},
   data() {
     return {
-      curDemo: 'printDesign',
-      keepInclude: 'printDesign,printCustom,printTasks',
-      demoList: [
-        {name: 'printDesign', title: '默认拖拽设计'},
-        {name: 'printCustom', title: '自定义设计'},
-        {name: 'printTasks', title: '队列/批量打印'}
-      ]
+      keepInclude: 'printTasks'
     }
   },
 }
diff --git a/src/demo/custom/index.vue b/src/demo/custom/index.vue
index b5b6d2d..8982394 100644
--- a/src/demo/custom/index.vue
+++ b/src/demo/custom/index.vue
@@ -37,14 +37,14 @@
           </a-button-group>
           <a-button type="text" icon="zoom-out" @click="changeScale(false)"></a-button>
           <a-input-number
-            :value="scaleValue"
-            :min="scaleMin"
-            :max="scaleMax"
-            :step="0.1"
-            disabled
-            style="width: 70px;"
-            :formatter="value => `${(value * 100).toFixed(0)}%`"
-            :parser="value => value.replace('%', '')"
+              :value="scaleValue"
+              :min="scaleMin"
+              :max="scaleMax"
+              :step="0.1"
+              disabled
+              style="width: 70px;"
+              :formatter="value => `${(value * 100).toFixed(0)}%`"
+              :parser="value => value.replace('%', '')"
           />
           <a-button type="text" icon="zoom-in" @click="changeScale(true)"></a-button>
           <!-- 预览/打印 -->
@@ -63,10 +63,10 @@
               保存
             </a-button>
             <a-popconfirm
-              title="是否确认清空?"
-              okType="danger"
-              okText="确定清空"
-              @confirm="clearPaper"
+                title="是否确认清空?"
+                okType="danger"
+                okText="确定清空"
+                @confirm="clearPaper"
             >
               <a-icon slot="icon" type="question-circle-o" style="color: red"/>
               <a-button type="danger">
@@ -117,7 +117,7 @@ let hiprintTemplate;
 export default {
   name: "printCustom",
   components: {printPreview},
-  data() {
+  data () {
     return {
       // 模板选择
       mode: 0,
@@ -165,7 +165,7 @@ export default {
     }
   },
   computed: {
-    curPaperType() {
+    curPaperType () {
       let type = 'other'
       let types = this.paperTypes
       for (const key in types) {
@@ -178,18 +178,18 @@ export default {
       return type
     }
   },
-  mounted() {
-    this.init()
+  async mounted () {
+    await this.init()
     this.otherPaper()
   },
   methods: {
-    init() {
+    async init () {
       this.modeList = providers.map((e) => {
         return {type: e.type, name: e.name, value: e.value}
       })
       this.changeMode()
     },
-    changeMode() {
+    changeMode () {
       let {mode} = this
       let provider = providers[mode]
       hiprint.init({
@@ -198,7 +198,8 @@ export default {
       $('.hiprintEpContainer').empty()
       hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value);
       $('#hiprint-printTemplate').empty()
-      let templates = this.$ls.get('KEY_TEMPLATES', {})
+      this.$ls.set('KEY_TEMPLATES', {})
+      let templates = this.$ls.set('KEY_TEMPLATES', {})
       let template = templates[provider.value] ? templates[provider.value] : {}
       hiprintTemplate = new hiprint.PrintTemplate({
         template: template,
@@ -215,7 +216,7 @@ export default {
      * @param type [A3, A4, A5, B3, B4, B5, other]
      * @param value {width,height} mm
      */
-    setPaper(type, value) {
+    setPaper (type, value) {
       try {
         if (Object.keys(this.paperTypes).includes(type)) {
           this.curPaper = {type: type, width: value.width, height: value.height}
@@ -228,7 +229,7 @@ export default {
         this.$message.error(`操作失败: ${error}`)
       }
     },
-    changeScale(big) {
+    changeScale (big) {
       let scaleValue = this.scaleValue;
       if (big) {
         scaleValue += 0.1;
@@ -243,18 +244,18 @@ export default {
         this.scaleValue = scaleValue;
       }
     },
-    otherPaper() {
+    otherPaper () {
       let value = {}
       value.width = this.paperWidth
       value.height = this.paperHeight
       this.paperPopVisible = false
       this.setPaper('other', value)
     },
-    preView() {
+    preView () {
       let {width} = this.curPaper
       this.$refs.preView.show(hiprintTemplate, printData, width)
     },
-    print() {
+    print () {
       if (window.hiwebSocket.opened) {
         const printerList = hiprintTemplate.getPrinterList();
         console.log(printerList)
@@ -263,7 +264,7 @@ export default {
       }
       this.$message.error('客户端未连接,无法直接打印')
     },
-    save() {
+    save () {
       let {mode} = this
       let provider = providers[mode]
       this.setTemplate({
@@ -271,14 +272,14 @@ export default {
         json: hiprintTemplate.getJson()
       })
     },
-    setTemplate(payload) {
+    setTemplate (payload) {
       let templates = this.$ls.get('KEY_TEMPLATES', {})
       console.log(payload.json)
       templates[payload.name] = payload.json
       this.$ls.set('KEY_TEMPLATES', templates)
       this.$message.info('保存成功')
     },
-    clearPaper() {
+    clearPaper () {
       try {
         hiprintTemplate.clear();
       } catch (error) {
diff --git a/src/demo/tasks/index.vue b/src/demo/tasks/index.vue
index 00a87f6..bb48c4a 100644
--- a/src/demo/tasks/index.vue
+++ b/src/demo/tasks/index.vue
@@ -159,18 +159,19 @@ export default {
       return type
     }
   },
-  mounted() {
-    this.init()
+  async mounted() {
+    await this.init()
     this.otherPaper()
   },
   methods: {
-    init() {
+    async init() {
       hiprint.init({
         providers: [provider]
       });
       $('.hiprintEpContainer').empty()
       hiprint.PrintElementTypeManager.build('.hiprintEpContainer', 'taskProviderModule');
       $('#hiprint-printTemplate').empty()
+      this.$ls.set('KEY_TEMPLATE_TASKS', panel)
       let template = this.$ls.get('KEY_TEMPLATE_TASKS', panel)
       hiprintTemplate = new hiprint.PrintTemplate({
         template: template,
-- 
Gitee