ele-admin-plus 1.2.1-beta.2 → 1.2.1-beta.3

package/lib/ele-xg-player/index.d.ts

@@ -1,9 +1,9 @@
 import { PropType } from 'vue';
-import { default as Player } from 'xgplayer';
+import { default as Player, IPlayerOptions } from 'xgplayer';
 
 declare const _default: import('vue').DefineComponent<{
     config: {
-        type: PropType<import('xgplayer/es/defaultConfig').IPlayerOptions>;
+        type: PropType<IPlayerOptions>;
         required: true;
     };
 }, {
@@ -13,7 +13,7 @@ declare const _default: import('vue').DefineComponent<{
     player: (_player: Player | null) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     config: {
-        type: PropType<import('xgplayer/es/defaultConfig').IPlayerOptions>;
+        type: PropType<IPlayerOptions>;
         required: true;
     };
 }>> & {

package/lib/icons/SizeCompactOutlined.cjs

@@ -0,0 +1,33 @@
+"use strict";
+const vue = require("vue");
+const _sfc_main = vue.defineComponent({
+  name: "SizeCompactOutlined"
+});
+const _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
+  for (const [key, val] of props) {
+    target[key] = val;
+  }
+  return target;
+};
+const _hoisted_1 = {
+  viewBox: "0 0 48 48",
+  fill: "none",
+  stroke: "currentColor",
+  "stroke-width": "4"
+};
+const _hoisted_2 = /* @__PURE__ */ vue.createElementVNode("path", { d: "M47 14L41 19L35 14M41 1V19M47 34L41 29L35 34M41 47V29" }, null, -1);
+const _hoisted_3 = /* @__PURE__ */ vue.createElementVNode("path", { d: "M3 7H31" }, null, -1);
+const _hoisted_4 = /* @__PURE__ */ vue.createElementVNode("path", { d: "M3 41H31" }, null, -1);
+const _hoisted_5 = /* @__PURE__ */ vue.createElementVNode("path", { d: "M3 24H31" }, null, -1);
+const _hoisted_6 = [
+  _hoisted_2,
+  _hoisted_3,
+  _hoisted_4,
+  _hoisted_5
+];
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return vue.openBlock(), vue.createElementBlock("svg", _hoisted_1, _hoisted_6);
+}
+const SizeCompactOutlined = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+module.exports = SizeCompactOutlined;

package/lib/icons/SizeCompactOutlined.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
+export default _default;

package/lib/icons/SizeSlackOutlined.cjs

@@ -0,0 +1,33 @@
+"use strict";
+const vue = require("vue");
+const _sfc_main = vue.defineComponent({
+  name: "SizeSlackOutlined"
+});
+const _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
+  for (const [key, val] of props) {
+    target[key] = val;
+  }
+  return target;
+};
+const _hoisted_1 = {
+  viewBox: "0 0 48 48",
+  fill: "none",
+  stroke: "currentColor",
+  "stroke-width": "4"
+};
+const _hoisted_2 = /* @__PURE__ */ vue.createElementVNode("path", { d: "M41 6V42M35 11L41 6L47 11M47 37L41 42L35 37" }, null, -1);
+const _hoisted_3 = /* @__PURE__ */ vue.createElementVNode("path", { d: "M3 7H31" }, null, -1);
+const _hoisted_4 = /* @__PURE__ */ vue.createElementVNode("path", { d: "M3 41H31" }, null, -1);
+const _hoisted_5 = /* @__PURE__ */ vue.createElementVNode("path", { d: "M3 24H31" }, null, -1);
+const _hoisted_6 = [
+  _hoisted_2,
+  _hoisted_3,
+  _hoisted_4,
+  _hoisted_5
+];
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return vue.openBlock(), vue.createElementBlock("svg", _hoisted_1, _hoisted_6);
+}
+const SizeSlackOutlined = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+module.exports = SizeSlackOutlined;

package/lib/icons/SizeSlackOutlined.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
+export default _default;

package/lib/icons/index.cjs

@@ -88,6 +88,8 @@ const ResizeOutlined = require("./ResizeOutlined");
 const SearchOutlined = require("./SearchOutlined");
 const SettingOutlined = require("./SettingOutlined");
 const ShoppingOutlined = require("./ShoppingOutlined");
