yh-hiprint 2.3.6 → 2.4.1

package/hooks/useHiprint.js

@@ -6,12 +6,12 @@ import "../libs/hiprint.config.js";
 // 样式
 import "../libs/css/hiprint.css";
 import "../libs/css/print-lock.css";
-import { ref, computed, watch } from "vue";
+import { ref, computed, watch, reactive, nextTick } from "vue";
 
 export const hiprint = h;
 export const defaultElementTypeProvider = p;
 
-export function print(provider = defaultElementTypeProvider, template, ...args) {
+export function print (provider = defaultElementTypeProvider, template, ...args) {
   hiprint.init({
     providers: [new provider()],
   });
@@ -22,7 +22,7 @@ export function print(provider = defaultElementTypeProvider, template, ...args)
   return hiprintTemplate;
 }
 
-export function print2(provider = defaultElementTypeProvider, template, ...args) {
+export function print2 (provider = defaultElementTypeProvider, template, ...args) {
   hiprint.init({
     providers: [new provider()],
   });
@@ -33,11 +33,28 @@ export function print2(provider = defaultElementTypeProvider, template, ...args)
   return hiprintTemplate;
 }
 
-export function usePaper() {
+export function usePaper () {
   const paperType = ref("A4");
+  const paperTypeName = computed(() => {
+    const paperTypeObj = paperTypesObj.find((item) => item.value === paperType.value);
+    if (paperTypeObj) {
+      return paperTypeObj.label;
+    } else {
+      return "自定义";
+    }
+  });
   const paperWidth = ref(210);
   const paperHeight = ref(296.6);
 
+  const paperTypesObj = reactive([
+    { label: "A3", value: "A3" },
+    { label: "A4", value: "A4" },
+    { label: "A5", value: "A5" },
+    { label: "B3", value: "B3" },
+    { label: "B4", value: "B4" },
+    { label: "B5", value: "B5" },
+  ]);
+
   const paperTypes = {
     A3: {
       width: 420,
@@ -65,7 +82,7 @@ export function usePaper() {
     },
   };
 
-  function setPaper(type, callback) {
+  function setPaper (type, callback) {
     if (type !== "other") {
       let { width, height } = paperTypes[type];
       paperWidth.value = width;
@@ -74,33 +91,37 @@ export function usePaper() {
     callback();
   }
 
-  watch([paperWidth, paperHeight], (width, height) => {
-    if (width === 420 && height === 297) {
-      paperType.value = "A3";
-    } else if (width === 210 && height === 297) {
-      paperType.value = "A4";
-    } else if (width === 210 && height === 148) {
-      paperType.value = "A5";
-    } else if (width === 500 && height === 353) {
-      paperType.value = "B3";
-    } else if (width === 250 && height === 353) {
-      paperType.value = "B4";
-    } else if (width === 250 && height === 176) {
-      paperType.value = "B5";
-    } else {
-      paperType.value = "other";
-    }
+  watch([paperWidth, paperHeight], ([width, height], [oldW, oldH]) => {
+    nextTick(() => {
+      if (width === 420 && height === 297) {
+        paperType.value = "A3";
+      } else if (width === 210 && height === 297) {
+        paperType.value = "A4";
+      } else if (width === 210 && height === 148) {
+        paperType.value = "A5";
+      } else if (width === 500 && height === 353) {
+        paperType.value = "B3";
+      } else if (width === 250 && height === 353) {
+        paperType.value = "B4";
+      } else if (width === 250 && height === 176) {
+        paperType.value = "B5";
+      } else {
+        paperType.value = "other";
+      }
+    });
   });
 
   return {
     paperType,
     paperWidth,
     paperHeight,
+    paperTypesObj,
+    paperTypeName,
     setPaper,
   };
 }
 
-export function useScale(callback) {
+export function useScale (callback) {
   const scaleValue = ref(1);
   const scalePercentage = computed(() => {
     return `${(scaleValue.value * 100).toFixed(0)}%`;
@@ -111,11 +132,11 @@ export function useScale(callback) {
   const canZoomOut = computed(() => {
     return scaleValue.value < 4;
   });
-  function zoomIn() {
+  function zoomIn () {
     scaleValue.value = scaleValue.value - 0.1;
     callback();
   }
-  function zoomOut() {
+  function zoomOut () {
     scaleValue.value = scaleValue.value + 0.1;
     callback();
   }
@@ -129,9 +150,9 @@ export function useScale(callback) {
   };
 }
 
-export function useDataSource(axios) {
+export function useDataSource (axios) {
   const detailData = ref();
-  function getDetail(id) {
+  function getDetail (id) {
     return axios
       .request({
         url: `/printTemplate/get/${id}`,
@@ -171,7 +192,7 @@ export function useDataSource(axios) {
   });
   const dataSourceForm = ref([]);
   const codeMapDataSource = ref({});
-  function getDataSourceList() {
+  function getDataSourceList () {
     return axios
       .request({
         url: "/printTemplate/getDsList",

package/libs/hiprint.bundle.js

@@ -2649,7 +2649,17 @@ var hiprint = (function (t) {
                 (n += " </select>\n            </div>\n        </div>"),
                 (this.target = hiprintJQuery(n));
             } else {
-              this.target = hiprintJQuery(' <div class="hiprint-option-item">\n        <div class="hiprint-option-item-label">\n        字体\n        </div>\n        <div class="hiprint-option-item-field">\n        <select class="auto-submit">\n        <option value="" >默认</option>\n            <option value="SimSun" >宋体</option>\n            <option value="Microsoft YaHei" >微软雅黑</option>\n        </select>\n        </div>\n    </div>');
+              this.target = hiprintJQuery(`<div class="hiprint-option-item">
+                <div class="hiprint-option-item-label">字体</div>
+                <div class="hiprint-option-item-field">
+                  <select class="auto-submit">
+                    <option value="" >默认</option>
+                    <option value="SimSun" >宋体</option>
+                    <option value="Microsoft YaHei" >微软雅黑</option>
+                    <option value="Times New Roman" >Times New Roman</option>
+                  </select>
+                </div>
+              </div>`);
             }
             return this.target;
           }),

package/libs/jquery.js

@@ -10616,5 +10616,6 @@ jQuery.trim = function (text) {
     (text + "").replace(rtrim, "$1");
 };
 
+export default jQuery;
 
 window.hiprintJQuery = jQuery;

package/libs/jsbarcode/JsBarcode.js

@@ -1,39 +1,27 @@
-var _barcodes = require('./barcodes/');
-var _barcodes2 = _interopRequireDefault(_barcodes);
-var _merge = require('./help/merge.js');
-var _merge2 = _interopRequireDefault(_merge);
-var _linearizeEncodings = require('./help/linearizeEncodings.js');
-var _linearizeEncodings2 = _interopRequireDefault(_linearizeEncodings);
-var _fixOptions = require('./help/fixOptions.js');
-var _fixOptions2 = _interopRequireDefault(_fixOptions);
-var _getRenderProperties = require('./help/getRenderProperties.js');
-var _getRenderProperties2 = _interopRequireDefault(_getRenderProperties);
-var _optionsFromStrings = require('./help/optionsFromStrings.js');
-var _optionsFromStrings2 = _interopRequireDefault(_optionsFromStrings);
-var _ErrorHandler = require('./exceptions/ErrorHandler.js');
-var _ErrorHandler2 = _interopRequireDefault(_ErrorHandler);
-var _exceptions = require('./exceptions/exceptions.js');
-var _defaults = require('./options/defaults.js');
-var _defaults2 = _interopRequireDefault(_defaults);
-function _interopRequireDefault (obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// The protype of the object returned from the JsBarcode() call
-
+// Import all the barcodes
+import barcodes from './barcodes/';
 
 // Help functions
-var API = function API () {};
-
-// The first call of the library API
-// Will return an object with all barcodes calls and the data that is used
-// by the renderers
+import merge from './help/merge.js';
+import linearizeEncodings from './help/linearizeEncodings.js';
+import fixOptions from './help/fixOptions.js';
+import getRenderProperties from './help/getRenderProperties.js';
+import optionsFromStrings from './help/optionsFromStrings.js';
 
+// Exceptions
+import ErrorHandler from './exceptions/ErrorHandler.js';
+import { InvalidInputException, NoElementException } from './exceptions/exceptions.js';
 
 // Default values
+import defaults from './options/defaults.js';
 
+// The protype of the object returned from the JsBarcode() call
+let API = function () {};
 
-// Exceptions
-// Import all the barcodes
-var JsBarcode = function JsBarcode (element, text, options) {
+// The first call of the library API
+// Will return an object with all barcodes calls and the data that is used
+// by the renderers
+let JsBarcode = function (element, text, options) {
   var api = new API();
 
   if (typeof element === "undefined") {
@@ -41,10 +29,10 @@ var JsBarcode = function JsBarcode (element, text, options) {
   }
 
   // Variables that will be pased through the API calls
-  api._renderProperties = (0, _getRenderProperties2.default)(element);
+  api._renderProperties = getRenderProperties(element);
   api._encodings = [];
-  api._options = _defaults2.default;
-  api._errorHandler = new _ErrorHandler2.default(api);
+  api._options = defaults;
+  api._errorHandler = new ErrorHandler(api);
 
   // If text is set, use the simple syntax (render the barcode directly)
   if (typeof text !== "undefined") {
@@ -62,32 +50,34 @@ var JsBarcode = function JsBarcode (element, text, options) {
 
 // To make tests work TODO: remove
 JsBarcode.getModule = function (name) {
-  return _barcodes2.default[name];
+  return barcodes[name];
 };
 
 // Register all barcodes
-for (var name in _barcodes2.default) {
-  if (_barcodes2.default.hasOwnProperty(name)) {
-    // Security check if the propery is a prototype property
-    registerBarcode(_barcodes2.default, name);
+for (var name in barcodes) {
+  if (barcodes.hasOwnProperty(name)) { // Security check if the propery is a prototype property
+    registerBarcode(barcodes, name);
   }
 }
 function registerBarcode (barcodes, name) {
-  API.prototype[name] = API.prototype[name.toUpperCase()] = API.prototype[name.toLowerCase()] = function (text, options) {
-    var api = this;
-    return api._errorHandler.wrapBarcodeCall(function () {
-      // Ensure text is options.text
-      options.text = typeof options.text === 'undefined' ? undefined : '' + options.text;
-
-      var newOptions = (0, _merge2.default)(api._options, options);
-      newOptions = (0, _optionsFromStrings2.default)(newOptions);
-      var Encoder = barcodes[name];
-      var encoded = encode(text, Encoder, newOptions);
-      api._encodings.push(encoded);
-
-      return api;
-    });
-  };
+  API.prototype[name] =
+    API.prototype[name.toUpperCase()] =
+    API.prototype[name.toLowerCase()] =
+    function (text, options) {
+      var api = this;
+      return api._errorHandler.wrapBarcodeCall(function () {
+        // Ensure text is options.text
+        options.text = typeof options.text === 'undefined' ? undefined : '' + options.text;
+
+        var newOptions = merge(api._options, options);
+        newOptions = optionsFromStrings(newOptions);
+        var Encoder = barcodes[name];
+        var encoded = encode(text, Encoder, newOptions);
+        api._encodings.push(encoded);
+
+        return api;
+      });
+    };
 }
 
 // encode() handles the Encoder call and builds the binary string to be rendered
@@ -100,7 +90,7 @@ function encode (text, Encoder, options) {
   // If the input is not valid for the encoder, throw error.
   // If the valid callback option is set, call it instead of throwing error
   if (!encoder.valid()) {
-    throw new _exceptions.InvalidInputException(encoder.constructor.name, text);
+    throw new InvalidInputException(encoder.constructor.name, text);
   }
 
   // Make a request for the binary data (and other infromation) that should be rendered
@@ -108,11 +98,11 @@ function encode (text, Encoder, options) {
 
   // Encodings can be nestled like [[1-1, 1-2], 2, [3-1, 3-2]
   // Convert to [1-1, 1-2, 2, 3-1, 3-2]
-  encoded = (0, _linearizeEncodings2.default)(encoded);
+  encoded = linearizeEncodings(encoded);
 
   // Merge
-  for (var i = 0; i < encoded.length; i++) {
-    encoded[i].options = (0, _merge2.default)(options, encoded[i].options);
+  for (let i = 0; i < encoded.length; i++) {
+    encoded[i].options = merge(options, encoded[i].options);
   }
 
   return encoded;
@@ -120,24 +110,24 @@ function encode (text, Encoder, options) {
 
 function autoSelectBarcode () {
   // If CODE128 exists. Use it
-  if (_barcodes2.default["CODE128"]) {
+  if (barcodes["CODE128"]) {
     return "CODE128";
   }
 
   // Else, take the first (probably only) barcode
-  return Object.keys(_barcodes2.default)[0];
+  return Object.keys(barcodes)[0];
 }
 
 // Sets global encoder options
 // Added to the api by the JsBarcode function
 API.prototype.options = function (options) {
-  this._options = (0, _merge2.default)(this._options, options);
+  this._options = merge(this._options, options);
   return this;
 };
 
 // Will create a blank space (usually in between barcodes)
 API.prototype.blank = function (size) {
-  var zeroes = new Array(size + 1).join("0");
+  const zeroes = new Array(size + 1).join("0");
   this._encodings.push({ data: zeroes });
   return this;
 };
@@ -155,9 +145,9 @@ API.prototype.init = function () {
   }
 
   var renderProperty;
-  for (var i in this._renderProperties) {
+  for (let i in this._renderProperties) {
     renderProperty = this._renderProperties[i];
-    var options = (0, _merge2.default)(this._options, renderProperty.options);
+    var options = merge(this._options, renderProperty.options);
 
     if (options.format == "auto") {
       options.format = autoSelectBarcode();
@@ -165,7 +155,7 @@ API.prototype.init = function () {
 
     this._errorHandler.wrapBarcodeCall(function () {
       var text = options.value;
-      var Encoder = _barcodes2.default[options.format.toUpperCase()];
+      var Encoder = barcodes[options.format.toUpperCase()];
       var encoded = encode(text, Encoder, options);
 
       render(renderProperty, encoded, options);
@@ -173,35 +163,37 @@ API.prototype.init = function () {
   }
 };
 
+
 // The render API call. Calls the real render function.
 API.prototype.render = function () {
   if (!this._renderProperties) {
-    throw new _exceptions.NoElementException();
+    throw new NoElementException();
   }
 
   if (Array.isArray(this._renderProperties)) {
     for (var i = 0; i < this._renderProperties.length; i++) {
       render(this._renderProperties[i], this._encodings, this._options);
     }
-  } else {
+  }
+  else {
     render(this._renderProperties, this._encodings, this._options);
   }
 
   return this;
 };
 
-API.prototype._defaults = _defaults2.default;
+API.prototype._defaults = defaults;
 
 // Prepares the encodings and calls the renderer
 function render (renderProperties, encodings, options) {
-  encodings = (0, _linearizeEncodings2.default)(encodings);
+  encodings = linearizeEncodings(encodings);
 
-  for (var i = 0; i < encodings.length; i++) {
-    encodings[i].options = (0, _merge2.default)(options, encodings[i].options);
-    (0, _fixOptions2.default)(encodings[i].options);
+  for (let i = 0; i < encodings.length; i++) {
+    encodings[i].options = merge(options, encodings[i].options);
+    fixOptions(encodings[i].options);
   }
 
-  (0, _fixOptions2.default)(options);
+  fixOptions(options);
 
   var Renderer = renderProperties.renderer;
   var renderer = new Renderer(renderProperties.element, encodings, options);
@@ -230,4 +222,4 @@ if (typeof hiprintJQuery !== 'undefined') {
 }
 
 // Export to commonJS
-module.exports = JsBarcode;
+export default JsBarcode;

package/libs/jsbarcode/barcodes/Barcode.js

@@ -1,17 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-	value: true
-});
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-var Barcode = function Barcode(data, options) {
-	_classCallCheck(this, Barcode);
-
-	this.data = data;
-	this.text = options.text || data;
-	this.options = options;
-};
-
-exports.default = Barcode;
+class Barcode{
+	constructor(data, options){
+		this.data = data;
+		this.text = options.text || data;
+		this.options = options;
+	}
+}
+
+export default Barcode;