ele-admin-plus 1.0.2 → 1.1.0

package/lib/ele-map-picker/components/map-view.js

@@ -19,6 +19,7 @@ const _sfc_main = vue.defineComponent({
     Plus: iconsVue.Plus,
     Location: iconsVue.Location,
     CircleCheck: iconsVue.CircleCheck,
+    Check: iconsVue.Check,
     Search: iconsVue.Search
   },
   props: props.mapProps,
@@ -210,12 +211,12 @@ const _sfc_main = vue.defineComponent({
             return;
           }
           const data2 = result.tips.filter((d) => !!d.location).map((d) => {
-            const label = `${d.name}(${d.district})`;
+            const key = `${d.name}(${d.district})`;
             return {
               ...d,
-              label,
-              value: label,
-              key: d.id || label,
+              label: d.name,
+              value: d.name,
+              key: d.id || key,
               address: Array.isArray(d.address) ? d.address[0] : d.address
             };
           });
@@ -408,7 +409,6 @@ const _sfc_main = vue.defineComponent({
       destroyAll();
     });
     return {
-      Check: iconsVue.Check,
       mapRef,
       loading,
       poiLoading,
@@ -434,31 +434,33 @@ const _export_sfc = (sfc, props2) => {
   }
   return target;
 };
-const _hoisted_1 = { class: "ele-map-view-header" };
-const _hoisted_2 = { class: "ele-map-view-search" };
-const _hoisted_3 = { class: "ele-map-view-main" };
-const _hoisted_4 = ["src"];
-const _hoisted_5 = { class: "ele-map-view-side" };
-const _hoisted_6 = ["onClick"];
-const _hoisted_7 = { class: "ele-map-view-item-title" };
-const _hoisted_8 = {
+const _hoisted_1 = { class: "ele-map-view-search" };
+const _hoisted_2 = { class: "ele-map-suggest-title" };
+const _hoisted_3 = { class: "ele-map-suggest-text" };
+const _hoisted_4 = { class: "ele-map-view-main" };
+const _hoisted_5 = ["src"];
+const _hoisted_6 = { class: "ele-map-view-side" };
+const _hoisted_7 = ["onClick"];
+const _hoisted_8 = { class: "ele-map-view-item-title" };
+const _hoisted_9 = {
   key: 0,
   class: "ele-map-view-item-text"
 };
-const _hoisted_9 = {
+const _hoisted_10 = {
   key: 0,
   class: "ele-map-view-empty"
 };
-const _hoisted_10 = {
+const _hoisted_11 = {
   key: 0,
   class: "ele-map-view-extra"
 };
-const _hoisted_11 = { class: "ele-map-view-message" };
+const _hoisted_12 = { class: "ele-map-view-message" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Search = vue.resolveComponent("Search");
   const _component_ElIcon = vue.resolveComponent("ElIcon");
   const _component_ElInput = vue.resolveComponent("ElInput");
   const _component_ElAutocomplete = vue.resolveComponent("ElAutocomplete");
+  const _component_Check = vue.resolveComponent("Check");
   const _component_ElButton = vue.resolveComponent("ElButton");
   const _component_Plus = vue.resolveComponent("Plus");
   const _component_Location = vue.resolveComponent("Location");
@@ -470,8 +472,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     class: "ele-map-view"
   }, {
     default: vue.withCtx(() => [
-      vue.createElementVNode("div", _hoisted_1, [
-        vue.createElementVNode("div", _hoisted_2, [
+      vue.createElementVNode("div", {
+        class: "ele-map-view-header",
+        style: vue.normalizeStyle(_ctx.headerStyle)
+      }, [
+        vue.createElementVNode("div", _hoisted_1, [
           _ctx.keywordMode ? (vue.openBlock(), vue.createBlock(_component_ElInput, {
             key: 0,
             clearable: "",
@@ -483,7 +488,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             prefix: vue.withCtx(() => [
               vue.createVNode(_component_ElIcon, { class: "el-input__icon" }, {
                 default: vue.withCtx(() => [
-                  vue.createVNode(_component_Search)
+                  vue.createVNode(_component_Search, { style: { "transform": "scale(1.1)" } })
                 ]),
                 _: 1
               })
@@ -501,16 +506,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             prefix: vue.withCtx(() => [
               vue.createVNode(_component_ElIcon, { class: "el-input__icon" }, {
                 default: vue.withCtx(() => [
-                  vue.createVNode(_component_Search)
+                  vue.createVNode(_component_Search, { style: { "transform": "scale(1.1)" } })
                 ]),
                 _: 1
               })
             ]),
+            default: vue.withCtx(({ item }) => [
+              vue.createElementVNode("span", _hoisted_2, vue.toDisplayString(item.label), 1),
+              vue.createElementVNode("span", _hoisted_3, "(" + vue.toDisplayString(item.district) + ")", 1)
+            ]),
             _: 1
           }, 8, ["modelValue", "fetchSuggestions", "placeholder", "onSelect"]))
         ]),
         vue.createVNode(_component_ElButton, {
-          icon: _ctx.Check,
           type: "primary",
           disabled: _ctx.disabled,
           loading: _ctx.confirmLoading,
@@ -518,16 +526,22 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           onClick: _ctx.onConfirm
         }, {
           default: vue.withCtx(() => [
-            vue.createTextVNode(vue.toDisplayString(_ctx.okText), 1)
+            vue.createVNode(_component_ElIcon, null, {
+              default: vue.withCtx(() => [
+                vue.createVNode(_component_Check, { style: { "transform": "scale(1.2)" } })
+              ]),
+              _: 1
+            }),
+            vue.createElementVNode("span", null, vue.toDisplayString(_ctx.okText), 1)
           ]),
           _: 1
-        }, 8, ["icon", "disabled", "loading", "onClick"])
-      ]),
+        }, 8, ["disabled", "loading", "onClick"])
+      ], 4),
       vue.createElementVNode("div", {
         class: "ele-map-view-body",
         style: vue.normalizeStyle({ height: _ctx.height })
       }, [
-        vue.createElementVNode("div", _hoisted_3, [
+        vue.createElementVNode("div", _hoisted_4, [
           vue.createElementVNode("div", {
             ref: "mapRef",
             style: vue.normalizeStyle({ height: _ctx.height })
@@ -542,13 +556,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             vue.createElementVNode("img", {
               src: _ctx.markerSrc,
               class: vue.normalizeClass(_ctx.centerIconClass)
-            }, null, 10, _hoisted_4)
+            }, null, 10, _hoisted_5)
           ], 64)) : vue.createCommentVNode("", true)
         ]),
-        vue.createElementVNode("div", _hoisted_5, [
+        vue.createElementVNode("div", _hoisted_6, [
           vue.createVNode(_component_EleLoading, {
             loading: _ctx.poiLoading,
-            class: "ele-map-view-list ele-scrollbar-hover ele-scrollbar-mini"
+            class: "ele-map-view-list"
           }, {
             default: vue.withCtx(() => [
               (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.data, (item) => {
@@ -563,24 +577,24 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                     ]),
                     _: 1
                   }),
-                  vue.createElementVNode("div", _hoisted_7, vue.toDisplayString(item.name), 1),
-                  item.address ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_8, vue.toDisplayString(item.address), 1)) : vue.createCommentVNode("", true),
+                  vue.createElementVNode("div", _hoisted_8, vue.toDisplayString(item.name), 1),
+                  item.address ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_9, vue.toDisplayString(item.address), 1)) : vue.createCommentVNode("", true),
                   vue.createVNode(_component_ElIcon, { class: "ele-map-view-item-radio" }, {
                     default: vue.withCtx(() => [
                       vue.createVNode(_component_CircleCheck)
                     ]),
                     _: 1
                   })
-                ], 10, _hoisted_6);
+                ], 10, _hoisted_7);
               }), 128)),
-              !_ctx.data || !_ctx.data.length ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_9, [
+              !_ctx.data || !_ctx.data.length ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_10, [
                 vue.createVNode(_component_ElEmpty, vue.mergeProps({ imageSize: 80 }, _ctx.emptyProps), null, 16)
               ])) : vue.createCommentVNode("", true)
             ]),
             _: 1
           }, 8, ["loading"]),
