zartui 2.1.9 → 2.1.11

package/es/index.js

@@ -76,7 +76,7 @@ import TextEllipsis from './text-ellipsis';
 import Timeline from './timeline';
 import Toast from './toast';
 import Uploader from './uploader';
-var version = '2.1.9';
+var version = '2.1.11';
 function install(Vue) {
   var components = [ActionSheet, Area, Avatar, BackTop, Badge, Button, Calendar, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, Col, Collapse, CollapseItem, CountDown, DatetimePicker, Dialog, Divider, DropdownItem, DropdownMenu, Empty, Field, FoldDialog, Form, Grid, GridItem, HierarchySelect, Icon, Image, ImagePreview, IndexAnchor, IndexBar, Info, Lazyload, List, Loading, Locale, MediaPicker, MediaPlayer, MultiplePicker, NavBar, NoticeBar, NumberKeyboard, Overlay, PasswordInput, Picker, Popover, Popup, PullRefresh, Radio, RadioGroup, Rate, Row, Search, Signature, Skeleton, Slider, SpeechRecognizer, Step, Stepper, Steps, Sticky, Swipe, SwipeCell, SwipeItem, Switch, SwitchCell, Tab, Tabbar, TabbarItem, Table, Tabs, Tag, TextEllipsis, Timeline, Toast, Uploader];
   components.forEach(function (item) {

package/es/media-picker/index.js

@@ -514,7 +514,7 @@ export default createComponent({
               type: MediaType.PHOTO,
               file: new File([f], uniqueFileName, {
                 lastModified: f.lastModified,
-                type: f.type
+                type: "image/jpeg"
               }),
               // 需要以原始file的信息作为唯一标识
               uniqueCode: getFileUniqueCode(file),
@@ -529,7 +529,9 @@ export default createComponent({
               orignalName: f.name,
               originalName: file.name,
               // 原始名称
-              originalSize: file.size // 原始大小
+              originalSize: file.size,
+              // 原始大小
+              originalFile: f
             });
           });
         });
@@ -587,7 +589,9 @@ export default createComponent({
         message: '',
         originalName: f.name,
         // 原始名称
-        originalSize: f.size // 原始大小
+        originalSize: f.size,
+        // 原始大小
+        originalFile: f
       };
     },
     /**

package/lib/index.js

@@ -161,7 +161,7 @@ var _toast = _interopRequireDefault(require("./toast"));
 exports.Toast = _toast.default;
 var _uploader = _interopRequireDefault(require("./uploader"));
 exports.Uploader = _uploader.default;
-var version = exports.version = '2.1.9';
+var version = exports.version = '2.1.11';
 function install(Vue) {
   var components = [_actionSheet.default, _area.default, _avatar.default, _backTop.default, _badge.default, _button.default, _calendar.default, _cascader.default, _cell.default, _cellGroup.default, _checkbox.default, _checkboxGroup.default, _col.default, _collapse.default, _collapseItem.default, _countDown.default, _datetimePicker.default, _dialog.default, _divider.default, _dropdownItem.default, _dropdownMenu.default, _empty.default, _field.default, _foldDialog.default, _form.default, _grid.default, _gridItem.default, _hierarchySelect.default, _icon.default, _image.default, _imagePreview.default, _indexAnchor.default, _indexBar.default, _info.default, _lazyload.default, _list.default, _loading.default, _locale.default, _mediaPicker.default, _mediaPlayer.default, _multiplePicker.default, _navBar.default, _noticeBar.default, _numberKeyboard.default, _overlay.default, _passwordInput.default, _picker.default, _popover.default, _popup.default, _pullRefresh.default, _radio.default, _radioGroup.default, _rate.default, _row.default, _search.default, _signature.default, _skeleton.default, _slider.default, _speechRecognizer.default, _step.default, _stepper.default, _steps.default, _sticky.default, _swipe.default, _swipeCell.default, _swipeItem.default, _switch.default, _switchCell.default, _tab.default, _tabbar.default, _tabbarItem.default, _table.default, _tabs.default, _tag.default, _textEllipsis.default, _timeline.default, _toast.default, _uploader.default];
   components.forEach(function (item) {

package/lib/media-picker/index.js

@@ -520,7 +520,7 @@ var _default2 = exports.default = createComponent({
               type: _type.MediaType.PHOTO,
               file: new File([f], uniqueFileName, {
                 lastModified: f.lastModified,
-                type: f.type
+                type: "image/jpeg"
               }),
               // 需要以原始file的信息作为唯一标识
               uniqueCode: (0, _mediaUtil.getFileUniqueCode)(file),
@@ -535,7 +535,9 @@ var _default2 = exports.default = createComponent({
               orignalName: f.name,
               originalName: file.name,
               // 原始名称
-              originalSize: file.size // 原始大小
+              originalSize: file.size,
+              // 原始大小
+              originalFile: f
             });
           });
         });
@@ -593,7 +595,9 @@ var _default2 = exports.default = createComponent({
         message: '',
         originalName: f.name,
         // 原始名称
-        originalSize: f.size // 原始大小
+        originalSize: f.size,
+        // 原始大小
+        originalFile: f
       };
     },
     /**

package/lib/zart.js

@@ -18385,9 +18385,9 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 
-// ../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/dayjs.min.js
+// ../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/dayjs.min.js
 var require_dayjs_min = __commonJS({
-  "../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/dayjs.min.js"(exports, module) {
+  "../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/dayjs.min.js"(exports, module) {
     !function(t, e) {
       "object" == typeof exports && "undefined" != typeof module ? module.exports = e() : "function" == typeof define && define.amd ? define(e) : (t = "undefined" != typeof globalThis ? globalThis : t || self).dayjs = e();
     }(exports, function() {
@@ -18679,9 +18679,9 @@ var require_dayjs_min = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/locale/zh-cn.js
+// ../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/locale/zh-cn.js
 var require_zh_cn = __commonJS({
-  "../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/locale/zh-cn.js"(exports, module) {
+  "../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/locale/zh-cn.js"(exports, module) {
     !function(e, _) {
       "object" == typeof exports && "undefined" != typeof module ? module.exports = _(require_dayjs_min()) : "function" == typeof define && define.amd ? define(["dayjs"], _) : (e = "undefined" != typeof globalThis ? globalThis : e || self).dayjs_locale_zh_cn = _(e.dayjs);
     }(exports, function(e) {
@@ -19542,15 +19542,19 @@ function drawGroupedWatermarks(canvas, watermarks, groupPosition) {
     }
     const contentPadding = getCanvasScale(canvas, CONTENT_PADDING);
     let baseOrigin = new Point(contentPadding, contentPadding);
+    let titlePadding = 0;
     if (groupPosition === "center" /* Center */) {
       baseOrigin = new Point(
         contentPadding,
         Math.round((canvas.height - totalHeight) / 2)
       );
     } else if (groupPosition === "bottom" /* Bottom */) {
+      tiles.forEach((item) => {
+        titlePadding += item.style.paddingTop + item.style.paddingBottom;
+      });
       baseOrigin = new Point(
         contentPadding,
-        canvas.height - totalHeight - contentPadding
+        canvas.height - totalHeight - contentPadding - titlePadding
       );
     } else if (groupPosition === "top" /* Top */) {
       baseOrigin = new Point(contentPadding, contentPadding);
@@ -19597,7 +19601,7 @@ function renderWatermark(canvas, options) {
     if (!options.enabled || options.watermarkConfigString === "no") {
       return Promise.resolve(canvas);
     }
-    let { watermarkConfigString } = options;
+    let { watermarkConfigString = "" } = options;
     if (watermarkConfigString === "default") {
       watermarkConfigString = "50$lefttop$50*#*time###25$lefttop*#*date";
     }
@@ -19818,16 +19822,28 @@ var ImageProcessor = class {
       );
     });
   }
