yuang-framework-ui-pc 1.1.14 → 1.1.16

package/lib/ele-map-picker/index.cjs

@@ -3,7 +3,7 @@ const vue = require("vue");
 const core = require("../utils/core");
 const receiver = require("../ele-config-provider/receiver");
 const util = require("../ele-pro-layout/util");
-const EleModal = require("../ele-modal/index");
+const EleModal = require("../ele-dialog/index");
 const MapView = require("./components/map-view");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({

package/lib/ele-map-picker/style/index.cjs

@@ -5,5 +5,5 @@ require("element-plus/es/components/button/style/index");
 require("element-plus/es/components/icon/style/index");
 require("element-plus/es/components/empty/style/index");
 require("../../ele-loading/style/index");
-require("../../ele-modal/style/index");
+require("../../ele-dialog/style/index");
 require("./index.scss");

package/lib/ele-map-picker/style/index.scss

@@ -4,7 +4,7 @@
 
 @include set-map-var($ele);
 
-.ele-modal .ele-map-picker .ele-modal-body {
+.ele-dialog .ele-map-picker .ele-dialog-body {
   padding: 0;
 }
 
@@ -258,8 +258,8 @@
     & > .el-dialog__header {
       flex-shrink: 0;
 
-      .ele-modal-tool-max,
-      .ele-modal-resize-icon {
+      .ele-dialog-tool-max,
+      .ele-dialog-resize-icon {
         display: none;
       }
     }
@@ -268,7 +268,7 @@
       flex: 1;
       overflow: hidden;
 
-      & > .ele-modal-body {
+      & > .ele-dialog-body {
         height: 100%;
         overflow: hidden;
       }

package/lib/ele-pro-table/components/tool-export.cjs

@@ -2,7 +2,7 @@
 const vue = require("vue");
 const elementPlus = require("element-plus");
 const core = require("../../utils/core");
-const EleModal = require("../../ele-modal/index");
+const EleModal = require("../../ele-dialog/index");
 const util = require("../util");
 const ToolColumnList = require("./tool-column-list");
 const _sfc_main = vue.defineComponent({

package/lib/ele-pro-table/components/tool-print.cjs

@@ -2,7 +2,7 @@
 const vue = require("vue");
 const elementPlus = require("element-plus");
 const core = require("../../utils/core");
-const EleModal = require("../../ele-modal/index");
+const EleModal = require("../../ele-dialog/index");
 const ElePrinter = require("../../ele-printer/index");
 const EleTable = require("../../ele-table/index");
 const util = require("../../ele-virtual-table/util");

package/lib/ele-pro-table/style/index.cjs

@@ -15,7 +15,7 @@ require("../../ele-loading/style/index");
 require("../../ele-pagination/style/index");
 require("../../ele-data-table/style/index");
 require("../../ele-virtual-table/style/index");
-require("../../ele-modal/style/index");
+require("../../ele-dialog/style/index");
 require("../../ele-printer/style/index");
 require("../../ele-table/style/index");
 require("./index.scss");

package/lib/style/plus.scss

@@ -22,7 +22,9 @@
 @use '../ele-loading/style/index.scss' as loading;
 @use '../ele-map-picker/style/index.scss' as mapPicker;
 @use '../ele-menus/style/index.scss' as menus;
-@use '../ele-modal/style/index.scss' as modal;
+// temp
+@use '../ele-dialog/style/index.scss' as modal;
+@use '../ele-dialog/style/index.scss' as dialog;
 @use '../ele-page/style/index.scss' as page;
 @use '../ele-pagination/style/index.scss' as pagination;
 @use '../ele-popconfirm/style/index.scss' as popconfirm;

package/lib/style/themes/default.scss

@@ -460,6 +460,7 @@ $ele: map.deep-merge(
       'bg-7': #7dd733,
       'bg-8': #faad14
     ),
+    // temp
     'modal': (
       // 弹窗
       'bg': elVar('bg-color', 'overlay'),
@@ -484,6 +485,31 @@ $ele: map.deep-merge(
       'fullscreen-border': 1px solid elVar('border-color', 'light'),
       'mobile-space': 16px
     ),
+
+    'dialog': (
+      // 弹窗
+      'bg': elVar('bg-color', 'overlay'),
+      'radius': elVar('border-radius', 'base'),
+      'header-color': elVar('text-color', 'primary'),
+      'header-font-size': elVar('font-size', 'medium'),
+      'header-font-weight': normal,
+      'header-line-height': 24px,
+      'header-padding': 14px 20px,
+      'header-border': 1px solid elVar('border-color', 'light'),
+      'icon-size': 22px,
+      'icon-font-size': 16px,
+      'icon-color': elVar('text-color', 'secondary'),
+      'icon-hover-color': elVar('text-color', 'primary'),
+      'icon-hover-bg': transparent,
+      'icon-radius': elVar('border-radius', 'small'),
+      'icon-space': 8px,
+      'body-padding': 24px 22px,
+      'form-body-padding': 24px 22px 12px 20px,
+      'footer-padding': 10px 20px,
+      'footer-border': 1px solid elVar('border-color', 'light'),
+      'fullscreen-border': 1px solid elVar('border-color', 'light'),
+      'mobile-space': 16px
+    ),
     'page': (
       // 页面容器
       'padding': 16px,

package/lib/style/themes/theme-util.scss

@@ -15,7 +15,7 @@
 @use '../../ele-loading/style/css-var.scss' as *;
 @use '../../ele-map-picker/style/css-var.scss' as *;
 @use '../../ele-menus/style/css-var.scss' as *;
-@use '../../ele-modal/style/css-var.scss' as *;
+@use '../../ele-dialog/style/css-var.scss' as *;
 @use '../../ele-page/style/css-var.scss' as *;
 @use '../../ele-pagination/style/css-var.scss' as *;
 @use '../../ele-popconfirm/style/css-var.scss' as *;
@@ -53,7 +53,7 @@
     @include set-loading-var($var);
     @include set-map-var($var);
     @include set-menus-var($var);
-    @include set-modal-var($var);
+    @include set-dialog-var($var);
     @include set-page-var($var);
     @include set-pagination-var($var);
     @include set-popconfirm-var($var);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-pc",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts --mode dev",
@@ -188,6 +188,6 @@
   "repository": "",
   "license": "",
   "dependencies": {
-    "yuang-framework-ui-common": "^1.0.40"
+    "yuang-framework-ui-common": "^1.0.45"
   }
 }

package/typings/global.d.ts

@@ -32,7 +32,6 @@ declare module '@vue/runtime-core' {
     EleLoading: (typeof import('yuang-framework-ui-pc'))['EleLoading'];
     EleMapPicker: (typeof import('yuang-framework-ui-pc'))['EleMapPicker'];
     EleMenus: (typeof import('yuang-framework-ui-pc'))['EleMenus'];
-    EleModal: (typeof import('yuang-framework-ui-pc'))['EleModal'];
     ElePage: (typeof import('yuang-framework-ui-pc'))['ElePage'];
     ElePagination: (typeof import('yuang-framework-ui-pc'))['ElePagination'];
     ElePopconfirm: (typeof import('yuang-framework-ui-pc'))['ElePopconfirm'];

package/es/ele-modal/index.d.ts

@@ -1,245 +0,0 @@
-import { ElDialogInstance } from '../ele-app/el';
-
-declare const _default: import('vue').DefineComponent<{
-    appendToBody: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    draggable: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    moveOut: import('vue').PropType<import('./types').MoveOut>;
-    resizable: import('vue').PropType<import('./types').Resizable>;
-    position: import('vue').PropType<import('./types').Position>;
-    resetOnClose: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    maxable: BooleanConstructor;
-    multiple: BooleanConstructor;
-    inner: BooleanConstructor;
-    minWidth: {
-        type: NumberConstructor;
-        default: number;
-    };
-    minHeight: {
-        type: NumberConstructor;
-        default: number;
-    };
-    headerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    titleStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    closeBtnStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    fullscreenBtnStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    resizeIconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    responsive: {
-        type: BooleanConstructor;
-        default: null;
-    };
-    form: BooleanConstructor;
-    appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement) | ((new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement))[], unknown, unknown, "body", boolean>;
-    beforeClose: {
-        readonly type: import('vue').PropType<import('element-plus').DialogBeforeCloseFn>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    destroyOnClose: BooleanConstructor;
-    closeOnClickModal: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    closeOnPressEscape: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    lockScroll: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    modal: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    openDelay: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    closeDelay: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    top: {
-        readonly type: import('vue').PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    modelValue: BooleanConstructor;
-    modalClass: StringConstructor;
-    width: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    zIndex: {
-        readonly type: import('vue').PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    trapFocus: BooleanConstructor;
-    headerAriaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
-    center: BooleanConstructor;
-    alignCenter: BooleanConstructor;
-    closeIcon: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    overflow: BooleanConstructor;
-    fullscreen: BooleanConstructor;
-    showClose: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    title: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    ariaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
-}, {
-    dialogRef: import('vue').Ref<ElDialogInstance>;
-    isFullscreen: import('vue').Ref<boolean>;
-    dialogClass: import('vue').ComputedRef<string>;
-    teleportTo: import('vue').ComputedRef<string | Element>;
-    teleportDisabled: import('vue').ComputedRef<boolean>;
-    handleHeaderMousedown: (e: MouseEvent) => void;
-    handleHeaderTouchstart: (e: TouchEvent) => void;
-    handleResizeMousedown: (e: MouseEvent) => void;
-    handleResizeTouchstart: (e: TouchEvent) => void;
-    updateModelValue: (modelValue: boolean) => void;
-    toggleFullscreen: (fullscreen?: boolean) => void;
-    handleOpen: () => void;
-    handleOpened: () => void;
-    handleClose: () => void;
-    handleClosed: () => void;
-    handleOpenAutoFocus: () => void;
-    handleCloseAutoFocus: () => void;
-}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    'update:fullscreen': (_fullscreen: boolean) => boolean;
-    open: () => boolean;
-    opened: () => boolean;
-    close: () => boolean;
-    closed: () => boolean;
-    "update:modelValue": (value: boolean) => boolean;
-    openAutoFocus: () => boolean;
-    closeAutoFocus: () => boolean;
-}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    appendToBody: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    draggable: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    moveOut: import('vue').PropType<import('./types').MoveOut>;
-    resizable: import('vue').PropType<import('./types').Resizable>;
-    position: import('vue').PropType<import('./types').Position>;
-    resetOnClose: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    maxable: BooleanConstructor;
-    multiple: BooleanConstructor;
-    inner: BooleanConstructor;
-    minWidth: {
-        type: NumberConstructor;
-        default: number;
-    };
-    minHeight: {
-        type: NumberConstructor;
-        default: number;
-    };
-    headerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    titleStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    closeBtnStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    fullscreenBtnStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    resizeIconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    responsive: {
-        type: BooleanConstructor;
-        default: null;
-    };
-    form: BooleanConstructor;
-    appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement) | ((new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement))[], unknown, unknown, "body", boolean>;
-    beforeClose: {
-        readonly type: import('vue').PropType<import('element-plus').DialogBeforeCloseFn>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    destroyOnClose: BooleanConstructor;
-    closeOnClickModal: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    closeOnPressEscape: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    lockScroll: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    modal: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    openDelay: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    closeDelay: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    top: {
-        readonly type: import('vue').PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    modelValue: BooleanConstructor;
-    modalClass: StringConstructor;
-    width: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    zIndex: {
-        readonly type: import('vue').PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    trapFocus: BooleanConstructor;
-    headerAriaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
-    center: BooleanConstructor;
-    alignCenter: BooleanConstructor;
-    closeIcon: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    overflow: BooleanConstructor;
-    fullscreen: BooleanConstructor;
-    showClose: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    title: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    ariaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
-}>> & {
-    "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
-    onClose?: (() => any) | undefined;
-    onOpen?: (() => any) | undefined;
-    onOpened?: (() => any) | undefined;
-    onClosed?: (() => any) | undefined;
-    onOpenAutoFocus?: (() => any) | undefined;
-    onCloseAutoFocus?: (() => any) | undefined;
-    "onUpdate:fullscreen"?: ((_fullscreen: boolean) => any) | undefined;
-}, {
-    form: boolean;
-    title: string;
-    center: boolean;
-    modelValue: boolean;
-    appendToBody: boolean;
-    appendTo: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement) | ((new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement))[], unknown, unknown>;
-    destroyOnClose: boolean;
-    closeOnClickModal: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    closeOnPressEscape: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    lockScroll: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    modal: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    openDelay: number;
-    closeDelay: number;
-    trapFocus: boolean;
-    headerAriaLevel: string;
-    alignCenter: boolean;
-    draggable: boolean;
-    overflow: boolean;
-    fullscreen: boolean;
-    showClose: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    ariaLevel: string;
-    minWidth: number;
-    minHeight: number;
-    multiple: boolean;
-    responsive: boolean;
-    resetOnClose: boolean;
-    maxable: boolean;
-    inner: boolean;
-}, {}>;
-export default _default;