+const SizeCompactOutlined = require("./SizeCompactOutlined");
+const SizeSlackOutlined = require("./SizeSlackOutlined");
 const SortOutlined = require("./SortOutlined");
 const StarFilled = require("./StarFilled");
 const StepBackwardFilled = require("./StepBackwardFilled");
@@ -197,6 +199,8 @@ exports.ResizeOutlined = ResizeOutlined;
 exports.SearchOutlined = SearchOutlined;
 exports.SettingOutlined = SettingOutlined;
 exports.ShoppingOutlined = ShoppingOutlined;
+exports.SizeCompactOutlined = SizeCompactOutlined;
+exports.SizeSlackOutlined = SizeSlackOutlined;
 exports.SortOutlined = SortOutlined;
 exports.StarFilled = StarFilled;
 exports.StepBackwardFilled = StepBackwardFilled;

package/lib/icons/index.d.ts

@@ -86,6 +86,8 @@ export { default as ResizeOutlined } from './ResizeOutlined';
 export { default as SearchOutlined } from './SearchOutlined';
 export { default as SettingOutlined } from './SettingOutlined';
 export { default as ShoppingOutlined } from './ShoppingOutlined';
+export { default as SizeCompactOutlined } from './SizeCompactOutlined';
+export { default as SizeSlackOutlined } from './SizeSlackOutlined';
 export { default as SortOutlined } from './SortOutlined';
 export { default as StarFilled } from './StarFilled';
 export { default as StepBackwardFilled } from './StepBackwardFilled';

package/lib/lang/en_US.cjs