-  compress(canvas, filename, lastModified, type, quality) {
+  compress(canvas, filename, lastModified, type, quality, lastCompressFileSize = -1) {
     return canvas2File(canvas, filename, lastModified, type, quality).then(
       (file) => {
-        if (file.size > this.compressOptions.photoFileSizeLimit * 1024 && quality - JPEG_QUALITY_STEP > MIN_JPEG_QUALITY) {
+        let qualityStep = JPEG_QUALITY_STEP;
+        if (file.size > this.compressOptions.photoFileSizeLimit * 1024) {
+          let factor = Math.floor(file.size / (1024 * this.compressOptions.photoFileSizeLimit));
+          if (factor > 1 && quality > MIN_JPEG_QUALITY) {
+            qualityStep = this.roundToDecimalPlace(JPEG_QUALITY_STEP * factor, 2);
+            let maxQualityStep = this.roundToDecimalPlace(quality - MIN_JPEG_QUALITY, 2);
+            qualityStep = Math.min(qualityStep, maxQualityStep);
+          }
+        }
+        let compressFileSizeChanged = lastCompressFileSize === -1 || file.size < lastCompressFileSize;
+        let nextCompressQuality = this.roundToDecimalPlace(quality - qualityStep, 2);
+        if (compressFileSizeChanged && file.size > this.compressOptions.photoFileSizeLimit * 1024 && this.compareFloats(nextCompressQuality, MIN_JPEG_QUALITY) >= 0) {
           return this.compress(
             canvas,
             filename,
             lastModified,
             type,
-            quality - JPEG_QUALITY_STEP
+            this.roundToDecimalPlace(nextCompressQuality, 2),
+            file.size
           );
         } else {
           return Promise.resolve(file);
@@ -19835,6 +19851,25 @@ var ImageProcessor = class {
       }
     );
   }
+  /**
+   * 浮点型数据比较大小
+   */
+  compareFloats(a, b) {
+    const diff = Math.abs(a - b);
+    if (diff < Number.EPSILON) {
+      return 0;
+    }
+    return a - b > 0 ? 1 : -1;
+  }
+  /**
+   * 浮点型数据保留小数(四舍五入)
+   * @param num 浮点型数据
+   * @param decimalPlaces 保留的小数位数
+   */
+  roundToDecimalPlace(num, decimalPlaces) {
+    const factor = Math.pow(10, decimalPlaces);
+    return Math.round(num * factor) / factor;
+  }
 };
 
 
@@ -21548,7 +21583,7 @@ var media_picker_createNamespace = Object(utils["b" /* createNamespace */])('med
               type: MediaType.PHOTO,
               file: new File([f], uniqueFileName, {
                 lastModified: f.lastModified,
-                type: f.type
+                type: "image/jpeg"
               }),
               // 需要以原始file的信息作为唯一标识
               uniqueCode: getFileUniqueCode(file),
@@ -21563,7 +21598,9 @@ var media_picker_createNamespace = Object(utils["b" /* createNamespace */])('med
               orignalName: f.name,
               originalName: file.name,
               // 原始名称
-              originalSize: file.size // 原始大小
+              originalSize: file.size,
+              // 原始大小
+              originalFile: f
             });
           });
         });
