cloud-web-corejs 1.0.54-dev.555 → 1.0.54-dev.557

package/src/components/fileLibrary/index.vue

@@ -31,7 +31,7 @@
           icon="el-icon-edit-outline"
           class="btn"
           @click="editFileCategory()"
-          :disabled="currentFileCategory == null || !currentFileCategory.id"
+          :disabled="currentFileCategory === null || !currentFileCategory.id"
           v-if="fileObjAuth.editAuth"
         >
           {{ $t2("编辑", "components.fileLibrary.editCategory") }}
@@ -303,7 +303,7 @@
               icon="iconfont icon-icmenu2"
               @click="changeShowType()"
               class="button-sty icon-btn"
-              v-show="showType == 1"
+              v-show="showType === 1"
               >{{ $t2("列表", "components.fileLibrary.tableList") }}
             </el-button>
             <el-button
@@ -312,7 +312,7 @@
               icon="el-icon-menu"
               @click="changeShowType()"
               class="button-sty icon-btn"
-              v-show="showType == 2"
+              v-show="showType === 2"
               >{{ $t2("图示", "components.fileLibrary.imageList") }}
             </el-button>
           </div>
@@ -321,7 +321,7 @@
         <div
           class="containter1"
           ref="containter1"
-          v-show="showType == 1"
+          v-show="showType === 1"
           style="overflow: auto"
         >
           <div class="annex-piclist">
@@ -458,7 +458,7 @@
                     </div> -->
                     <div
                       class="status s-1"
-                      v-if="!attachment.dirs && attachment.status == 1"
+                      v-if="!attachment.dirs && attachment.status === 1"
                     ></div>
                     <div
                       class="img"
@@ -535,7 +535,7 @@
         </div>
         <div class="annex-grid-height">
           <vxe-grid
-            v-show="showType == 2"
+            v-show="showType === 2"
             ref="table-m1"
             v-bind="vxeOption"
             :data="page.records"
@@ -574,7 +574,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && fileObjAuth.editAuth == 1"
+                  v-if="isEdit && fileObjAuth.editAuth === 1"
                   @click="openPropertiesDialog(row)"
                 >
                   <el-tooltip
@@ -590,7 +590,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="fileObjAuth.downloadAuth == 1"
+                  v-if="fileObjAuth.downloadAuth === 1"
                   @click="downloadSingerFile(row)"
                 >
                   <el-tooltip
@@ -606,7 +606,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="fileObjAuth.shareAuth == 1"
+                  v-if="fileObjAuth.shareAuth === 1"
                   @click="openShareDialog(row)"
                 >
                   <el-tooltip
@@ -622,7 +622,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && row.status != 1 && fileObjAuth.replaceAuth == 1"
+                  v-if="isEdit && row.status != 1 && fileObjAuth.replaceAuth === 1"
                   @click="replaceFile(row, rowIndex, items)"
                 >
                   <el-tooltip
@@ -638,7 +638,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && row.status != 1 && fileObjAuth.historyAuth == 1"
+                  v-if="isEdit && row.status != 1 && fileObjAuth.historyAuth === 1"
                   @click="openFileHistoryDialog(row)"
                 >
                   <el-tooltip
@@ -654,7 +654,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && row.status != 1 && fileObjAuth.deleteAuth == 1"
+                  v-if="isEdit && row.status != 1 && fileObjAuth.deleteAuth === 1"
                   @click="deleteAttach(row)"
                 >
                   <el-tooltip
@@ -672,7 +672,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && isCategoryEdit && fileObjAuth.editAuth == 1"
+                  v-if="isEdit && isCategoryEdit && fileObjAuth.editAuth === 1"
                   @click="editFileCategory(row)"
                 >
                   <el-tooltip
@@ -688,7 +688,7 @@
                 <a
                   href="javascript:void(0);"
                   class="a-link"
-                  v-if="isEdit && isCategoryEdit && fileObjAuth.deleteDirAuth == 1"
+                  v-if="isEdit && isCategoryEdit && fileObjAuth.deleteDirAuth === 1"
                   @click="deleteAttach(row)"
                 >
                   <el-tooltip
@@ -776,9 +776,7 @@
             >
               <el-input v-model="editCategory.fileName" clearable class="all-width" />
             </el-form-item>
-            <el-form-item
-              :label="$t1('关联编码')"
-            >
+            <el-form-item :label="$t1('关联编码')">
               <el-input v-model="editCategory.relationCode" clearable class="all-width" />
             </el-form-item>
           </el-form>

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

@@ -1,61 +1,130 @@
 <template>
   <el-card>
