From 92da1be0adf4d14851073daf35378f2f6c2d5bbb Mon Sep 17 00:00:00 2001
From: joeyyyyyyyy <745559787@qq.com>
Date: Tue, 6 Sep 2022 12:49:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4ant=20design=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                |  1 -
 src/App.vue                 | 32 +++++++++--------
 src/demo/custom/index.vue   | 70 ++++++++++++++++++-------------------
 src/demo/custom/preview.vue | 26 ++++++--------
 src/demo/design/index.vue   | 20 +++++------
 src/demo/design/preview.vue | 18 ++++------
 src/demo/tasks/index.vue    |  4 +--
 src/demo/tasks/preview.vue  | 28 ++++++---------
 src/main.js                 |  6 ++--
 src/plugins/elementui.js    |  4 +--
 10 files changed, 98 insertions(+), 111 deletions(-)

diff --git a/package.json b/package.json
index c5157c6..4bbc207 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
     "build-demo": "vue-cli-service build"
   },
   "dependencies": {
-    "ant-design-vue": "^1.7.8",
     "concurrent-tasks": "^1.0.7",
     "core-js": "^3.6.5",
     "element-ui": "^2.15.9",
diff --git a/src/App.vue b/src/App.vue
index e93ab0c..e2b3ffa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,19 +1,21 @@
 <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>
+  <div id="app" >
+    <div  style="display: flex; align-items: center;justify-content: left">
+      <div class="logos">
+        <img src="./assets/logo.png">
+        <img src="./assets/hi.png">
+        <div>期待大家的参与😁</div>
+      </div>
+      <el-row type="flex" class="menus">
+        <el-button-group>
+          <template v-for="demo in demoList">
+            <el-button :type="demo.name === curDemo ? 'primary' : ' '" @click="curDemo = demo.name" :key="demo.name">
+              {{ demo.title }}
+            </el-button>
+          </template>
+        </el-button-group>
+      </el-row>
+    </div>
     <!-- 动态渲染组件，懒得去弄路由了 -->
     <keep-alive :include='keepInclude' :max="10">
       <component :is="curDemo"/>
diff --git a/src/demo/custom/index.vue b/src/demo/custom/index.vue
index cd7597d..f848de5 100644
--- a/src/demo/custom/index.vue
+++ b/src/demo/custom/index.vue
@@ -11,7 +11,7 @@
           </el-option>
         </el-select>
       </el-col>
-      <a-col :span="20">
+      <el-col :span="20">
           <!-- 纸张设置 -->
           <el-button-group style="margin:0 10px">
             <el-button   v-for="(value,type) in paperTypes" :type="curPaperType === type ? 'primary' : ' '" @click="setPaper(type,value)" :key="type">
@@ -34,28 +34,28 @@
           <el-button slot="reference" type="primary" style="margin:0 10px">自定义宽高</el-button>
         </el-popover>
 
-<!--          <a-button-group>-->
+<!--          <el-button-group>-->
 <!--            <template v-for="(value,type) in paperTypes">-->
-<!--              <a-button :type="curPaperType === type ? 'primary' : 'info'" @click="setPaper(type,value)" :key="type">-->
+<!--              <el-button :type="curPaperType === type ? 'primary' : 'info'" @click="setPaper(type,value)" :key="type">-->
 <!--                {{ type }}-->
-<!--              </a-button>-->
+<!--              </el-button>-->
 <!--            </template>-->
-<!--            <a-popover v-model="paperPopVisible" title="设置纸张宽高(mm)" trigger="click">-->
+<!--            <el-popover v-model="paperPopVisible" title="设置纸张宽高(mm)" trigger="click">-->
 <!--              <div slot="content">-->
-<!--                <a-input-group compact style="margin: 10px 10px">-->
-<!--                  <a-input type="number" v-model="paperWidth" style=" width: 100px; text-align: center"-->
+<!--                <el-input-group compact style="margin: 10px 10px">-->
+<!--                  <el-input type="number" v-model="paperWidth" style=" width: 100px; text-align: center"-->
 <!--                           placeholder="宽(mm)"/>-->
-<!--                  <a-input style=" width: 30px; border-left: 0; pointer-events: none; backgroundColor: #fff"-->
+<!--                  <el-input style=" width: 30px; border-left: 0; pointer-events: none; backgroundColor: #fff"-->
 <!--                           placeholder="~" disabled-->
 <!--                  />-->
-<!--                  <a-input type="number" v-model="paperHeight" style="width: 100px; text-align: center; border-left: 0"-->
+<!--                  <el-input type="number" v-model="paperHeight" style="width: 100px; text-align: center; border-left: 0"-->
 <!--                           placeholder="高(mm)"/>-->
-<!--                </a-input-group>-->
-<!--                <a-button type="primary" style="width: 100%" @click="otherPaper">确定</a-button>-->
+<!--                </el-input-group>-->
+<!--                <el-button type="primary" style="width: 100%" @click="otherPaper">确定</el-button>-->
 <!--              </div>-->
-<!--              <a-button :type="'other'==curPaperType?'primary':''">自定义纸张</a-button>-->
-<!--            </a-popover>-->
-<!--          </a-button-group>-->
+<!--              <el-button :type="'other'==curPaperType?'primary':''">自定义纸张</el-button>-->
+<!--            </el-popover>-->
+<!--          </el-button-group>-->
 
           <!-- 预览/打印 -->
           <el-button-group>
@@ -74,30 +74,30 @@
           </el-button-group>
           <!-- 保存/清空 -->
 
-      </a-col>
+      </el-col>
     </el-row>
-    <a-row :gutter="[8,0]">
-      <a-col :span="4">
-        <a-card style="height: 100vh">
-          <a-row>
-            <a-col :span="24" class="rect-printElement-types hiprintEpContainer">
-            </a-col>
-          </a-row>
-        </a-card>
-      </a-col>
-      <a-col :span="14">
-        <a-card class="card-design">
+    <el-row :gutter="[8,0]">
+      <el-col :span="4">
+        <el-card style="height: 100vh">
+          <el-row>
+            <el-col :span="24" class="rect-printElement-types hiprintEpContainer">
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-col>
+      <el-col :span="14">
+        <el-card class="card-design">
           <div id="hiprint-printTemplate" class="hiprint-printTemplate"></div>
-        </a-card>
-      </a-col>
-      <a-col :span="6" class="params_setting_container">
-        <a-card>
-          <a-row class="hinnn-layout-sider">
+        </el-card>
+      </el-col>
+      <el-col :span="6" class="params_setting_container">
+        <el-card>
+          <el-row class="hinnn-layout-sider">
             <div id="PrintElementOptionSetting"></div>
-          </a-row>
-        </a-card>
-      </a-col>
-    </a-row>
+          </el-row>
+        </el-card>
+      </el-col>
+    </el-row>
     <!-- 预览 -->
     <print-preview ref="preView"/>
   </el-card>
diff --git a/src/demo/custom/preview.vue b/src/demo/custom/preview.vue
index 0e44b04..18513cd 100644
--- a/src/demo/custom/preview.vue
+++ b/src/demo/custom/preview.vue
@@ -1,22 +1,18 @@
 <template>
-  <a-modal :visible="visible" :maskClosable="false"
-           @cancel="hideModal" :width="width+'mm'">
-    <a-spin :spinning="spinning" style="min-height: 100px">
-      <div id="preview_content"></div>
-    </a-spin>
+  <el-dialog :visible="visible" :maskClosable="false"
+             @close="hideModal" :width="width+'mm'">
+    <div id="preview_content"></div>
     <template slot="title">
-      <a-space>
-        <div style="margin-right: 20px">打印预览</div>
-        <a-button :loading="waitShowPrinter" type="primary" icon="printer" @click.stop="print">打印</a-button>
-        <a-button type="primary" icon="printer" @click.stop="toPdf">pdf</a-button>
-      </a-space>
+      <div style="margin-right: 20px">打印预览</div>
+      <el-button :loading="waitShowPrinter" type="primary" icon="printer" @click.stop="print">打印</el-button>
+      <el-button type="primary" icon="printer" @click.stop="toPdf">pdf</el-button>
     </template>
     <template slot="footer">
-      <a-button key="close" type="info" @click="hideModal">
+      <el-button key="close" type="info" @click="hideModal">
         关闭
-      </a-button>
+      </el-button>
     </template>
-  </a-modal>
+  </el-dialog>
 </template>
 
 <script>
@@ -62,19 +58,19 @@ export default {
       this.waitShowPrinter = true
       this.hiprintTemplate.print(this.printData, {}, {
         callback: () => {
+          console.log('callback')
           this.waitShowPrinter = false
         }
       })
     },
     toPdf() {
-      this.hiprintTemplate.toPdf(this.printData, '打印预览pdf');
+      this.hiprintTemplate.toPdf({}, '打印预览');
     },
   }
 }
 
 </script>
 <style lang="less" scoped>