@@ -47,6 +47,7 @@ const localeValues = {
     columnExpand: "Expand",
     columnFixedLeft: "Pin to left",
     columnFixedRight: "Pin to right",
+    columnWidth: "Width",
     exportOk: "Ok",
     exportCancel: "Cancel",
     exportFileName: "Filename",

package/lib/lang/zh_CN.cjs

@@ -47,6 +47,7 @@ const localeValues = {
     columnExpand: "展开列",
     columnFixedLeft: "固定在左侧",
     columnFixedRight: "固定在右侧",
+    columnWidth: "列宽",
     exportOk: "确定",
     exportCancel: "取消",
     exportFileName: "文件名",

package/lib/lang/zh_TW.cjs

@@ -47,6 +47,7 @@ const localeValues = {
     columnExpand: "展開列",
     columnFixedLeft: "固定在左側",
     columnFixedRight: "固定在右側",
+    columnWidth: "列寬",
     exportOk: "確認",
     exportCancel: "取消",
     exportFileName: "檔名",

package/lib/style/themes/default.scss

@@ -505,7 +505,13 @@ $ele: map.deep-merge(
       'sm-radius': 24px,
       'sm-space': 4px,
       'sm-gap': 8px,
-      'sm-font-size': 14px
+      'sm-font-size': 14px,
+      'lg-height': 40px,
+      'lg-padding': 0 8px,
+      'lg-radius': 40px,
+      'lg-space': 8px,
+      'lg-gap': 8px 12px,
+      'lg-font-size': 14px
     ),
     'segmented': (
       // 分段器
@@ -714,15 +720,16 @@ $ele: map.deep-merge(
       // 高级表格列配置
       'width': 220px,
       'max-height': 480px,
-      'header-padding': 6px 16px 4px 12px,
+      'header-padding': 6px 14px 4px 14px,
       'header-border': 1px solid elVar('border-color', 'light'),
       'body-padding': 6px 0,
-      'item-padding': 12px,
+      'item-padding': 14px,
       'item-height': 28px,
       'item-hover-bg': elVar('color-primary', 'light-9'),
       'item-radius': 0,
-      'btn-space': 0,
-      'btn-padding': 3px,
+      'btn-space': 1px,
+      'btn-size': 18px,
+      'btn-offset': -6px,
       'btn-radius': elVar('border-radius', 'small'),
       'btn-color': elVar('text-color', 'placeholder'),
       'btn-hover-color': elVar('text-color', 'primary'),

package/lib/style/themes/rounded.scss

@@ -109,7 +109,8 @@ $ele-rounded: map.deep-merge(
       'active-bg': none,
       'active-border': 1px solid elVar('color', 'primary'),
       'active-font-weight': bold,
-      'sm-radius': elVar('border-radius', 'base')
+      'sm-radius': elVar('border-radius', 'base'),
+      'lg-radius': $radius-large
     ),
     'segmented': (
       'radius': elVar('border-radius', 'small')
@@ -164,7 +165,7 @@ $ele-rounded: map.deep-merge(
     ),
     'tool-column': (
       'body-padding': 6px 4px,
-      'item-padding': 8px,
+      'item-padding': 10px,
       'item-radius': elVar('border-radius', 'small'),
       'btn-hover-bg': elVar('color-primary', 'light-8'),
       'btn-active-bg': elVar('color-primary', 'light-7')

package/lib/utils/hook.cjs

@@ -3,23 +3,28 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
 function useTimer(ms, cb) {
   let timer = null;
+  const waiting = vue.ref(false);
   const stopTimer = () => {
     if (timer != null) {
       clearTimeout(timer);
       timer = null;
     }
+    waiting.value = false;
   };
   const startTimer = (callback, timeout) => {
     stopTimer();
-    timer = setTimeout(
-      callback ?? cb,
-      timeout ?? (typeof ms === "function" ? ms() : ms)
-    );
+    waiting.value = true;
+    const to = timeout ?? (typeof ms === "function" ? ms() : ms);
+    timer = setTimeout(() => {
+      const func = callback ?? cb;
+      func && func();
+      waiting.value = false;
+    }, to);
   };
   vue.onBeforeUnmount(() => {
     stopTimer();
   });
-  return [startTimer, stopTimer];
+  return [startTimer, stopTimer, waiting];
 }
 function useMediaQuery(query, onChange) {
   const mediaQuery = window.matchMedia(query);
@@ -105,7 +110,151 @@ function useCollapseAnim() {
     handleAfterLeave
   };
 }
+function useMousewheel(cb) {
+  const handleMousewheel = (e) => {
+    const delta = e.wheelDelta || e.detail;
+    cb && cb({ e, direction: delta > 0 ? "up" : "down" });
+  };
+  const handleFirefoxMousewheel = (e) => {
+    const delta = e.wheelDelta || e.detail;
+    cb && cb({ e, direction: delta < 0 ? "up" : "down" });
+  };
+  const bindMousewheel = (el) => {
+    el.addEventListener("mousewheel", handleMousewheel, { passive: false });
+    el.addEventListener("DOMMouseScroll", handleFirefoxMousewheel);
+  };
+  const unbindMousewheel = (el) => {
+    el.removeEventListener("mousewheel", handleMousewheel);
+    el.removeEventListener("DOMMouseScroll", handleFirefoxMousewheel);
+  };
+  return {
+    handleMousewheel,
+    handleFirefoxMousewheel,
+    bindMousewheel,
+    unbindMousewheel
+  };
+}
+function useTouchEvent(option) {
+  let startX = null;
+  let startY = null;
+  let distanceX = null;
+  let distanceY = null;
+  const handleTouchStart = (e) => {
+    startX = e.touches[0].clientX;
+    startY = e.touches[0].clientY;
+    if (option && option.start) {
+      option.start({ e, startX, startY });
+    }
+  };
+  const handleTouchMove = (e) => {
+    if (startX != null && startY != null) {
+      const currentX = e.touches[0].clientX;
+      const currentY = e.touches[0].clientY;
+      distanceX = currentX - startX;
+      distanceY = currentY - startY;
+      if (option && option.move) {
+        option.move({ e, startX, startY, distanceX, distanceY });
+      }
+    }
+  };
+  const handleTouchEnd = (e) => {
+    if (option && option.end) {
+      option.end({ e, startX, startY, distanceX, distanceY });
+    }
+    startX = null;
+    startY = null;
+    distanceX = null;
+    distanceY = null;
+  };
+  const bindTouchEvent = (el) => {
+    el.addEventListener("touchstart", handleTouchStart);
+    el.addEventListener("touchmove", handleTouchMove);
+    el.addEventListener("touchend", handleTouchEnd);
+  };
+  const unbindTouchEvent = (el) => {
+    el.removeEventListener("touchstart", handleTouchStart);
+    el.removeEventListener("touchmove", handleTouchMove);
+    el.removeEventListener("touchend", handleTouchEnd);
+  };
+  return {
+    handleTouchStart,
+    handleTouchMove,
+    handleTouchEnd,
+    bindTouchEvent,
+    unbindTouchEvent
+  };
+}
+function useMoveEvent(option) {
+  let startX = null;
+  let startY = null;
+  let distanceX = null;
+  let distanceY = null;
+  const unbindEvent = () => {
+    document.removeEventListener("mousemove", mousemoveFn);
+    document.removeEventListener("mouseup", mouseupFn);
+    document.removeEventListener("touchmove", touchmoveFn);
+    document.removeEventListener("touchend", touchendFn);
+  };
+  const emitStart = (clientX, clientY, e) => {
+    startX = clientX;
+    startY = clientY;
+    if (option && option.start) {
+      option.start({ e, startX, startY });
+    }
+  };
+  const emitMove = (currentX, currentY, e) => {
+    if (startX != null && startY != null) {
+      distanceX = currentX - startX;
+      distanceY = currentY - startY;
+      if (option && option.move) {
+        option.move({ e, startX, startY, distanceX, distanceY });
+      }
+    }
+  };
+  const emitEnd = (e) => {
+    unbindEvent();
+    if (option && option.end) {
+      option.end({ e, startX, startY, distanceX, distanceY });
+    }
+    startX = null;
+    startY = null;
+    distanceX = null;
+    distanceY = null;
+  };
+  const mousemoveFn = function(e) {
+    emitMove(e.clientX, e.clientY, e);
+  };
+  const touchmoveFn = function(e) {
+    emitMove(e.touches[0].clientX, e.touches[0].clientY, e);
+  };
+  const mouseupFn = (e) => {
+    emitEnd(e);
+  };
+  const touchendFn = (e) => {
+    emitEnd(e);
+  };
+  const handleMousedown = (e) => {
+    emitStart(e.clientX, e.clientY, e);
+    document.addEventListener("mousemove", mousemoveFn);
+    document.addEventListener("mouseup", mouseupFn);
+  };
+  const handleTouchstart = (e) => {
+    emitStart(e.touches[0].clientX, e.touches[0].clientY, e);
+    document.addEventListener("touchmove", touchmoveFn);
+    document.addEventListener("touchend", touchendFn);
+  };
+  vue.onBeforeUnmount(() => {
+    unbindEvent();
+  });
+  return {
+    handleMousedown,
+    handleTouchstart
+  };
+}
 exports.useCollapseAnim = useCollapseAnim;
 exports.useMediaQuery = useMediaQuery;
+exports.useMousewheel = useMousewheel;
+exports.useMoveEvent = useMoveEvent;
 exports.useTimer = useTimer;
+exports.useTouchEvent = useTouchEvent;
 exports.useWindowListener = useWindowListener;

package/lib/utils/hook.d.ts

@@ -1,9 +1,12 @@
+import { Ref } from 'vue';
+
 /**
- * useTimer返回结果
+ * useTimer 返回结果
  */
 export type UseTimerResult = [
-    (callback: () => void, timeout?: number) => void,
-    () => void
+    (callback?: () => void, timeout?: number) => void,
+    () => void,
+    Ref<boolean>
 ];
 /**
  * 定时器
@@ -12,7 +15,7 @@ export type UseTimerResult = [
  */
 export declare function useTimer(ms?: number | (() => number), cb?: () => void): UseTimerResult;
 /**
- * useMediaQuery返回结果
+ * useMediaQuery 返回结果
  */
 export type UseMediaQueryResult = [MediaQueryList, () => void, () => void];
 /**
@@ -38,3 +41,71 @@ export declare function useCollapseAnim(): {
     handleLeave: (el: HTMLElement) => void;
     handleAfterLeave: (el: HTMLElement) => void;
 };
+/**
+ * 鼠标滚轮事件回调方法参数
+ */
+export interface UseMousewheelCallbackParam {
+    /** 事件对象 */
+    e: MouseEvent;
+    /** 方向 */
+    direction: 'up' | 'down';
+}
+/**
+ * 鼠标滚轮事件
+ * @param cb 回调
+ */
+export declare function useMousewheel(cb?: (p: UseMousewheelCallbackParam) => void): {
+    handleMousewheel: (e: MouseEvent) => void;
+    handleFirefoxMousewheel: (e: MouseEvent) => void;
+    bindMousewheel: (el: HTMLElement) => void;
+    unbindMousewheel: (el: HTMLElement) => void;
+};
+/**
+ * 触摸事件回调参数
+ */
+export interface UseTouchEventCallbackParam<T> {
+    /** 事件对象 */
+    e: T;
+    /** 开始横向位置 */
+    startX: number | null;
+    /** 开始纵向位置 */
+    startY: number | null;
+    /** 横向移动距离 */
+    distanceX?: number | null;
+    /** 纵向移动距离 */
+    distanceY?: number | null;
+}
+/**
+ * 触摸事件参数
+ */
+export interface UseTouchEventOption<T> {
+    /** 触摸开始的回调 */
+    start?: (param: UseTouchEventCallbackParam<T>) => void;
+    /** 触摸移动的回调 */
+    move?: (param: UseTouchEventCallbackParam<T>) => void;
+    /** 触摸结束的回调 */
+    end?: (param: UseTouchEventCallbackParam<T>) => void;
+}
+/**
+ * 触摸事件
+ * @param option 参数
+ */
+export declare function useTouchEvent(option?: UseTouchEventOption<TouchEvent>): {
+    handleTouchStart: (e: TouchEvent) => void;
+    handleTouchMove: (e: TouchEvent) => void;
+    handleTouchEnd: (e: TouchEvent) => void;
+    bindTouchEvent: (el: HTMLElement) => void;
+    unbindTouchEvent: (el: HTMLElement) => void;
+};
+/**
+ * 移动事件对象
+ */
+export type MoveEvent = MouseEvent | TouchEvent;
+/**
+ * 鼠标移动事件或触摸移动事件
+ * @param option 参数
+ */
+export declare function useMoveEvent(option?: UseTouchEventOption<MoveEvent>): {
+    handleMousedown: (e: MouseEvent) => void;
+    handleTouchstart: (e: TouchEvent) => void;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.2.1-beta.2",
+  "version": "1.2.1-beta.3",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",
@@ -24,14 +24,14 @@
     "@bytemd/plugin-highlight": "^1.21.0",
     "@element-plus/icons-vue": "^2.3.1",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.14.2",
+    "@types/node": "^20.14.8",
     "@types/nprogress": "^0.2.3",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^7.13.0",
-    "@typescript-eslint/parser": "^7.13.0",
+    "@typescript-eslint/eslint-plugin": "^7.13.1",
+    "@typescript-eslint/parser": "^7.13.1",
     "@vitejs/plugin-vue": "^5.0.5",
     "@vitejs/plugin-vue-jsx": "^4.0.0",
-    "@vue/compiler-sfc": "^3.4.29",
+    "@vue/compiler-sfc": "^3.4.30",
     "@vueuse/core": "^10.11.0",
     "axios": "^1.7.2",
     "bytemd": "^1.21.0",
@@ -41,37 +41,38 @@
     "dayjs": "^1.11.11",
     "echarts": "^5.5.0",
     "echarts-wordcloud": "^2.1.0",
-    "element-plus": "^2.7.5",
+    "element-plus": "^2.7.6",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-vue": "^9.26.0",
     "esno": "^4.7.0",
     "exceljs": "^4.4.0",
-    "execa": "^9.2.0",
-    "github-markdown-css": "^5.6.0",
+    "execa": "^9.3.0",
+    "github-markdown-css": "^5.6.1",
     "highlight.js": "^11.9.0",
     "jsbarcode": "^3.11.6",
     "lodash-es": "^4.17.21",
+    "monaco-editor": "^0.50.0",
     "nprogress": "^0.2.0",
     "p-limit": "^5.0.0",
     "pinia": "^2.1.7",
     "postcss": "^8.4.38",
     "prettier": "^3.3.2",
     "rimraf": "^5.0.7",
-    "sass": "^1.77.5",
+    "sass": "^1.77.6",
     "sortablejs": "^1.15.2",
     "tinymce": "^5.10.9",
-    "typescript": "^5.4.5",
+    "typescript": "^5.5.2",
     "unplugin-vue-components": "^0.27.0",
     "vite": "^5.3.1",
     "vite-plugin-dts": "^3.9.1",
-    "vue": "^3.4.29",
+    "vue": "^3.4.30",
     "vue-echarts": "^6.7.3",
     "vue-eslint-parser": "^9.4.3",
     "vue-i18n": "^9.13.1",
-    "vue-router": "^4.3.3",
-    "vue-tsc": "^2.0.21",
+    "vue-router": "^4.4.0",
+    "vue-tsc": "^2.0.22",
     "vuedraggable": "^4.1.0",
     "xgplayer": "^3.0.18",
     "xgplayer-hls": "^3.0.18",