ele-admin-plus 1.0.0-beta.1 → 1.0.0-beta.3

package/lib/ele-upload-list/index.js

@@ -3,9 +3,8 @@ const vue = require("vue");
 const VueDraggable = require("vuedraggable");
 const elementPlus = require("element-plus");
 const iconsVue = require("@element-plus/icons-vue");
-const licenseUtil = require("../utils/license-util");
-const useReceiver = require("../ele-config-provider/use-receiver");
 const core = require("../utils/core");
+const receiver = require("../ele-config-provider/receiver");
 const ListItem = require("./components/list-item");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
@@ -21,8 +20,8 @@ const _sfc_main = vue.defineComponent({
   props: props.uploadListProps,
   emits: props.uploadListEmits,
   setup(props2, { emit }) {
-    const { authenticated } = licenseUtil.useLicense();
-    const { lang } = useReceiver.useLocale("upload", props2);
+    const { authenticated } = receiver.useLicense();
+    const { lang } = receiver.useLocale("upload", props2);
     const previewRef = vue.ref(null);
     const previewOption = vue.reactive({
       // 是否打开
@@ -41,11 +40,7 @@ const _sfc_main = vue.defineComponent({
       emit("update:modelValue", value);
     };
     const onUpload = (file) => {
-      if (!authenticated.value) {
-        console.warn(licenseUtil.UNAUTHORIZED_TIP);
-        return false;
-      }
-      if (!uploadEnable.value) {
+      if (!authenticated.value || !uploadEnable.value || props2.disabled) {
         return false;
       }
       const item = {
@@ -125,18 +120,22 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     setData: () => void 0,
     modelValue: _ctx.modelValue,
     draggable: ".ele-draggable",
-    class: "ele-upload-list",
+    class: vue.normalizeClass(["ele-upload-list", { "is-disabled": _ctx.disabled }]),
     "onUpdate:modelValue": _ctx.updateModelValue
   }, {
     item: vue.withCtx(({ element }) => [
       vue.createVNode(_component_ListItem, {
         item: element,
         readonly: _ctx.readonly,
+        disabled: _ctx.disabled,
         locale: _ctx.lang,
         style: vue.normalizeStyle(_ctx.itemStyle),
-        onItemClick: ($event) => _ctx.onItemClick(element),
-        onRemove: ($event) => _ctx.onItemRemove(element),
-        onRetry: ($event) => _ctx.onItemRetry(element)
+        class: vue.normalizeClass({
+          "ele-draggable": _ctx.sortable && !_ctx.readonly && !_ctx.disabled && _ctx.limit !== 1
+        }),
+        onItemClick: _ctx.onItemClick,
+        onRemove: _ctx.onItemRemove,
+        onRetry: _ctx.onItemRetry
       }, vue.createSlots({ _: 2 }, [
         vue.renderList(Object.keys(_ctx.$slots), (name) => {
           return {
@@ -146,7 +145,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ])
           };
         })
-      ]), 1032, ["item", "readonly", "locale", "style", "onItemClick", "onRemove", "onRetry"])
+      ]), 1032, ["item", "readonly", "disabled", "locale", "style", "class", "onItemClick", "onRemove", "onRetry"])
     ]),
     footer: vue.withCtx(() => [
       _ctx.uploadEnable ? (vue.openBlock(), vue.createElementBlock("div", {
@@ -159,6 +158,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           drag: _ctx.drag,
           accept: _ctx.accept,
           multiple: _ctx.multiple,
+          disabled: _ctx.disabled,
           showUploadList: false,
           beforeUpload: _ctx.onUpload
         }, {
@@ -173,7 +173,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ])
           ]),
           _: 3
-        }, 8, ["drag", "accept", "multiple", "beforeUpload"])
+        }, 8, ["drag", "accept", "multiple", "disabled", "beforeUpload"])
       ], 4)) : vue.createCommentVNode("", true),
       vue.createElementVNode("div", _hoisted_1, [
         _ctx.previewOption.visible ? (vue.openBlock(), vue.createBlock(_component_ElImage, {
@@ -188,7 +188,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ])
     ]),
     _: 3
-  }, 8, ["modelValue", "onUpdate:modelValue"]);
+  }, 8, ["modelValue", "class", "onUpdate:modelValue"]);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = index;

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