-
 /deep/ .ant-modal-body {
   padding: 0px;
 }
diff --git a/src/demo/design/index.vue b/src/demo/design/index.vue
index 11ac209..6b0a882 100644
--- a/src/demo/design/index.vue
+++ b/src/demo/design/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card>
-    <a-space style="margin-bottom: 10px">
+    <div style="margin-bottom: 10px">
       <el-button-group>
           <el-button   v-for="(value,type) in paperTypes" :type="curPaperType === type ? 'primary' : ' '" @click="setPaper(type,value)" :key="type">
             {{ type }}
@@ -37,7 +37,7 @@
       <el-button  type="primary" @click="setMultEleVertical">
         多选元素垂直间距10
       </el-button >
-    </a-space>
+    </div>
     <el-row >
       <el-col :span="4">
         <el-card style="height: 100vh">
@@ -53,14 +53,14 @@
                     </a>
                   </div>
                 </el-col>
-                <a-col :span="12" class="drag_item_box" tid="defaultModule.text">
+                <el-col :span="12" class="drag_item_box" tid="defaultModule.text">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.image" style>
                       <span class="glyphicon glyphicon-picture" aria-hidden="true"></span>
                       <p class="glyphicon-class">图片</p>
                     </a>
                   </div>
-                </a-col>
+                </el-col>
               </el-row>
               <el-row style="height: 100px;">
                 <el-col :span="12" class="drag_item_box" tid="defaultModule.text">
