cloud-web-corejs 1.1.0-dev.6 → 1.1.0-dev.60

package/src/components/hiprint/style.scss

@@ -0,0 +1,188 @@
+// Core hiprint designer chrome extracted from the app stylesheet.
+@import "~@base/styles/variables.scss";
+@import "~@base/styles/mixin.scss";
+
+//打印盒子
+.button-zoom {
+  height: 28px;
+  border-radius: 2px;
+  line-height: 28px;
+  padding: 0 !important;
+  vertical-align: middle;
+  width: 28px;
+}
+.print-design {
+  background-color: #fff;
+  button.el-button {
+    padding: 5px 12px;
+    &.button-sty {
+      color: #fff;
+      font-size: 12px;
+      line-height: 26px;
+      padding: 0 12px;
+    }
+  }
+  .pd-box-tabs {
+    padding: 10px 0 0 24px;
+    border-bottom: solid 1px $borderColor;
+    .el-button-group .el-button {
+      border-radius: 8px 8px 0 0 !important;
+      margin-right: 8px;
+      padding: 8px 14px;
+      border: none;
+      &.el-button--info {
+        background: #f0f0f0;
+        color: grey;
+      }
+      &.el-button--primary {
+        color: #fff;
+      }
+    }
+  }
+  .el-card {
+    box-shadow: none !important;
+    border: none;
+    margin-top: 0;
+    > .el-card__body {
+      padding: 0;
+    }
+    &.card-design > .el-card__body {
+      padding: 20px;
+      border-left: solid 1px #eee;
+      border-right: solid 1px #eee;
+      overflow: auto;
+      height: calc(100vh - 189px);
+      width: 100%;
+    }
+  }
+  .params_setting_container > .el-card > .el-card__body {
+    overflow: auto;
+    height: calc(100vh - 189px);
+  }
+  .print-oper {
+    border-bottom: solid 1px $borderColor;
+    padding: 8px;
+    .el-button-group .el-button {
+      color: #000;
+      &.el-button--primary {
+        color: #fff;
+      }
+    }
+    .el-button-group + .el-button,
+    .el-button + .el-input-number,
+    .el-input-number + .el-button,
+    .el-button-group + .el-button-group,
+    .el-button + .el-button-group,
+    .el-input-number + .el-button-group {
+      margin-left: 10px;
+    }
+    .el-radio-group label {
+      margin-bottom: 0;
+    }
+    .el-input-number {
+      vertical-align: middle;
+      [role="button"] {
+        margin-top: 0;
+      }
+    }
+    .el-input-number.noButton {
+      line-height: 26px;
+    }
+  }
+  .drag_item_title {
+    font-size: 13px;
+    padding: 12px 6px 6px 6px;
+    font-weight: bold;
+  }
+  .drag_item_box {
+    padding: 2px 0 4px 5px;
+    .ep-draggable-item {
+      @include ellipsis;
+      display: inline-block;
+      height: 60px;
+      line-height: 28px;
+      width: 76px;
+      float: left;
+      cursor: move;
+      background: #f1f2f3;
+      font-size: $fontSizeBase;
+      text-align: center;
+      .glyphicon {
+        display: block;
+        margin: 10px auto 2px;
+        font-size: 18px;
+        color: #409eff;
+      }
+      &:hover {
+        background: #ebeef5;
+        outline: 1px solid #409eff;
+      }
+    }
+  }
+  .params_setting_container {
+    .prop-tabs {
+      padding: 0 8px;
+      .prop-tab-items {
+        height: 38px;
+        line-height: 38px;
+        border-bottom: solid 2px #dfe4ed;
+        padding: 0;
+        .prop-tab-item {
+          margin: 0;
+          &.active {
+            border-bottom-color: $baseColor;
+            color: $baseColor;
+            height: 38px;
+            line-height: 38px;
+          }
+          .tab-title {
+            font-weight: 400;
+            font-size: $fontSizeBase;
+          }
+        }
+      }
+    }
+    .hiprint-option-item {
+      .hiprint-option-item-label {
+        font-size: 13px;
+        margin-top: 8px;
+      }
+      .hiprint-option-item-field {
+        textarea,
+        input,
+        select {
+          border-radius: 2px;
+          border: 1px solid #dcdfe6;
+          color: #606266;
+          height: 28px;
+          padding: 4px 8px;
+        }
+        input.minicolors-input {
+          padding-left: 23px;
+        }
+        .minicolors-swatch {
+          left: 5px;
+          top: 6px;
+          border-radius: 2px;
+        }
+      }
+    }
+    .hiprint-option-item-settingBtn {
+      min-width: 96px;
+      height: 28px;
+      border-radius: 2px;
+      padding: 0 8px;
+      font-size: $fontSizeBase;
+      line-height: 25px;
+      cursor: pointer;
+      background-color: $baseColor;
+    }
+  }
+  .hiprint-printElement-type {
+    .title {
+      font-size: 13px;
+      padding: 12px 6px 6px 6px;
+      font-weight: bold;
+    }
+  }
+}

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