-    <div style="display: flex;flex-direction: column" class="print-oper">
+    <div style="display: flex; flex-direction: column" class="print-oper">
       <div>
         <el-button-group>
-          <template v-for="(value,type) in paperTypes">
-            <el-button size="mini" :type="curPaperType === type ? 'primary' : ' '" @click="setPaper(type,value)"
-                       :key="type">
+          <template v-for="(value, type) in paperTypes">
+            <el-button
+              size="mini"
+              :type="curPaperType === type ? 'primary' : ' '"
+              @click="setPaper(type, value)"
+              :key="type"
+            >
               {{ type }}
             </el-button>
           </template>
-          <el-popover v-model="paperPopVisible" title="设置纸张宽高(mm)" trigger="click" width="256">
-            <base-input-number v-model="paperWidth" style=" width: 100px !important; text-align: center"
-                               placeholder="宽(mm)"/>
-            <el-input style=" width: 30px !important; border-left: 0; pointer-events: none; backgroundColor: #fff"
-                      placeholder="~" disabled/>
-            <base-input-number v-model="paperHeight" style="width: 100px !important; text-align: center; border-left: 0"
-                               placeholder="高(mm)"/>
-            <el-button type="primary" class="button-sty" style="width: 100%;margin-top:8px" @click="otherPaper">确定
+          <el-popover
+            v-model="paperPopVisible"
+            title="设置纸张宽高(mm)"
+            trigger="click"
+            width="256"
+          >
+            <base-input-number
+              v-model="paperWidth"
+              style="width: 100px !important; text-align: center"
+              placeholder="宽(mm)"
+            />
+            <el-input
+              style="
+                width: 30px !important;
+                border-left: 0;
+                pointer-events: none;
+                backgroundcolor: #fff;
+              "
+              placeholder="~"
+              disabled
+            />
+            <base-input-number
+              v-model="paperHeight"
+              style="width: 100px !important; text-align: center; border-left: 0"
+              placeholder="高(mm)"
+            />
+            <el-button
+              type="primary"
+              class="button-sty"
+              style="width: 100%; margin-top: 8px"
+              @click="otherPaper"
+              >确定
             </el-button>
-            <el-button size="mini" :type="'other'==curPaperType?'primary':''" slot="reference" class="button-sty">
+            <el-button
+              size="mini"
+              :type="'other' === curPaperType ? 'primary' : ''"
+              slot="reference"
+              class="button-sty"
+            >
               自定义纸张
             </el-button>
           </el-popover>
         </el-button-group>
-        <el-button class="button-zoom" icon="el-icon-zoom-out" @click="changeScale(false)"></el-button>
+        <el-button
+          class="button-zoom"
+          icon="el-icon-zoom-out"
+          @click="changeScale(false)"
+        ></el-button>
         <el-input-number
           :value="scaleValue"
           :min="scaleMin"
           :max="scaleMax"
           :step="0.1"
           disabled
-          style="width: 70px;"
+          style="width: 70px"
           class="noButton"
-          :formatter="value => `${(value * 100).toFixed(0)}%`"
-          :parser="value => value.replace('%', '')"
+          :formatter="(value) => `${(value * 100).toFixed(0)}%`"
+          :parser="(value) => value.replace('%', '')"
         />
-        <el-button class="button-zoom" icon="el-icon-zoom-in" @click="changeScale(true)"></el-button>
-        <el-button type="primary" class="button-sty" icon="el-icon-refresh-right" @click="rotatePaper()" plain>旋转
+        <el-button
+          class="button-zoom"
+          icon="el-icon-zoom-in"
+          @click="changeScale(true)"
+        ></el-button>
+        <el-button
+          type="primary"
+          class="button-sty"
+          icon="el-icon-refresh-right"
+          @click="rotatePaper()"
+          plain
+          >旋转
         </el-button>
-        <el-button type="warning" class="button-sty" icon="el-icon-view" @click="preView">预览</el-button>
-        <el-popover
-          width="180"
-          v-model="visible"
-          @confirm="clearPaper"
+        <el-button type="warning" class="button-sty" icon="el-icon-view" @click="preView"
+          >预览</el-button
         >
+        <el-popover width="180" v-model="visible" @confirm="clearPaper">
           <p><i class="el-icon-warning-outline f-red"></i> 是否确认清空?？</p>
           <div style="text-align: right; margin: 0">
             <el-button size="mini" type="text" @click="visible = false">取消</el-button>
-            <el-button type="primary" size="mini" @click="clearPaper();visible = false">确定清空</el-button>
+            <el-button
+              type="primary"
+              size="mini"
+              @click="
+                clearPaper();
+                visible = false;
+              "
+              >确定清空</el-button
+            >
           </div>
