ele-admin-plus 1.4.1 → 1.5.0-beta.2

package/lib/ele-upload-list/index.d.ts

@@ -89,14 +89,14 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onRetry?: ((_item: UploadItem) => any) | undefined;
     onEditUpload?: ((_result: import('./types').EditUploadResult) => any) | undefined;
 }>, {
-    drag: boolean;
     disabled: boolean;
     readonly: boolean;
     multiple: boolean;
     sortable: boolean | Record<string | number | symbol, any>;
+    drag: boolean;
     preview: boolean;
-    accept: string;
     tools: boolean;
+    accept: string;
     buttonStyle: false | Partial<import('vue').CSSProperties>;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

package/lib/ele-viewer/index.cjs

@@ -91,11 +91,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const autoIntoView = () => {
       const pEl = viewerRef.value;
-      const pw = (pEl == null ? void 0 : pEl.offsetWidth) || 0;
-      const ph = (pEl == null ? void 0 : pEl.offsetHeight) || 0;
+      const pw = pEl?.offsetWidth || 0;
+      const ph = pEl?.offsetHeight || 0;
       const el = bodyRef.value;
-      const w = (el == null ? void 0 : el.offsetWidth) || 0;
-      const h = (el == null ? void 0 : el.offsetHeight) || 0;
+      const w = el?.offsetWidth || 0;
+      const h = el?.offsetHeight || 0;
       viewerTranslateX.value = Math.floor((pw - w) / 2);
       viewerTranslateY.value = Math.floor((ph - h) / 2);
       const { width, height } = util.getRotatedBounds(w, h, viewerRotate.value);
@@ -103,11 +103,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const autoIntoViewWidth = () => {
       const pEl = viewerRef.value;
-      const pw = (pEl == null ? void 0 : pEl.offsetWidth) || 0;
-      const ph = (pEl == null ? void 0 : pEl.offsetHeight) || 0;
+      const pw = pEl?.offsetWidth || 0;
+      const ph = pEl?.offsetHeight || 0;
       const el = bodyRef.value;
-      const w = (el == null ? void 0 : el.offsetWidth) || 0;
-      const h = (el == null ? void 0 : el.offsetHeight) || 0;
+      const w = el?.offsetWidth || 0;
+      const h = el?.offsetHeight || 0;
       viewerScale.value = pw / w * 100;
       const sh = h * (viewerScale.value / 100);
       viewerTranslateX.value = Math.floor((pw - w) / 2);
@@ -119,11 +119,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const autoIntoViewHeight = () => {
       const pEl = viewerRef.value;
-      const pw = (pEl == null ? void 0 : pEl.offsetWidth) || 0;
-      const ph = (pEl == null ? void 0 : pEl.offsetHeight) || 0;
+      const pw = pEl?.offsetWidth || 0;
+      const ph = pEl?.offsetHeight || 0;
       const el = bodyRef.value;
-      const w = (el == null ? void 0 : el.offsetWidth) || 0;
-      const h = (el == null ? void 0 : el.offsetHeight) || 0;
+      const w = el?.offsetWidth || 0;
+      const h = el?.offsetHeight || 0;
       viewerScale.value = ph / h * 100;
       const sw = w * (viewerScale.value / 100);
       if (sw < pw) {
@@ -148,7 +148,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         startY = viewerTranslateY.value;
       },
       move: ({ distanceX, distanceY, e }) => {
-        if (startX == null || startY == null || distanceX == null || distanceY == null) {
+        if (startX == null || startY == null || distanceX == null || distanceY == null || !contentStyle.show.value) {
           return;
         }
         e.preventDefault();
@@ -174,6 +174,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         zoomOut();
       }
     );
+    const contentStyle = util.useContentRatio();
     vue.onMounted(() => {
       viewerRef.value && bindMousewheel(viewerRef.value);
       autoIntoView();
@@ -206,7 +207,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       return vue.openBlock(), vue.createElementBlock("div", {
         ref_key: "viewerRef",
         ref: viewerRef,
-        class: vue.normalizeClass(["ele-viewer"])
+        class: "ele-viewer"
       }, [
         vue.createElementVNode("div", {
           ref_key: "bodyRef",
@@ -224,10 +225,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               ref_key: "contentRef",
               ref: contentRef,
               class: vue.normalizeClass(["ele-viewer-content", { "is-moving": viewerMoving.value }]),
-              style: vue.normalizeStyle([_ctx.contentStyle || {}, { transform: imageTransform.value }]),
+              style: vue.normalizeStyle([vue.unref(contentStyle) || {}, { transform: imageTransform.value }]),
               onMousedown: _cache[0] || (_cache[0] = //@ts-ignore
               (...args) => vue.unref(handleMousedown) && vue.unref(handleMousedown)(...args)),
-              onTouchstart: _cache[1] || (_cache[1] = //@ts-ignore
+              onTouchstartPassive: _cache[1] || (_cache[1] = //@ts-ignore
               (...args) => vue.unref(handleTouchstart) && vue.unref(handleTouchstart)(...args)),
               onClick: handleClick,
               onContextmenu: handleContextmenu

package/lib/ele-viewer/util.cjs

@@ -1,5 +1,9 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const vue = require("vue");
+const util = require("../ele-pro-layout/util");
+const SvgRender = require("../ele-qr-code-svg/components/svg-render");
+const util$1 = require("../ele-qr-code-svg/util");
 function getRotatedBounds(w, h, r) {
   const radians = r * (Math.PI / 180);
   const cosR = Math.cos(radians);
@@ -8,4 +12,34 @@ function getRotatedBounds(w, h, r) {
   const height = Math.abs(w * sinR) + Math.abs(h * cosR);
   return { width, height };
 }
+function useContentRatio(updateStyle) {
+  const state = util.useLayoutState();
+  const to = vue.computed(() => state.modalsEl || "body");
+  const { svgProps, svgKey, imageId } = util$1.useSvgOption();
+  const updateSpinnerStyle = () => {
+    updateStyle && updateStyle({
+      font: {
+        color: "rgba(122, 122, 122, 0.35)",
+        fontSize: 16,
+        fontWeight: "normal",
+        fontFamily: "sans-serif",
+        fontStyle: "normal"
+      },
+      commonStyle: {
+        position: "fixed",
+        pointerEvents: "none",
+        zIndex: 9999
+      },
+      contents: [svgKey.value]
+    });
+  };
+  vue.onMounted(() => {
+    updateSpinnerStyle();
+  });
+  vue.watch(svgKey, () => {
+    updateSpinnerStyle();
+  });
+  return { LoadingSpinner: SvgRender, slotProps: svgProps, show: imageId, to };
+}
 exports.getRotatedBounds = getRotatedBounds;
+exports.useContentRatio = useContentRatio;

package/lib/ele-viewer/util.d.ts

@@ -8,3 +8,108 @@ export declare function getRotatedBounds(w: number, h: number, r: number): {
     width: number;
     height: number;
 };
+/**
+ * 内容容器样式处理
+ * @param updateStyle 更新样式
+ */
+export declare function useContentRatio(updateStyle?: any): {
+    LoadingSpinner: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
+        width: {
+            type: NumberConstructor;
+            default: number;
+        };
+        height: {
+            type: NumberConstructor;
+            default: number;
+        };
+        rotate: {
+            type: NumberConstructor;
+            default: number;
+        };
+        gapX: {
+            type: NumberConstructor;
+            default: number;
+        };
+        gapY: {
+            type: NumberConstructor;
+            default: number;
+        };
+        lineGap: {
+            type: NumberConstructor;
+            default: number;
+        };
+        font: {
+            type: import('vue').PropType<Required<import('../ele-watermark/types').WatermarkFont>>;
+            required: true;
+        };
+        contents: {
+            type: import('vue').PropType<string[]>;
+            required: true;
+        };
+        image: StringConstructor;
+        offsetX: {
+            type: NumberConstructor;
+            default: number;
+        };
+        offsetY: {
+            type: NumberConstructor;
+            default: number;
+        };
+        commonStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+        width: {
+            type: NumberConstructor;
+            default: number;
+        };
+        height: {
+            type: NumberConstructor;
+            default: number;
+        };
+        rotate: {
+            type: NumberConstructor;
+            default: number;
+        };
+        gapX: {
+            type: NumberConstructor;
+            default: number;
+        };
+        gapY: {
+            type: NumberConstructor;
+            default: number;
+        };
+        lineGap: {
+            type: NumberConstructor;
+            default: number;
+        };
+        font: {
+            type: import('vue').PropType<Required<import('../ele-watermark/types').WatermarkFont>>;
+            required: true;
+        };
+        contents: {
+            type: import('vue').PropType<string[]>;
+            required: true;
+        };
+        image: StringConstructor;
+        offsetX: {
+            type: NumberConstructor;
+            default: number;
+        };
+        offsetY: {
+            type: NumberConstructor;
+            default: number;
+        };
+        commonStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    }>> & Readonly<{}>, {
+        height: number;
+        rotate: number;
+        width: number;
+        gapX: number;
+        gapY: number;
+        lineGap: number;
+        offsetX: number;
+        offsetY: number;
+    }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
+    slotProps: Record<string, any>;
+    show: import('vue').ComputedRef<any>;
+    to: import('vue').ComputedRef<HTMLElement | "body">;
+};

package/lib/ele-virtual-table/components/body-cell.cjs

@@ -142,7 +142,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       const col = originalCol.value;
       if (col) {
         if (col.align) {
-          classes.push("is-align-" + col.align);
+          classes.push(`is-align-${col.align}`);
         }
         if (isEllipsis.value) {
           classes.push("is-ellipsis");

package/lib/ele-virtual-table/components/body-cell.d.ts

@@ -136,11 +136,11 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     onCheckedChange?: ((_checked: boolean) => any) | undefined;
 }>, {
     loading: boolean;
+    isCollapse: boolean;
     isDisabled: boolean;
+    hasChildren: boolean;
     fixedCellHeight: boolean;
     autoRowHeight: boolean;
     isChecked: boolean;
-    hasChildren: boolean;
-    isCollapse: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/lib/ele-virtual-table/components/body-row.cjs

@@ -143,7 +143,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     return (_ctx, _cache) => {
       return vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.bodyCols, (column, columnIndex) => {
         return vue.openBlock(), vue.createBlock(BodyCell, {
-          key: (__props.rowId ?? __props.rowIndex) + "-" + (column.key ?? columnIndex),
+          key: `${__props.rowId ?? __props.rowIndex}-${column.key ?? columnIndex}`,
           column,
           columnIndex,
           rowIndex: __props.rowIndex,

package/lib/ele-virtual-table/components/cell-filter.cjs

@@ -144,19 +144,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               ])
             ], 64)) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, [
               vue.createElementVNode("div", {
-                class: vue.normalizeClass([
-                  "ele-table-filter-item",
-                  { "is-active": filteredValue.value == null }
-                ]),
+                class: vue.normalizeClass(["ele-table-filter-item", { "is-active": filteredValue.value == null }]),
                 onClick: _cache[1] || (_cache[1] = ($event) => handleItemClick())
               }, vue.toDisplayString(clearFilterText.value), 3),
               (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(__props.filters, (d) => {
                 return vue.openBlock(), vue.createElementBlock("div", {
                   key: d.value,
-                  class: vue.normalizeClass([
-                    "ele-table-filter-item",
-                    { "is-active": filteredValue.value === d.value }
-                  ]),
+                  class: vue.normalizeClass(["ele-table-filter-item", { "is-active": filteredValue.value === d.value }]),
                   onClick: ($event) => handleItemClick(d.value)
                 }, vue.toDisplayString(d.text), 11, _hoisted_3);
               }), 128))

package/lib/ele-virtual-table/components/footer-row.cjs

@@ -50,7 +50,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         const sumValue = util.getSumValue(data.value, column.dataKey);
         const col = column.originalCol;
         return {
-          key: i + "-" + column.key,
+          key: `${i}-${column.key}`,
           width: colSize && colSize.width || 0,
           fixedLeft: colSize ? colSize.fixedLeft : void 0,
           fixedRight: colSize ? colSize.fixedRight : void 0,
@@ -73,9 +73,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(sumCols.value, (col) => {
           return vue.openBlock(), vue.createElementBlock("div", {
             key: col.key,
-            class: vue.normalizeClass([
-              "ele-table-td",
-              "is-ellipsis",
+            class: vue.normalizeClass(["ele-table-td is-ellipsis", [
               { "is-align-left": col.align === "left" },
               { "is-align-center": col.align === "center" },
               { "is-align-right": col.align === "right" },
@@ -83,7 +81,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               { "is-fixed-right": col.fixed === "right" },
               { "is-fixed-left-last": col.isFixedLeftLast },
               { "is-fixed-right-first": col.isFixedRightFirst }
-            ]),
+            ]]),
             style: vue.normalizeStyle({
               width: col.width + "px",
               left: col.fixedLeft,

package/lib/ele-virtual-table/components/header-cell.cjs

@@ -89,7 +89,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (col) {
         const align = col.headerAlign || col.align;
         if (align) {
-          classes.push("is-align-" + align);
+          classes.push(`is-align-${align}`);
         }
         if (col.sortable === true || col.sortable === "custom") {
           classes.push("is-sortable");
@@ -97,7 +97,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         if (props.sortBy != null && util.getColKey(col) === props.sortBy.key) {
           const sortClass = util.getOrderValue(props.sortBy.order);
           if (sortClass) {
-            classes.push("is-" + sortClass);
+            classes.push(`is-${sortClass}`);
           }
         }
         if (col.filters && col.filters.length && props.filterValue && props.filterValue.length) {

package/lib/ele-virtual-table/components/header-row.cjs

@@ -49,7 +49,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const props = __props;
     const emit = __emit;
     const getKey = (column, columnIndex) => {
-      return props.headerIndex + "-" + String(column.key ?? columnIndex);
+      return `${props.headerIndex}-${String(column.key ?? columnIndex)}`;
     };
     const getFiltered = (column) => {
       return util.getColFiltered(column.originalCol, props.filtered);