@@ -1,9 +1,9 @@
 <template>
   <span>
     <el-button type="primary" class="button-sty" @click="show"> 查看模板json </el-button>
-    <el-dialog :visible="visible" :maskClosable="false" @cancel="hideModal">
+    <el-dialog :visible.sync="visible" :close-on-click-modal="false" @close="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="jsonOut" />
       <!-- </el-spin> -->
       <template slot="title">
         <div>
@@ -11,13 +11,13 @@
           <el-switch
             active-text="tid模式"
             inactive-text="默认"
-            v-model:checked="tidMode"
+            v-model="tidMode"
             @change="onModeChange"
           />
           <el-switch
             active-text="美化"
             inactive-text="压缩"
-            v-model:checked="beautify"
+            v-model="beautify"
             @change="onModeChange"
           />
         </div>

package/src/components/jdPrint/mixins.js

@@ -108,6 +108,8 @@ modules = {
     openUrl(file_data) {
       let url = this.base64ToUrl(file_data, "image/png");
       window.open(url);
+      // 新窗口完成 Blob URL 读取后释放；立即 revoke 可能让预览页尚未加载就失效。
+      setTimeout(() => URL.revokeObjectURL(url), 60000);
     },
     base64ToUrl(base64String, fileType) {
       // 将Base64字符串解码为二进制数据

package/src/components/jsonImport/index.vue

@@ -21,7 +21,7 @@
           </div>
         </el-upload>
         <div class="upload-finish" v-if="fileRaw">
-          <img :src="$assetUrl(require('@/resources' + '/images/ico-txt.svg'))" class="ico"/>
+          <img :src="$assetUrl(require('@base/core-resources' + '/images/ico-txt.svg'))" class="ico"/>
           <p class="name">{{ fileRaw.name }}</p>
           <!-- <p>2022-1-17</p> -->
           <el-tooltip :enterable="false" class="item" effect="dark"

package/src/components/jsonImport/mixins.js

@@ -1,18 +1,14 @@
-/**version-1.0*/
-import {read, utils} from 'xlsx'
-
-let tmixins = {};
-var XLSX = window.XLSX || {read, utils};
+/**version-1.0*/
+let tmixins = {};
 import {
   getToken
 } from '../../utils/auth';
 import { getErrorMsg } from '@base/utils/index.js'
 
-let configUtil = {
-  baseUrl: process.env.VUE_APP_BASE_API,
-  XLSX,
-  getToken
-};
+let configUtil = {
+  baseUrl: process.env.VUE_APP_BASE_API,
+  getToken
+};
 // importTimer / loadingObj 原为模块级单例：两个导入弹窗并存时后者覆盖前者引用，
 // 前一个 interval（100ms/次）与 loading 永久失控——已改为实例属性 this.importTimer / this.loadingObj
 tmixins = {

package/src/components/langImport/index.vue

@@ -21,7 +21,7 @@
           </div>
         </el-upload>
         <div class="upload-finish" v-if="fileRaw">
-          <img :src="$assetUrl(require('@/resources' + '/images/ico-txt.svg'))" class="ico"/>
+          <img :src="$assetUrl(require('@base/core-resources' + '/images/ico-txt.svg'))" class="ico"/>
           <p class="name">{{ fileRaw.name }}</p>
           <!-- <p>2022-1-17</p> -->
           <el-tooltip :enterable="false" class="item" effect="dark"

package/src/components/langImport/mixins.js

@@ -1,18 +1,14 @@
-/**version-1.0*/
-import {read, utils} from 'xlsx'
-
-let tmixins = {};
-var XLSX = window.XLSX || {read, utils};
+/**version-1.0*/
+let tmixins = {};
 import {
   getToken
 } from '../../utils/auth';
 import { getErrorMsg } from '@base/utils/index.js'
 
-let configUtil = {
-  baseUrl: process.env.VUE_APP_BASE_API,
-  XLSX,
-  getToken
-};
+let configUtil = {
+  baseUrl: process.env.VUE_APP_BASE_API,
+  getToken
+};
 // importTimer / loadingObj 原为模块级单例：两个导入弹窗并存时后者覆盖前者引用，
 // 前一个 interval（100ms/次）与 loading 永久失控——已改为实例属性 this.importTimer / this.loadingObj
 tmixins = {

package/src/components/luckysheet/loadResources.js

@@ -0,0 +1,64 @@
+const pending = new Map();
+const styles = ["plugins/css/pluginsCss.css", "plugins/plugins.css", "css/luckysheet.css", "assets/iconfont/iconfont.css"];
+const scripts = ["plugins/js/plugin.js", "luckysheet.umd.js"];
+
+function isCompatible(api) {
+  return api && typeof api.create === "function" && typeof api.destroy === "function";
+}
+
+function removeResource(url, tag) {
+  pending.delete(url);
+  const element = Array.from(document.querySelectorAll(tag)).find(candidate => new URL(candidate.href || candidate.src, window.location.href).href === url);
+  if (element && element.parentNode) element.parentNode.removeChild(element);
+}
+
+function loadElement(url, tag) {
+  if (pending.has(url)) return pending.get(url);
+  const existing = Array.from(document.querySelectorAll(tag)).find(element => new URL(element.href || element.src, window.location.href).href === url);
+  if (existing && (tag === "link" ? existing.sheet : existing.dataset.coreLoaded === "true")) return Promise.resolve(existing);
+  const element = existing || document.createElement(tag);
+  const promise = new Promise((resolve, reject) => {
+    const timer = setTimeout(() => finish(new Error(`Luckysheet 资源加载超时：${url}`)), 30000);
+    function finish(error) {
+      clearTimeout(timer);
+      element.onload = element.onerror = null;
+      if (error) {
+        if (!existing && element.parentNode) element.parentNode.removeChild(element);
+        reject(error);
+      } else {
+        element.dataset.coreLoaded = "true";
+        resolve(element);
+      }
+    }
+    element.onload = () => finish();
+    element.onerror = () => finish(new Error(`Luckysheet 资源加载失败：${url}`));
+    if (!existing) {
+      if (tag === "link") { element.rel = "stylesheet"; element.href = url; document.head.appendChild(element); }
+      else { element.src = url; document.body.appendChild(element); }
+    }
+  });
+  pending.set(url, promise);
+  promise.catch(() => pending.delete(url));
+  return promise;
+}
+
+export async function loadLuckysheet(base) {
+  const source = base + "luckysheet.umd.js";
+  if (window.luckysheet) {
+    if (!isCompatible(window.luckysheet)) {
+      throw new Error("页面已存在不兼容的 window.luckysheet 全局变量");
+    }
+    if (window.__CORE_LUCKYSHEET_SOURCE__ && window.__CORE_LUCKYSHEET_SOURCE__ !== source) {
+      throw new Error(`Luckysheet 已存在不同来源的全局实例：${window.__CORE_LUCKYSHEET_SOURCE__}`);
+    }
+    return window.luckysheet;
+  }
+  await Promise.all(styles.map(file => loadElement(base + file, "link")));
+  for (const file of scripts) await loadElement(base + file, "script");
+  if (!isCompatible(window.luckysheet)) {
+    removeResource(source, "script");
+    throw new Error(`Luckysheet 脚本未提供兼容实例：${source}`);
+  }
+  window.__CORE_LUCKYSHEET_SOURCE__ = source;
+  return window.luckysheet;
+}