@@ -122,16 +122,16 @@
         </el-card>
       </el-col>
       <el-col :span="15">
-        <a-card class="card-design">
+        <el-card class="card-design">
           <div id="hiprint-printTemplate" class="hiprint-printTemplate"></div>
-        </a-card>
+        </el-card>
       </el-col>
       <el-col :span="5" class="params_setting_container">
-        <a-card>
-          <a-row class="hinnn-layout-sider">
+        <el-card>
+          <el-row class="hinnn-layout-sider">
             <div id="PrintElementOptionSetting"></div>
-          </a-row>
-        </a-card>
+          </el-row>
+        </el-card>
       </el-col>
     </el-row>
     <!-- 预览 -->
diff --git a/src/demo/design/preview.vue b/src/demo/design/preview.vue
index 0d03b20..d33533a 100644
--- a/src/demo/design/preview.vue
+++ b/src/demo/design/preview.vue
@@ -1,22 +1,18 @@
 <template>
-  <a-modal :visible="visible" :maskClosable="false"
-           @cancel="hideModal" :width="width+'mm'">
-    <a-spin :spinning="spinning" style="min-height: 100px">
+  <el-dialog :visible="visible" :maskClosable="false"
+           @close="hideModal" :width="width+'mm'">
       <div id="preview_content"></div>
-    </a-spin>
     <template slot="title">
-      <a-space>
         <div style="margin-right: 20px">打印预览</div>
-        <a-button :loading="waitShowPrinter" type="primary" icon="printer" @click.stop="print">打印</a-button>
-        <a-button type="primary" icon="printer" @click.stop="toPdf">pdf</a-button>
-      </a-space>
+        <el-button :loading="waitShowPrinter" type="primary" icon="printer" @click.stop="print">打印</el-button>
+        <el-button type="primary" icon="printer" @click.stop="toPdf">pdf</el-button>
     </template>
     <template slot="footer">
-      <a-button key="close" type="info" @click="hideModal">
+      <el-button key="close" type="info" @click="hideModal">
         关闭
-      </a-button>
+      </el-button>
     </template>
-  </a-modal>
+  </el-dialog>
 </template>
 
 <script>