@@ -9,6 +9,7 @@ export declare const uploadListProps: {
         required: boolean;
     };
     readonly: BooleanConstructor;
+    disabled: BooleanConstructor;
     preview: {
         type: BooleanConstructor;
         default: boolean;
@@ -22,6 +23,10 @@ export declare const uploadListProps: {
     };
     itemStyle: PropType<CSSProperties>;
     buttonStyle: PropType<CSSProperties>;
+    sortable: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     locale: PropType<UploadLocale>;
 };
 export type UploadListProps = ExtractPropTypes<typeof uploadListProps>;

package/lib/ele-upload-list/props.js

@@ -8,7 +8,9 @@ const uploadListProps = {
   },
   // 是否只读
   readonly: Boolean,
-  // 是否支持预览
+  // 是否禁用
+  disabled: Boolean,
+  // 是否支持点击预览
   preview: {
     type: Boolean,
     default: true
@@ -28,6 +30,11 @@ const uploadListProps = {
   itemStyle: Object,
   // 自定义上传按钮样式
   buttonStyle: Object,
+  // 是否开启拖拽排序
+  sortable: {
+    type: Boolean,
+    default: true
+  },
   // 国际化
   locale: Object
 };

package/lib/ele-upload-list/style/index.scss

@@ -2,10 +2,13 @@
 
 .ele-upload-list {
   font-size: 0;
+  max-width: 100%;
+  box-sizing: border-box;
 
   .ele-upload-item {
     width: 100px;
     height: 100px;
+    max-width: 100%;
     font-size: 14px;
     display: inline-block;
     margin: 0 12px 12px 0;
@@ -63,7 +66,6 @@
       font-size: 22px;
     }
 
-    .ele-upload-mask,
     .ele-upload-progress {
       position: absolute;
       top: 0;
@@ -75,10 +77,6 @@
       z-index: 1;
     }
 
-    &:not(.sortable-chosen) .ele-upload-mask {
-      display: none;
-    }
-
     .ele-upload-progress {
       color: #fff;
       display: flex;
@@ -129,6 +127,7 @@
       & > .el-upload {
         height: 100%;
         display: flex;
+        cursor: inherit;
 
         & > .el-upload-dragger {
           width: 100%;
@@ -138,6 +137,7 @@
           justify-content: center;
           border-radius: elVar('border-radius', 'base');
           background: none;
+          cursor: inherit;
           border: none;
           padding: 0;
 
@@ -158,4 +158,14 @@
       color: elVar('text-color', 'secondary');
     }
   }
+
+  &.is-disabled .ele-upload-button {
+    background: elVar('disabled', 'bg-color');
+    border-color: elVar('disabled', 'border-color');
+    cursor: not-allowed;
+
+    .ele-upload-icon {
+      color: elVar('disabled', 'text-color');
+    }
+  }
 }

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

@@ -1,7 +1,7 @@
 /**
  * 数据类型
  */
-export interface UploadItem extends Record<string | number | symbol, unknown> {
+export interface UploadItem {
     /** 唯一标识 */
     key: string | number | symbol;
     /** 显示的图片地址, 为空时显示文件图标 */

package/lib/ele-watermark/index.js

@@ -1,6 +1,6 @@
 "use strict";
 const vue = require("vue");
-const licenseUtil = require("../utils/license-util");
+const receiver = require("../ele-config-provider/receiver");
 const util = require("./util");
 const props = require("./props");
 const SIZE = 2;
@@ -9,7 +9,7 @@ const _sfc_main = vue.defineComponent({
   name: "EleWatermark",
   props: props.watermarkProps,
   setup(props2) {
-    const { authenticated } = licenseUtil.useLicense();
+    const { authenticated } = receiver.useLicense();
     const base64 = vue.ref(null);
     const imgSize = vue.ref(null);
     const imgStyle = vue.computed(() => {

package/lib/ele-watermark/util.js

@@ -1,16 +1,14 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 function getFont(font) {
-  return Object.assign(
-    {
-      color: "rgba(68, 68, 68, .25)",
-      fontSize: 16,
-      fontWeight: "normal",
-      fontFamily: "sans-serif",
-      fontStyle: "normal"
-    },
-    font
-  );
+  const style = {
+    color: "rgba(68, 68, 68, .25)",
+    fontSize: 16,
+    fontWeight: "normal",
+    fontFamily: "sans-serif",
+    fontStyle: "normal"
+  };
+  return Object.assign(style, font);
 }
 function getGap(gap) {
   const [gapX, gapY] = gap ?? [];

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

@@ -7,7 +7,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         required: true;
     };
 }, {
-    playerId: import("vue").ComputedRef<string | undefined>;
+    rootRef: import("vue").Ref<HTMLDivElement | null>;
     player: null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     player: (_player: PlayerType | null) => true;

package/lib/ele-xg-player/index.js

@@ -14,29 +14,35 @@ const _sfc_main = vue.defineComponent({
   },
   setup(props, { emit }) {
     let player = null;
-    const playerId = vue.computed(() => {
-      var _a;
-      return (_a = props.config) == null ? void 0 : _a.id;
-    });
+    const rootRef = vue.ref(null);
     const init = () => {
       var _a;
-      if ((_a = props.config) == null ? void 0 : _a.url) {
-        player = new Player(props.config);
+      destroy();
+      if (rootRef.value && ((_a = props.config) == null ? void 0 : _a.url)) {
+        player = new Player(
+          Object.assign({}, props.config, { el: rootRef.value })
+        );
         emit("player", player);
       }
     };
+    const destroy = () => {
+      if (player && typeof player.destroy === "function") {
+        player.destroy();
+      }
+    };
     vue.onMounted(() => {
       init();
     });
-    vue.onBeforeUpdate(() => {
-      init();
-    });
     vue.onBeforeUnmount(() => {
-      if (player && typeof player.destroy === "function") {
-        player.destroy();
-      }
+      destroy();
     });
-    return { playerId, player };
+    vue.watch(
+      () => props.config,
+      () => {
+        init();
+      }
+    );
+    return { rootRef, player };
   }
 });
 const _export_sfc = (sfc, props) => {
@@ -46,9 +52,9 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const _hoisted_1 = ["id"];
+const _hoisted_1 = { ref: "rootRef" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return vue.openBlock(), vue.createElementBlock("div", { id: _ctx.playerId }, null, 8, _hoisted_1);
+  return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, null, 512);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = index;

package/lib/icons/ArrowDown.js

@@ -13,7 +13,7 @@ const _export_sfc = (sfc, props) => {
 const _hoisted_1 = {
   viewBox: "0 0 16 16",
   fill: "none",
-  class: "arrow-down"
+  class: "ele-arrow-down"
 };
 const _hoisted_2 = /* @__PURE__ */ vue.createElementVNode("path", {
   d: "M3.75 5.7998L7.99274 10.0425L12.2361 5.79921",

package/lib/icons/ArrowLeft.d.ts

@@ -0,0 +1,2 @@
+declare const _sfc_main: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
+export default _sfc_main;

package/lib/icons/ArrowLeft.js

@@ -0,0 +1,29 @@
+"use strict";
+const vue = require("vue");
+const _sfc_main = vue.defineComponent({
+  name: "ArrowLeft"
+});
+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"
+};
+const _hoisted_2 = /* @__PURE__ */ vue.createElementVNode("path", {
+  d: "M31 36L19 24L31 12",
+  stroke: "currentColor",
+  "stroke-width": "4"
+}, null, -1);
+const _hoisted_3 = [
+  _hoisted_2
+];
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return vue.openBlock(), vue.createElementBlock("svg", _hoisted_1, _hoisted_3);
+}
+const ArrowLeft = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+module.exports = ArrowLeft;

package/lib/icons/ArrowUp.d.ts

@@ -0,0 +1,2 @@
+declare const _sfc_main: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
+export default _sfc_main;

package/lib/icons/ArrowUp.js

@@ -0,0 +1,30 @@
+"use strict";
+const vue = require("vue");
+const _sfc_main = vue.defineComponent({
+  name: "ArrowUp"
+});
+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 16 16",
+  fill: "none",
+  class: "ele-arrow-up"
+};
+const _hoisted_2 = /* @__PURE__ */ vue.createElementVNode("path", {
+  d: "M3.75 10.2002L7.99274 5.7998L12.2361 10.0425",
+  stroke: "currentColor",
+  "stroke-width": "1.3"
+}, null, -1);
+const _hoisted_3 = [
+  _hoisted_2
+];
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return vue.openBlock(), vue.createElementBlock("svg", _hoisted_1, _hoisted_3);
+}
+const ArrowUp = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+module.exports = ArrowUp;

package/lib/icons/index.d.ts

@@ -1,5 +1,7 @@
 export { default as ArrowDown } from "./ArrowDown";
+export { default as ArrowLeft } from "./ArrowLeft";
 export { default as ArrowRight } from "./ArrowRight";
+export { default as ArrowUp } from "./ArrowUp";
 export { default as ColumnHeightOutlined } from "./ColumnHeightOutlined";
 export { default as CompressOutlined } from "./CompressOutlined";
 export { default as ExpandOutlined } from "./ExpandOutlined";

package/lib/icons/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const ArrowDown = require("./ArrowDown");
+const ArrowLeft = require("./ArrowLeft");
 const ArrowRight = require("./ArrowRight");
+const ArrowUp = require("./ArrowUp");
 const ColumnHeightOutlined = require("./ColumnHeightOutlined");
 const CompressOutlined = require("./CompressOutlined");
 const ExpandOutlined = require("./ExpandOutlined");
@@ -12,7 +14,9 @@ const LoadingOutlined = require("./LoadingOutlined");
 const VerticalLeftOutlined = require("./VerticalLeftOutlined");
 const VerticalRightOutlined = require("./VerticalRightOutlined");
 exports.ArrowDown = ArrowDown;
+exports.ArrowLeft = ArrowLeft;
 exports.ArrowRight = ArrowRight;
+exports.ArrowUp = ArrowUp;
 exports.ColumnHeightOutlined = ColumnHeightOutlined;
 exports.CompressOutlined = CompressOutlined;
 exports.ExpandOutlined = ExpandOutlined;

package/lib/index.d.ts

@@ -5,8 +5,6 @@ export * from './utils/chart-theme';
 export * from './utils/core';
 export * from './utils/menu-util';
 export * from './utils/message';
-export * from './utils/printer';
-export * from './utils/theme-util';
 export * from './utils/validate';
 export { default as HeaderTool } from "./ele-pro-layout/components/header-tool";
 export { default as SidebarTool } from "./ele-pro-layout/components/sidebar-tool";

package/lib/index.js

@@ -6,8 +6,6 @@ const chartTheme = require("./utils/chart-theme");
 const core = require("./utils/core");
 const menuUtil = require("./utils/menu-util");
 const message = require("./utils/message");
-const printer = require("./utils/printer");
-const themeUtil = require("./utils/theme-util");
 const validate = require("./utils/validate");
 const headerTool = require("./ele-pro-layout/components/header-tool");
 const sidebarTool = require("./ele-pro-layout/components/sidebar-tool");
@@ -62,20 +60,6 @@ Object.keys(message).forEach((k) => {
       get: () => message[k]
     });
 });
-Object.keys(printer).forEach((k) => {
-  if (k !== "default" && !exports.hasOwnProperty(k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => printer[k]
-    });
-});
-Object.keys(themeUtil).forEach((k) => {
-  if (k !== "default" && !exports.hasOwnProperty(k))
-    Object.defineProperty(exports, k, {
-      enumerable: true,
-      get: () => themeUtil[k]
-    });
-});
 Object.keys(validate).forEach((k) => {
   if (k !== "default" && !exports.hasOwnProperty(k))
     Object.defineProperty(exports, k, {

package/lib/lang/en_US.js

@@ -34,8 +34,8 @@ const localeValues = {
     sizes: "Density",
     columns: "Columns",
     maximized: "Fullscreen",
-    sizeLarge: "Default",
-    sizeDefault: "Secondary",
+    sizeLarge: "Large",
+    sizeDefault: "Default",
     sizeSmall: "Compact",
     columnTitle: "Columns",
     columnReset: "Reset",

package/lib/lang/zh_CN.js

@@ -34,7 +34,7 @@ const localeValues = {
     sizes: "密度",
     columns: "列设置",
     maximized: "全屏",
-    sizeLarge: "默认",
+    sizeLarge: "宽松",
     sizeDefault: "中等",
     sizeSmall: "紧凑",
     columnTitle: "列展示",

package/lib/lang/zh_TW.js

@@ -35,7 +35,7 @@ const localeValues = {
     sizes: "密度",
     columns: "列設定",
     maximized: "全屏",
-    sizeLarge: "默認",
+    sizeLarge: "寬鬆",
     sizeDefault: "中等",
     sizeSmall: "緊湊",
     columnTitle: "列展示",

package/lib/style/index.scss

@@ -1,3 +1,4 @@
+@use '../ele-alert/style/index.scss' as alert;
 @use '../ele-app/style/index.scss' as app;
 @use '../ele-avatar-group/style/index.scss' as avatarGroup;
 @use '../ele-basic-select/style/index.scss' as basicSelect;
@@ -17,8 +18,10 @@
 @use '../ele-modal/style/index.scss' as modal;
 @use '../ele-page/style/index.scss' as page;
 @use '../ele-pagination/style/index.scss' as pagination;
+@use '../ele-printer/style/index.scss' as printer;
 @use '../ele-pro-layout/style/index.scss' as proLayout;
 @use '../ele-pro-table/style/index.scss' as proTable;
+@use '../ele-segmented/style/index.scss' as segmented;
 @use '../ele-split-panel/style/index.scss' as splitPanel;
 @use '../ele-steps/style/index.scss' as steps;
 @use '../ele-tabs/style/index.scss' as tabs;

package/lib/style/themes/dark-css-var.scss

@@ -1,5 +1,6 @@
 /** 暗黑主题 css 变量 */
 @use './dark.scss' as *;
+@use '../../ele-alert/style/css-var.scss' as *;
 @use '../../ele-app/style/css-var.scss' as *;
 @use '../../ele-bottom-bar/style/css-var.scss' as *;
 @use '../../ele-card/style/css-var.scss' as *;
@@ -10,17 +11,19 @@
 @use '../../ele-page/style/css-var.scss' as *;
 @use '../../ele-pro-layout/style/css-var.scss' as *;
 @use '../../ele-pro-table/style/css-var.scss' as *;
+@use '../../ele-segmented/style/css-var.scss' as *;
 @use '../../ele-table/style/css-var.scss' as *;
 @use '../../ele-tabs/style/css-var.scss' as *;
 @use '../../ele-text/style/css-var.scss' as *;
 @use '../../ele-tool/style/css-var.scss' as *;
 @use '../../ele-toolbar/style/css-var.scss' as *;
-$dark-class: dark !default;
+$dark-selector: 'html.dark' !default;
 
-html.#{$dark-class} {
-  @include set-scrollbar-var($ele);
+#{$dark-selector} {
+  @include set-alert-var($ele);
   @include set-common-var($ele);
   @include set-message-var($ele);
+  @include set-scrollbar-var($ele);
   @include set-bottom-bar-var($ele);
   @include set-card-var($ele);
   @include set-drawer-var($ele);
@@ -30,6 +33,7 @@ html.#{$dark-class} {
   @include set-page-var($ele);
   @include set-layout-var($ele);
   @include set-pro-table-var($ele);
+  @include set-segmented-var($ele);
   @include set-table-var($ele);
   @include set-tab-var($ele);
   @include set-text-var($ele);

package/lib/style/themes/dark.scss

@@ -52,7 +52,7 @@ $ele: (
   'tab-indicator': (
     'color': #434343
   ),
-  'tooltip-dark': (
+  'tooltip': (
     'bg': '#424242'
   ),
   'image-viewer': (