-          <el-button type="danger" class="button-sty" icon="el-icon-close" slot="reference" style="margin:0 10px;">
+          <el-button
+            type="danger"
+            class="button-sty"
+            icon="el-icon-close"
+            slot="reference"
+            style="margin: 0 10px"
+          >
             清空
           </el-button>
         </el-popover>
-        <el-button type="primary" class="button-sty" icon="el-icon-download" @click="importDefaultTemplate1">导入默认模板1
+        <el-button
+          type="primary"
+          class="button-sty"
+          icon="el-icon-download"
+          @click="importDefaultTemplate1"
+          >导入默认模板1
         </el-button>
-        <el-button type="primary" class="button-sty" icon="el-icon-download" @click="importDefaultTemplate2">导入默认模板2
+        <el-button
+          type="primary"
+          class="button-sty"
+          icon="el-icon-download"
+          @click="importDefaultTemplate2"
+          >导入默认模板2
         </el-button>
         <div class="hiprint-printPagination"></div>
         <!--		<el-radio-group size="mini">
@@ -151,7 +220,10 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.text" style>
-                      <span class="glyphicon glyphicon-text-width" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon glyphicon-text-width"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">文本</p>
                     </a>
                   </div>
@@ -167,7 +239,10 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.longText">
-                      <span class="glyphicon glyphicon-subscript" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon glyphicon-subscript"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">长文</p>
                     </a>
                   </div>
@@ -199,7 +274,10 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.customText" style>
-                      <span class="glyphicon glyphicon-text-width" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon glyphicon-text-width"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">自定义</p>
                     </a>
                   </div>
@@ -208,7 +286,10 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.barcode" style>
-                      <span class="glyphicon iconfont icon-bar-code-full" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon iconfont icon-bar-code-full"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">条形码</p>
                     </a>
                   </div>
@@ -216,19 +297,24 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.qrcode" style>
-                      <span class="glyphicon iconfont icon-erweima" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon iconfont icon-erweima"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">二维码</p>
                     </a>
                   </div>
                 </el-col>
-
               </el-row>
               <el-row class="drag_item_title">辅助</el-row>
               <el-row>
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.hline" style>
-                      <span class="glyphicon glyphicon-resize-horizontal" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon glyphicon-resize-horizontal"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">横线</p>
                     </a>
                   </div>
@@ -236,7 +322,10 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.vline" style>
-                      <span class="glyphicon glyphicon-resize-vertical" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon glyphicon-resize-vertical"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">竖线</p>
                     </a>
                   </div>
@@ -244,7 +333,10 @@
                 <el-col :span="8" class="drag_item_box">
                   <div>
                     <a class="ep-draggable-item" tid="defaultModule.rect">
-                      <span class="glyphicon glyphicon-unchecked" aria-hidden="true"></span>
+                      <span
+                        class="glyphicon glyphicon-unchecked"
+                        aria-hidden="true"
+                      ></span>
                       <p class="glyphicon-class">矩形</p>
                     </a>
                   </div>
@@ -276,19 +368,19 @@
       </el-col>
     </el-row>
     <!-- 预览 -->
-    <print-preview ref="preView"/>
+    <print-preview ref="preView" />
   </el-card>
 </template>
 
 <script>
-import mixins from './mixins.js';
+import mixins from "./mixins.js";
 export default {
   name: "printDesign",
-  mixins: [mixins]
-}
+  mixins: [mixins],
+};
 </script>
 <style src="../../css/bootstrap.min.css" scoped></style>
-<style lang="less" scoped>
+<style lang="scss" scoped>
 // 拖拽
 .drag_item_box {
   height: 100%;
@@ -305,29 +397,29 @@ export default {
 }
 
 // 默认图片
-/deep/ .hiprint-printElement-image-content {
+::v-deep .hiprint-printElement-image-content {
   img {
     content: url("~@/assets/logo.png");
   }
 }
 
 // 辅助线样式
-/deep/ .toplineOfPosition {
+::v-deep .toplineOfPosition {
   border: 0;
   border-top: 1px dashed purple;
 }
 
-/deep/ .bottomlineOfPosition {
+::v-deep .bottomlineOfPosition {
   border: 0;
   border-top: 1px dashed purple;
 }
 
-/deep/ .leftlineOfPosition {
+::v-deep .leftlineOfPosition {
   border: 0;
   border-left: 1px dashed purple;
 }
 
-/deep/ .rightlineOfPosition {
+::v-deep .rightlineOfPosition {
   border: 0;
   border-left: 1px dashed purple;
 }

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>