-          _ctx.disabled ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_10, [
-            vue.createElementVNode("div", _hoisted_11, vue.toDisplayString(_ctx.message), 1)
+          _ctx.disabled ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_11, [
+            vue.createElementVNode("div", _hoisted_12, vue.toDisplayString(_ctx.message), 1)
           ])) : vue.createCommentVNode("", true)
         ])
       ], 4)

package/lib/ele-map-picker/index.d.ts

@@ -3,14 +3,14 @@ import type { CenterPoint, MapLocale } from './types';
 import type { MapProps } from './props';
 import type MapViewType from "./components/map-view";
 export type MapViewInstance = InstanceType<typeof MapViewType> | null;
-declare const _sfc_main: import("vue").DefineComponent<{
+declare const _default: import("vue").DefineComponent<{
     modelValue: BooleanConstructor;
     modalProps: import("vue").PropType<Partial<Omit<import("../ele-modal/props").ModalProps, "modelValue">>>;
     responsive: {
         type: BooleanConstructor;
         default: null;
     };
-    locale: import("vue").PropType<MapLocale>;
+    locale: import("vue").PropType<Partial<MapLocale>>;
     height: {
         type: StringConstructor;
         default: string;
@@ -64,9 +64,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
     mapStyle: StringConstructor;
     darkMode: BooleanConstructor;
     okText: StringConstructor;
-    emptyProps: import("vue").PropType<Partial<import("element-plus").EmptyProps>>;
+    emptyProps: import("vue").PropType<import("../ele-app/types").ElEmptyProps>;
+    headerStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
 }, {
-    mapRef: Ref<any>;
+    mapRef: Ref<MapViewInstance>;
     lang: import("vue").ComputedRef<MapLocale>;
     isResponsive: import("vue").ComputedRef<boolean>;
     aMapKey: import("vue").ComputedRef<string | undefined>;
@@ -87,7 +88,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: null;
     };
-    locale: import("vue").PropType<MapLocale>;
+    locale: import("vue").PropType<Partial<MapLocale>>;
     height: {
         type: StringConstructor;
         default: string;
@@ -141,18 +142,19 @@ declare const _sfc_main: import("vue").DefineComponent<{
     mapStyle: StringConstructor;
     darkMode: BooleanConstructor;
     okText: StringConstructor;
-    emptyProps: import("vue").PropType<Partial<import("element-plus").EmptyProps>>;
+    emptyProps: import("vue").PropType<import("../ele-app/types").ElEmptyProps>;
+    headerStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
 }>> & {
-    onDone?: ((_result: CenterPoint) => any) | undefined;
-    onMapDone?: ((_ins: any) => any) | undefined;
+    "onUpdate:modelValue"?: ((_value: boolean) => any) | undefined;
     onOpen?: (() => any) | undefined;
     onClosed?: (() => any) | undefined;
-    "onUpdate:modelValue"?: ((_value: boolean) => any) | undefined;
+    onDone?: ((_result: CenterPoint) => any) | undefined;
+    onMapDone?: ((_ins: any) => any) | undefined;
 }, {
     required: boolean;
-    responsive: boolean;
     modelValue: boolean;
     height: string;
+    responsive: boolean;
     zoom: number;
     selectedZoom: number;
     poiLimit: number;
@@ -166,4 +168,4 @@ declare const _sfc_main: import("vue").DefineComponent<{
     mapVersion: string;
     darkMode: boolean;
 }, {}>;
-export default _sfc_main;
+export default _default;

package/lib/ele-map-picker/props.d.ts

@@ -1,5 +1,5 @@
 import type { PropType, ExtractPropTypes } from 'vue';
-import type { EmptyProps } from 'element-plus';
+import type { StyleValue, ElEmptyProps } from '../ele-app/types';
 import type { ModalProps } from '../ele-modal/props';
 import type { MapLocale, CenterPoint } from './types';
 /**
@@ -59,7 +59,8 @@ export declare const mapProps: {
     mapStyle: StringConstructor;
     darkMode: BooleanConstructor;
     okText: StringConstructor;
-    emptyProps: PropType<Partial<EmptyProps>>;
+    emptyProps: PropType<ElEmptyProps>;
+    headerStyle: PropType<StyleValue>;
 };
 export declare const mapPickerProps: {
     modelValue: BooleanConstructor;
@@ -68,7 +69,7 @@ export declare const mapPickerProps: {
         type: BooleanConstructor;
         default: null;
     };
-    locale: PropType<MapLocale>;
+    locale: PropType<Partial<MapLocale>>;
     height: {
         type: StringConstructor;
         default: string;
@@ -122,7 +123,8 @@ export declare const mapPickerProps: {
     mapStyle: StringConstructor;
     darkMode: BooleanConstructor;
     okText: StringConstructor;
-    emptyProps: PropType<Partial<EmptyProps>>;
+    emptyProps: PropType<ElEmptyProps>;
+    headerStyle: PropType<StyleValue>;
 };
 export type MapPickerProps = ExtractPropTypes<typeof mapPickerProps>;
 export type MapProps = ExtractPropTypes<typeof mapProps>;

package/lib/ele-map-picker/props.js

@@ -75,7 +75,9 @@ const mapProps = {
   // 完成按钮文字
   okText: String,
   // 空组件属性
-  emptyProps: Object
+  emptyProps: Object,
+  // 自定义header样式
+  headerStyle: Object
 };
 const mapPickerProps = {
   ...mapProps,

package/lib/ele-map-picker/style/css-var.scss

@@ -0,0 +1,7 @@
+@use '../../style/util.scss' as *;
+
+@mixin set-map-var($var) {
+  .ele-map-picker {
+    @include set-ele-var('map', $var);
+  }
+}

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

@@ -1,4 +1,8 @@
 @use '../../style/themes/default.scss' as *;
+@use '../../style/util.scss' as *;
+@use './css-var.scss' as *;
+
+@include set-map-var($ele);
 
 .ele-map-picker > .el-dialog__body > div.ele-modal-body {
   padding: 0;
@@ -9,11 +13,11 @@
   display: flex;
   align-items: center;
   box-sizing: border-box;
-  padding: 8px 14px;
+  padding: eleVar('map', 'header-padding');
 
   .ele-map-view-search {
     flex: 1;
-    padding-right: 16px;
+    padding-right: 14px;
     box-sizing: border-box;
 
     .el-autocomplete,
@@ -24,16 +28,16 @@
   }
 
   .ele-map-view-btn-ok {
-    padding-left: 10px;
-    padding-right: 10px;
+    padding-left: 9px;
+    padding-right: 11px;
   }
 }
 
 /* 地图 */
 .ele-map-view-body {
   display: flex;
-  border-bottom-left-radius: elVar('border-radius', 'small');
-  border-bottom-right-radius: elVar('border-radius', 'small');
+  border-bottom-left-radius: eleVar('modal', 'radius');
+  border-bottom-right-radius: eleVar('modal', 'radius');
   overflow: hidden;
 
   .ele-map-view-main {
@@ -62,7 +66,8 @@
   // 右侧
   .ele-map-view-side {
     width: 300px;
-    border-top: 1px solid elVar('border-color', 'extra-light');
+    flex-shrink: 0;
+    border-top: 1px solid elVar('border-color', 'light');
     display: flex;
     flex-direction: column;
     box-sizing: border-box;
@@ -70,14 +75,13 @@
 
   // 提示信息
   .ele-map-view-extra {
-    padding: 4px 12px;
-    box-sizing: border-box;
-    background: elVar('bg-color');
     flex-shrink: 0;
+    padding: 6px 12px;
+    box-sizing: border-box;
   }
 
   .ele-map-view-message {
-    padding: 2px 8px;
+    padding: 4px 8px;
     box-sizing: border-box;
     color: elVar('color-error');
     font-size: elVar('font-size', 'small');
@@ -98,15 +102,15 @@
   // poi列表
   .ele-map-view-list {
     flex: 1;
+    box-sizing: border-box;
     overflow: auto;
     overflow: overlay;
-    box-sizing: border-box;
   }
 
   .ele-map-view-item {
     padding: 8px 30px 8px 46px;
-    border-bottom: 1px solid elVar('border-color', 'extra-light');
-    transition: background-color 0.2s;
+    border-bottom: 1px solid elVar('border-color', 'light');
+    transition: background-color $ele-transition;
     box-sizing: border-box;
     position: relative;
     cursor: pointer;
@@ -138,10 +142,10 @@
   .ele-map-view-item-radio {
     position: absolute;
     top: 50%;
-    right: 10px;
+    right: 12px;
     transform: translateY(-50%);
     color: elVar('color-primary');
-    font-size: elVar('font-size', 'medium');
+    font-size: 16px;
     display: none;
   }
 
@@ -183,6 +187,12 @@
   }
 }
 
+.ele-map-suggest-text {
+  color: elVar('text-color', 'secondary');
+  font-size: elVar('font-size', 'small');
+  margin-left: 6px;
+}
+
 /* 小屏幕适应 */
 @media screen and (max-width: 768px) {
   .ele-map-picker.is-responsive {

package/lib/ele-menus/index.d.ts

@@ -1,24 +1,24 @@
 import type { NavigationFailure } from 'vue-router';
 import type { MenuItemClicked } from 'element-plus';
 import type { ElMenuInstance } from '../ele-app/types';
-import type { MenuItem, MenuTheme, PopupMenuTheme, PopupColorful } from './types';
 declare const _default: import("vue").DefineComponent<{
     items: {
-        type: import("vue").PropType<MenuItem[]>;
+        type: import("vue").PropType<import("./types").MenuItem[]>;
         required: boolean;
     };
-    theme: import("vue").PropType<MenuTheme>;
+    theme: import("vue").PropType<import("./types").MenuTheme>;
     popupTheme: {
-        type: import("vue").PropType<PopupMenuTheme>;
+        type: import("vue").PropType<import("./types").PopupMenuTheme>;
         default: string;
     };
     colorful: BooleanConstructor;
     popupColorful: {
-        type: import("vue").PropType<PopupColorful>;
+        type: import("vue").PropType<import("./types").PopupColorful>;
         default: string;
     };
     firstPopperClass: StringConstructor;
     tooltipDisabled: BooleanConstructor;
+    ellipsisProps: import("vue").PropType<import("./types").EllipsisProps>;
     mode: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "horizontal" | "vertical", unknown, "vertical", boolean>;
     defaultActive: import("element-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     defaultOpeneds: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => [], boolean>;
@@ -42,21 +42,22 @@ declare const _default: import("vue").DefineComponent<{
     select: (index: string, indexPath: string[], item: MenuItemClicked, routerResult?: Promise<void | NavigationFailure> | undefined) => boolean;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     items: {
-        type: import("vue").PropType<MenuItem[]>;
+        type: import("vue").PropType<import("./types").MenuItem[]>;
         required: boolean;
     };
-    theme: import("vue").PropType<MenuTheme>;
+    theme: import("vue").PropType<import("./types").MenuTheme>;
     popupTheme: {
-        type: import("vue").PropType<PopupMenuTheme>;
+        type: import("vue").PropType<import("./types").PopupMenuTheme>;
         default: string;
     };
     colorful: BooleanConstructor;
     popupColorful: {
-        type: import("vue").PropType<PopupColorful>;
+        type: import("vue").PropType<import("./types").PopupColorful>;
         default: string;
     };
     firstPopperClass: StringConstructor;
     tooltipDisabled: BooleanConstructor;
+    ellipsisProps: import("vue").PropType<import("./types").EllipsisProps>;
     mode: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "horizontal" | "vertical", unknown, "vertical", boolean>;
     defaultActive: import("element-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     defaultOpeneds: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => [], boolean>;
@@ -71,14 +72,10 @@ declare const _default: import("vue").DefineComponent<{
     ellipsis: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     popperEffect: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "light" | "dark", unknown, "dark", boolean>;
 }>> & {
-    onClose?: ((index: string, indexPath: string[]) => any) | undefined;
-    onOpen?: ((index: string, indexPath: string[]) => any) | undefined;
     onSelect?: ((index: string, indexPath: string[], item: MenuItemClicked, routerResult?: Promise<void | NavigationFailure> | undefined) => any) | undefined;
+    onOpen?: ((index: string, indexPath: string[]) => any) | undefined;
+    onClose?: ((index: string, indexPath: string[]) => any) | undefined;
 }, {
-    popupTheme: PopupMenuTheme;
-    colorful: boolean;
-    popupColorful: PopupColorful;
-    tooltipDisabled: boolean;
     mode: import("element-plus/es/utils").EpPropMergeType<StringConstructor, "horizontal" | "vertical", unknown>;
     defaultActive: string;
     defaultOpeneds: string[];
@@ -89,5 +86,9 @@ declare const _default: import("vue").DefineComponent<{
     collapseTransition: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     ellipsis: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     popperEffect: import("element-plus/es/utils").EpPropMergeType<StringConstructor, "light" | "dark", unknown>;
+    popupTheme: import("./types").PopupMenuTheme;
+    colorful: boolean;
+    popupColorful: import("./types").PopupColorful;
+    tooltipDisabled: boolean;
 }, {}>;
 export default _default;