@@ -21621,7 +21658,9 @@ var media_picker_createNamespace = Object(utils["b" /* createNamespace */])('med
         message: '',
         originalName: f.name,
         // 原始名称
-        originalSize: f.size // 原始大小
+        originalSize: f.size,
+        // 原始大小
+        originalFile: f
       };
     },
     /**
@@ -31446,7 +31485,7 @@ var uploader_createNamespace = Object(utils["b" /* createNamespace */])('uploade
 
 
 
-var version = '2.1.9';
+var version = '2.1.11';
 function install(Vue) {
   var components = [action_sheet, es_area, avatar, back_top, badge, es_button, calendar, cascader, cell, cell_group, es_checkbox, checkbox_group, col, collapse, collapse_item, count_down, datetime_picker, dialog, divider, dropdown_item, dropdown_menu, empty, es_field, fold_dialog, es_form, grid, grid_item, hierarchy_select, es_icon, es_image, image_preview, index_anchor, index_bar, es_info, lazyload, es_list, es_loading, locale["a" /* default */], media_picker, media_player, multiple_picker, nav_bar, notice_bar, number_keyboard, es_overlay, password_input, es_picker, popover, popup, pull_refresh, es_radio, radio_group, rate, row, search, signature, skeleton, slider, speech_recognizer, es_step, stepper, steps, es_sticky, swipe, swipe_cell, swipe_item, es_switch, switch_cell, tab, tabbar, tabbar_item, table, tabs, es_tag, text_ellipsis, timeline, es_toast, uploader];
   components.forEach(function (item) {