diff --git a/src/demo/tasks/index.vue b/src/demo/tasks/index.vue
index aa5b8fd..44c53f0 100644
--- a/src/demo/tasks/index.vue
+++ b/src/demo/tasks/index.vue
@@ -2,7 +2,7 @@
   <el-card>
     <el-row style="margin-bottom: 10px">
       <el-col :span="24">
-        <a-space>
+        <div style="display:flex;">
           <!-- 纸张设置 -->
           <el-button-group>
             <el-button   v-for="(value,type) in paperTypes" :type="curPaperType === type ? 'primary' : ' '" @click="setPaper(type,value)" :key="type">
@@ -49,7 +49,7 @@
               清空
             </el-button >
           </el-button-group>
-        </a-space>
+        </div>
       </el-col>
     </el-row>
     <el-row >
diff --git a/src/demo/tasks/preview.vue b/src/demo/tasks/preview.vue
index 0e44b04..80ae939 100644
--- a/src/demo/tasks/preview.vue
+++ b/src/demo/tasks/preview.vue
@@ -1,22 +1,18 @@
 <template>
-  <a-modal :visible="visible" :maskClosable="false"
-           @cancel="hideModal" :width="width+'mm'">
-    <a-spin :spinning="spinning" style="min-height: 100px">
-      <div id="preview_content"></div>
-    </a-spin>
+  <el-dialog :visible="visible" :maskClosable="false"
+             @close="hideModal" :width="width+'mm'">
+    <div id="preview_content"></div>
     <template slot="title">
-      <a-space>
-        <div style="margin-right: 20px">打印预览</div>
-        <a-button :loading="waitShowPrinter" type="primary" icon="printer" @click.stop="print">打印</a-button>
-        <a-button type="primary" icon="printer" @click.stop="toPdf">pdf</a-button>
-      </a-space>
+      <div style="margin-right: 20px">打印预览</div>
+      <el-button type="primary" icon="printer" @click.stop="print">打印</el-button>
+      <el-button type="primary" icon="printer" @click.stop="toPdf">pdf</el-button>
     </template>
     <template slot="footer">
-      <a-button key="close" type="info" @click="hideModal">
+      <el-button key="close" type="info" @click="hideModal">
         关闭
-      </a-button>
+      </el-button>
     </template>
-  </a-modal>
+  </el-dialog>
 </template>
 
 <script>
@@ -59,22 +55,20 @@ export default {
       }, 500)
     },
     print() {
-      this.waitShowPrinter = true
       this.hiprintTemplate.print(this.printData, {}, {
         callback: () => {
-          this.waitShowPrinter = false
+          console.log('callback')
         }
       })
     },
     toPdf() {
-      this.hiprintTemplate.toPdf(this.printData, '打印预览pdf');
+      this.hiprintTemplate.toPdf({}, '打印预览');
     },
   }
 }
 
 </script>
 <style lang="less" scoped>
-
 /deep/ .ant-modal-body {
   padding: 0px;
 }
diff --git a/src/main.js b/src/main.js
index ebc8371..7ba93b9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,9 +1,9 @@
 import Vue from 'vue'
 import App from './App.vue'
 
-import Antd from 'ant-design-vue';
-import 'ant-design-vue/dist/antd.css';
-Vue.use(Antd);
+// import Antd from 'ant-design-vue';
+// import 'ant-design-vue/dist/antd.css';
+// Vue.use(Antd);
 
 import '@/plugins/elementui'
 
diff --git a/src/plugins/elementui.js b/src/plugins/elementui.js
index 7b9b71b..5187ae1 100644
--- a/src/plugins/elementui.js
+++ b/src/plugins/elementui.js
@@ -3,7 +3,7 @@ import Vue from 'vue'
 import 'element-ui/lib/theme-chalk/index.css';
 import {  Button, Loading, ButtonGroup,Input,
     InputNumber,Card, Row,
-    Col,  Select,Slider,
+    Col,  Select,Slider,Dialog,
     Option,Popover } from 'element-ui'
 Vue.use(Button).use(Loading).use(ButtonGroup).use(InputNumber).use(Input)
-    .use(Card).use(Row).use(Col).use(Select).use(Option).use(Slider).use(Popover)
+    .use(Card).use(Row).use(Col).use(Select).use(Option).use(Slider).use(Popover).use(Dialog)
-- 
Gitee