zartui 3.1.20 → 3.1.22

package/lib/index.d.ts

@@ -81,4 +81,4 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "3.1.20";
+export const version: "3.1.22";

package/lib/index.js

@@ -176,7 +176,7 @@ __reExport(stdin_exports, require("./time-picker"), module.exports);
 __reExport(stdin_exports, require("./timeline"), module.exports);
 __reExport(stdin_exports, require("./toast"), module.exports);
 __reExport(stdin_exports, require("./uploader"), module.exports);
-const version = "3.1.20";
+const version = "3.1.22";
 function install(app) {
   const components = [
     import_action_sheet.ActionSheet,

package/lib/media-picker/MediaPicker.js

@@ -52,10 +52,7 @@ var import_TakeAudioIcon = __toESM(require("./image/TakeAudioIcon"));
 var import_PickFileIcon = __toESM(require("./image/PickFileIcon"));
 var import_media_util = require("./util/media-util");
 var import_image_preview = require("../image-preview");
-var import_resize_options = require("./watermark/resize-options");
-var import_compress_options = require("./watermark/compress-options");
-var import_watermark = require("./watermark/watermark");
-var import_image_processor = require("./watermark/image-processor");
+var import_app_media_utils = require("@egova-mobile/app-media-utils");
 var import_utils2 = require("../field/utils");
 var import_wx_util = require("./util/wx-util");
 const [name, bem] = (0, import_utils.createNamespace)("media-picker");
@@ -361,11 +358,11 @@ var stdin_default = (0, import_vue2.defineComponent)({
     };
     const transformImageFiles = (files) => {
       const promisesTodo = [];
-      const resizeOptions = new import_resize_options.ResizeOptions(props.maxImageSideLength);
-      const compressOptions = new import_compress_options.CompressOptions(props.maxImageFileSize);
+      const resizeOptions = new import_app_media_utils.ResizeOptions(props.maxImageSideLength);
+      const compressOptions = new import_app_media_utils.CompressOptions(props.maxImageFileSize);
       for (let i = 0; i < files.length; i++) {
         const file = files[i];
-        const watermarkEnabled = props.watermarkOptions && props.watermarkOptions.watermarkConfigString && (0, import_watermark.checkWatermarkConfigSupported)(props.watermarkOptions.watermarkConfigString);
+        const watermarkEnabled = props.watermarkOptions && props.watermarkOptions.watermarkConfigString && (0, import_app_media_utils.checkWatermarkConfigSupported)(props.watermarkOptions.watermarkConfigString);
         let watermarkOpt;
         if (watermarkEnabled) {
           watermarkOpt = {
@@ -383,7 +380,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
             enabled: false
           };
         }
-        const promise = new import_image_processor.ImageProcessor(file, resizeOptions, watermarkOpt, compressOptions).process().then((f) => {
+        const promise = new import_app_media_utils.ImageProcessor(file, resizeOptions, watermarkOpt, compressOptions).process().then((f) => {
           if (!f) {
             return Promise.resolve(null);
           }

package/lib/media-picker/util/media-util.d.ts

@@ -19,20 +19,6 @@ export declare function getUniqueFileName(file: File, suffix?: string): string;
  * @param file
  */
 export declare function file2DataURL(file: File): Promise<string>;
-/**
- * Convert file to image
- * @param file
- */
-export declare function file2Image(file: File): Promise<HTMLImageElement>;
-/**
- * Draw image on canvas
- * @param img
- * @param type
- * @param orientation
- * @param width
- * @param height
- */
-export declare function image2Canvas(img: HTMLImageElement, type: string, orientation?: number, width?: number, height?: number): Promise<HTMLCanvasElement>;
 /**
  * Export File from canvas
  * @param canvas
@@ -43,44 +29,3 @@ export declare function image2Canvas(img: HTMLImageElement, type: string, orient
  * @see {@link https://meshworld.in/convert-canvas-to-an-image-using-javascript/}
  */
 export declare function canvas2File(canvas: HTMLCanvasElement, fileName: string, lastModified: number, type?: string, quality?: number): Promise<File>;
-export declare function image2file(img: HTMLImageElement, fileName: string, lastModified: number, type?: string, quality?: number): Promise<File>;
-/**
- * Export Image from canvas
- * @param canvas
- * @param type
- * @param quality
- * @see {@link https://meshworld.in/convert-canvas-to-an-image-using-javascript/}
- */
-export declare function canvas2Image(canvas: HTMLCanvasElement, type?: string, quality?: number): Promise<HTMLImageElement>;
-export type ResizeResultType = 'image' | 'canvas';
-/**
- * Get orientation value from given array buffer.
- * @param {ArrayBuffer} arrayBuffer - The array buffer to read.
- * @returns {number} The read orientation value.
- * Source：https://github.com/fengyuanchen/compressorjs/blob/main/src/utilities.js
- * 99行，resetAndGetOrientation方法
- */
-export declare function getOrientation(arrayBuffer: ArrayBuffer): number | undefined;
-/**
- * 缩放图片
- * @param img：HTMLImageElement 图片对象
- * @param inputType 图片类型
- * @param orientation
- * @param imageWidth 图片宽度
- * @param imageHeight 图片高度
- // * @param equalProportion 是否等比例拉伸，默认是，目前只支持等比例拉伸
- * @param sideLengthLimit 图片边长限制
- * @param baseOnShortSide 是否以短边为限制
- * @param resultType: ResizeResultType, "image" | "canvas"
- */
-export declare function resize(img: HTMLImageElement, { inputType, orientation, // 图片的方向
-imageWidth, imageHeight, sideLengthLimit, baseOnShortSide, // 是否以短边为基准缩放
-resultType, }: {
-    inputType?: string | undefined;
-    orientation?: number | undefined;
-    imageWidth?: number | undefined;
-    imageHeight?: number | undefined;
-    sideLengthLimit?: number | undefined;
-    baseOnShortSide?: boolean | undefined;
-    resultType?: string | undefined;
-}): Promise<HTMLImageElement | HTMLCanvasElement>;

package/lib/media-picker/util/media-util.js

@@ -21,34 +21,17 @@ __export(stdin_exports, {
   MIN_SIDE_LENGTH: () => MIN_SIDE_LENGTH,
   PHOTO_FILE_SIZE_LIMIT: () => PHOTO_FILE_SIZE_LIMIT,
   canvas2File: () => canvas2File,
-  canvas2Image: () => canvas2Image,
   file2DataURL: () => file2DataURL,
-  file2Image: () => file2Image,
   getFileUniqueCode: () => getFileUniqueCode,
-  getOrientation: () => getOrientation,
   getUniqueFileName: () => getUniqueFileName,
-  image2Canvas: () => image2Canvas,
-  image2file: () => image2file,
   isAudioType: () => isAudioType,
   isImageType: () => isImageType,
-  isVideoType: () => isVideoType,
-  resize: () => resize
+  isVideoType: () => isVideoType
 });
 module.exports = __toCommonJS(stdin_exports);
 const MAX_SIDE_LENGTH = 1920;
 const MIN_SIDE_LENGTH = 480;
 const PHOTO_FILE_SIZE_LIMIT = 1e3;
-var Orientation = /* @__PURE__ */ ((Orientation2) => {
-  Orientation2[Orientation2["TOP_AND_LEFT"] = 1] = "TOP_AND_LEFT";
-  Orientation2[Orientation2["TOP_AND_RIGHT"] = 2] = "TOP_AND_RIGHT";
-  Orientation2[Orientation2["BOTTOM_AND_RIGHT"] = 3] = "BOTTOM_AND_RIGHT";
-  Orientation2[Orientation2["BOTTOM_AND_LEFT"] = 4] = "BOTTOM_AND_LEFT";
-  Orientation2[Orientation2["LEFT_AND_TOP"] = 5] = "LEFT_AND_TOP";
-  Orientation2[Orientation2["RIGHT_AND_TOP"] = 6] = "RIGHT_AND_TOP";
-  Orientation2[Orientation2["RIGHT_AND_BOTTOM"] = 7] = "RIGHT_AND_BOTTOM";
-  Orientation2[Orientation2["LEFT_AND_BOTTOM"] = 8] = "LEFT_AND_BOTTOM";
-  return Orientation2;
-})(Orientation || {});
 function isImageType(file) {
   return file.type.indexOf("image/") >= 0;
 }
@@ -72,47 +55,6 @@ function getUniqueFileName(file, suffix = "") {
   )}`;
   return suffix ? name + "." + suffix : name;
 }
-function adjustImgOrientation(ctx, img, orientation, width, height) {
-  switch (orientation) {
-    case 3 /* BOTTOM_AND_RIGHT */:
-      ctx.rotate(180 * Math.PI / 180);
-      ctx.drawImage(img, -width, -height, width, height);
-      break;
-    case 6 /* RIGHT_AND_TOP */:
-      ctx.rotate(90 * Math.PI / 180);
-      ctx.drawImage(img, 0, -width, height, width);
-      break;
-    case 8 /* LEFT_AND_BOTTOM */:
-      ctx.rotate(270 * Math.PI / 180);
-      ctx.drawImage(img, -height, 0, height, width);
-      break;
-    case 2 /* TOP_AND_RIGHT */:
-      ctx.translate(width, 0);
-      ctx.scale(-1, 1);
-      ctx.drawImage(img, 0, 0, width, height);
-      break;
-    case 4 /* BOTTOM_AND_LEFT */:
-      ctx.translate(width, 0);
-      ctx.scale(-1, 1);
-      ctx.rotate(180 * Math.PI / 180);
-      ctx.drawImage(img, -width, -height, width, height);
-      break;
-    case 5 /* LEFT_AND_TOP */:
-      ctx.translate(width, 0);
-      ctx.scale(-1, 1);
-      ctx.rotate(90 * Math.PI / 180);
-      ctx.drawImage(img, 0, -width, height, width);
-      break;
-    case 7 /* RIGHT_AND_BOTTOM */:
-      ctx.translate(width, 0);
-      ctx.scale(-1, 1);
-      ctx.rotate(270 * Math.PI / 180);
-      ctx.drawImage(img, -height, 0, height, width);
-      break;
-    default:
-      ctx.drawImage(img, 0, 0, width, height);
-  }
-}
 function file2DataURL(file) {
   return new Promise((resolve, reject) => {
     const a = new FileReader();
@@ -126,39 +68,6 @@ function file2DataURL(file) {
     a.readAsDataURL(file);
   });
 }
-function file2Image(file) {
-  return new Promise((resolve, reject) => {
-    file2DataURL(file).then((url) => {
-      const img = new Image();
-      img.src = url;
-      img.onload = function() {
-        if (img.complete) {
-          resolve(img);
-        } else {
-          reject(new Error("\u6587\u4EF6\u52A0\u8F7D\u5931\u8D25"));
-        }
-      };
-    }).catch(reject);
-  });
-}
-function image2Canvas(img, type, orientation, width, height) {
-  const canvas = document.createElement("canvas");
-  const _width = width || img.width;
-  const _height = height || img.height;
-  canvas.width = _width;
-  canvas.height = _height;
-  const ctx = canvas.getContext("2d");
-  if (ctx) {
-    ctx.fillStyle = "transparent";
-    if (type === "image/jpeg") {
-      ctx.fillStyle = "#fff";
-    }
-    ctx.fillRect(0, 0, _width, _height);
-    adjustImgOrientation(ctx, img, orientation, _width, _height);
-    return Promise.resolve(canvas);
-  }
-  return Promise.reject(new Error("canvas getContext return null"));
-}
 function canvas2File(canvas, fileName, lastModified, type = "image/jpeg", quality = 0.8) {
   return new Promise((resolve, reject) => {
     canvas.toBlob(
@@ -175,114 +84,3 @@ function canvas2File(canvas, fileName, lastModified, type = "image/jpeg", qualit
     );
   });
 }
-function image2file(img, fileName, lastModified, type = "image/jpeg", quality = 0.8) {
-  return image2Canvas(img, type).then(
-    (canvas) => canvas2File(canvas, fileName, lastModified, type, quality)
-  );
-}
-function canvas2Image(canvas, type = "image/jpeg", quality = 0.8) {
-  const image = new Image();
-  image.src = canvas.toDataURL(type, quality);
-  return Promise.resolve(image);
-}
-function getStringFromCharCode(dataView, start, length) {
-  let str = "";
-  let i;
-  length += start;
-  for (i = start; i < length; i += 1) {
-    str += String.fromCharCode(dataView.getUint8(i));
-  }
-  return str;
-}
-function getOrientation(arrayBuffer) {
-  const dataView = new DataView(arrayBuffer);
-  let orientation;
-  try {
-    let littleEndian;
-    let app1Start;
-    let ifdStart;
-    if (dataView.getUint8(0) === 255 && dataView.getUint8(1) === 216) {
-      const length = dataView.byteLength;
-      let offset = 2;
-      while (offset + 1 < length) {
-        if (dataView.getUint8(offset) === 255 && dataView.getUint8(offset + 1) === 225) {
-          app1Start = offset;
-          break;
-        }
-        offset += 1;
-      }
-    }
-    if (app1Start) {
-      const exifIDCode = app1Start + 4;
-      const tiffOffset = app1Start + 10;
-      if (getStringFromCharCode(dataView, exifIDCode, 4) === "Exif") {
-        const endianness = dataView.getUint16(tiffOffset);
-        littleEndian = endianness === 18761;
-        if (littleEndian || endianness === 19789) {
-          if (dataView.getUint16(tiffOffset + 2, littleEndian) === 42) {
-            const firstIFDOffset = dataView.getUint32(
-              tiffOffset + 4,
-              littleEndian
-            );
-            if (firstIFDOffset >= 8) {
-              ifdStart = tiffOffset + firstIFDOffset;
-            }
-          }
-        }
-      }
-    }
-    if (ifdStart) {
-      const _length = dataView.getUint16(ifdStart, littleEndian);
-      let _offset;
-      let i;
-      for (i = 0; i < _length; i += 1) {
-        _offset = ifdStart + i * 12 + 2;
-        if (dataView.getUint16(_offset, littleEndian) === 274) {
-          _offset += 8;
-          orientation = dataView.getUint16(_offset, littleEndian);
-          dataView.setUint16(_offset, 1, littleEndian);
-          break;
-        }
-      }
-    }
-  } catch (e) {
-    orientation = 1;
-  }
-  return orientation;
-}
-function resize(img, {
-  inputType = "image/jpeg",
-  orientation = 1,
-  // 图片的方向
-  imageWidth = -1,
-  imageHeight = -1,
-  // equalProportion = true, // 等比例拉伸
-  sideLengthLimit = 640,
-  baseOnShortSide = true,
-  // 是否以短边为基准缩放
-  resultType = "image"
-}) {
-  let scale = 1;
-  const scaleBaseFunc = baseOnShortSide ? Math.min : Math.max;
-  if (imageWidth > 0 && imageHeight > 0) {
-    scale = sideLengthLimit / scaleBaseFunc(imageWidth, imageHeight);
-  } else if (img.width > 0 && img.height > 0) {
-    scale = sideLengthLimit / scaleBaseFunc(img.width, img.height);
-    imageWidth = img.width;
-    imageHeight = img.height;
-  } else {
-    return Promise.reject(new Error("image width/height \u65E0\u6548"));
-  }
-  const targetWidth = scale > 1 ? imageWidth : imageWidth * scale;
-  const targetHeight = scale > 1 ? imageHeight : imageHeight * scale;
-  if (resultType === "image") {
-    return image2Canvas(
-      img,
-      inputType,
-      orientation,
-      targetWidth,
-      targetHeight
-    ).then((canvas) => canvas2Image(canvas));
-  }
-  return image2Canvas(img, inputType, orientation, targetWidth, targetHeight);
-}

package/lib/tabs/Tabs.js

@@ -279,6 +279,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       "scrollable": scrollable.value,
       "activeColor": props.titleActiveColor,
       "inactiveColor": props.titleInactiveColor,
+      "setLine": setLine,
       "onClick": (event) => onClickTab(item, index, event)
     }, (0, import_utils.pick)(item, ["dot", "badge", "title", "disabled", "showZeroBadge"])), {
       title: item.$slots.title,

package/lib/tabs/TabsTitle.d.ts

@@ -20,6 +20,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    setLine: FunctionConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     id: StringConstructor;
     dot: BooleanConstructor;
@@ -42,6 +43,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    setLine: FunctionConstructor;
 }>>, {
     dot: boolean;
     disabled: boolean;

package/lib/tabs/TabsTitle.js

@@ -45,7 +45,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
     maxWidth: {
       type: String,
       default: "112px"
-    }
+    },
+    setLine: Function
   },
   setup(props, {
     slots
@@ -105,9 +106,30 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
       return Text;
     };
+    const mutationObserver = (0, import_vue2.ref)();
+    const dom = (0, import_vue2.ref)(null);
+    function mutation() {
+      props.setLine && props.setLine();
+    }
+    (0, import_vue2.onMounted)(() => {
+      if (!dom.value) {
+        return;
+      }
+      mutationObserver.value = new MutationObserver(mutation);
+      mutationObserver.value.observe(dom.value, {
+        characterData: true,
+        childList: true,
+        subtree: true
+      });
+    });
+    (0, import_vue2.onBeforeUnmount)(() => {
+      var _a, _b;
+      (_b = (_a = mutationObserver.value) == null ? void 0 : _a.unobserve) == null ? void 0 : _b.call(_a, dom.value);
+    });
     return () => (0, import_vue.createVNode)("div", {
       "id": props.id,
       "role": "tab",
+      "ref": dom,
       "class": [bem([props.type, {
         grow: props.scrollable && !props.shrink,
         shrink: props.shrink,

package/lib/uploader/Uploader.d.ts

@@ -201,9 +201,9 @@ declare const _default: import("vue").DefineComponent<{
     modelValue: UploaderFileListItem[];
     readonly: boolean;
     lazyLoad: boolean;
-    resultType: UploaderResultType;
     maxCount: string | number;
     imageFit: ImageFit;
+    resultType: UploaderResultType;
     uploadIcon: string;
     deletable: boolean;
     showUpload: boolean;

package/lib/uploader/index.d.ts

@@ -134,9 +134,9 @@ export declare const Uploader: import("../utils").WithInstall<import("vue").Defi
     modelValue: import("./types").UploaderFileListItem[];
     readonly: boolean;
     lazyLoad: boolean;
-    resultType: import("./types").UploaderResultType;
     maxCount: string | number;
     imageFit: import("..").ImageFit;
+    resultType: import("./types").UploaderResultType;
     uploadIcon: string;
     deletable: boolean;
     showUpload: boolean;