ele-admin-plus 1.1.9-beta.5 → 1.1.9-beta.6

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

@@ -4,193 +4,234 @@
 
 @include set-map-var($ele);
 
-.ele-map-picker > .el-dialog__body > div.ele-modal-body {
+.ele-modal .ele-map-picker .ele-modal-body {
   padding: 0;
 }
 
-/* 工具栏 */
-.ele-map-view-header {
+.ele-map-picker {
+  overflow: hidden;
+}
+
+/* 主体区域 */
+.ele-map-view {
   display: flex;
-  align-items: center;
-  box-sizing: border-box;
-  padding: eleVar('map', 'header-padding');
+}
 
-  .ele-map-view-search {
-    flex: 1;
-    padding-right: 14px;
-    box-sizing: border-box;
+/* 地图容器 */
+.ele-map-view-body {
+  flex: 1;
+  height: 100%;
+  box-sizing: border-box;
+  position: relative;
+  overflow: hidden;
+}
 
-    .el-autocomplete,
-    .el-input {
-      width: 100%;
-      max-width: 220px;
-    }
-  }
+/* 地图中心图标 */
+.ele-map-view-body-icon {
+  width: 26px;
+  position: absolute;
+  left: 50%;
+  bottom: 50%;
+  margin-left: -13px;
+}
 
-  .ele-map-view-btn-ok {
-    padding-left: 9px;
-    padding-right: 11px;
-  }
+.ele-map-view-icon-plus {
+  color: #1677ff;
+  font-size: 14px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
 }
 
-/* 地图 */
-.ele-map-view-body {
+/* 列表区域 */
+.ele-map-view-side {
+  width: 40%;
+  height: 100%;
+  flex-shrink: 0;
   display: flex;
-  border-bottom-left-radius: eleVar('modal', 'radius');
-  border-bottom-right-radius: eleVar('modal', 'radius');
-  overflow: hidden;
-
-  .ele-map-view-main {
-    flex: 1;
-    position: relative;
-    box-sizing: border-box;
-  }
+  flex-direction: column;
+  box-sizing: border-box;
+}
 
-  .ele-map-view-main-icon {
-    width: 26px;
-    position: absolute;
-    left: 50%;
-    bottom: 50%;
-    margin-left: -13px;
-  }
+/* 列表顶部搜索框 */
+.ele-map-view-search {
+  flex-shrink: 0;
+  padding: eleVar('map', 'header-padding');
+  box-sizing: border-box;
 
-  .ele-map-view-icon-plus {
-    color: #1677ff;
-    font-size: 14px;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
+  .el-autocomplete,
+  .el-input {
+    width: 100%;
   }
+}
 
-  /* 右侧 */
-  .ele-map-view-side {
-    width: 300px;
-    flex-shrink: 0;
-    border-top: 1px solid elVar('border-color', 'light');
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-  }
+/* 列表底部提示信息 */
+.ele-map-view-extra {
+  flex-shrink: 0;
+  padding: 6px 12px;
+  box-sizing: border-box;
 
-  /* 提示信息 */
-  .ele-map-view-extra {
-    flex-shrink: 0;
-    padding: 6px 12px;
-    box-sizing: border-box;
+  /* 确定按钮 */
+  .ele-map-view-btn-ok {
+    width: 100%;
+    display: block;
   }
+}
 
-  .ele-map-view-message {
-    padding: 4px 8px;
-    box-sizing: border-box;
-    color: elVar('color-error');
-    font-size: elVar('font-size', 'small');
-    background: elVar('color-error', 'light-9');
-    border: 1px solid elVar('color-error', 'light-8');
-    border-radius: elVar('border-radius', 'base');
-    text-align: center;
-  }
+.ele-map-view-message {
+  padding: 4px 8px;
+  box-sizing: border-box;
+  color: elVar('color-error');
+  font-size: elVar('font-size', 'small');
+  background: elVar('color-error', 'light-9');
+  border: 1px solid elVar('color-error', 'light-8');
+  border-radius: elVar('border-radius', 'base');
+  text-align: center;
+}
 
-  /* 空图标 */
-  .ele-map-view-empty {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-  }
+/* 列表空图标 */
+.ele-map-view-empty {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
 
-  /* poi列表 */
-  .ele-map-view-list {
-    flex: 1;
-    box-sizing: border-box;
-    overflow: auto;
-    overflow: overlay;
-  }
+/* poi列表 */
+.ele-map-view-list {
+  flex: 1;
+  box-sizing: border-box;
+  overflow: auto;
+}
 
-  .ele-map-view-item {
-    padding: 8px 26px 8px 38px;
-    border-bottom: 1px solid elVar('border-color', 'light');
-    transition: background-color $ele-transition;
-    box-sizing: border-box;
-    position: relative;
-    cursor: pointer;
+.ele-map-view-item {
+  display: flex;
+  align-items: center;
+  padding: 8px 14px;
+  transition: background-color $ele-transition;
+  box-sizing: border-box;
+  position: relative;
+  cursor: pointer;
 
-    &:hover {
-      background: elVar('fill-color', 'light');
-    }
+  &:hover {
+    background: elVar('fill-color', 'light');
   }
 
-  .ele-map-view-item-icon {
-    font-size: 20px;
-    color: elVar('text-color', 'secondary');
+  & + .ele-map-view-item::before {
+    content: '';
+    border-top: 1px solid elVar('border-color', 'light');
     position: absolute;
-    top: 50%;
+    top: 0;
     left: 12px;
-    transform: translateY(-50%);
+    right: 12px;
   }
+}
 
-  .ele-map-view-item-title {
-    font-size: elVar('font-size', 'base');
-  }
+.ele-map-view-item-body {
+  flex: 1;
+  padding: 0 0 0 6px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
 
-  .ele-map-view-item-text {
-    color: elVar('text-color', 'secondary');
-    font-size: elVar('font-size', 'extra-small');
-    margin-top: 2px;
-  }
+.ele-map-view-item-title {
+  font-size: elVar('font-size', 'base');
+  word-break: break-all;
+}
 
-  .ele-map-view-item-radio {
-    position: absolute;
-    top: 50%;
-    right: 10px;
-    transform: translateY(-50%);
-    color: elVar('color-primary');
-    font-size: 14px;
-    display: none;
-  }
+.ele-map-view-item-text {
+  color: elVar('text-color', 'secondary');
+  font-size: elVar('font-size', 'extra-small');
+  word-break: break-all;
+  margin-top: 2px;
+}
 
-  .ele-map-view-item.is-active .ele-map-view-item-radio {
-    display: block;
-  }
+.ele-map-view-item-icon {
+  flex-shrink: 0;
+  font-size: 18px;
+  color: elVar('text-color', 'secondary');
+}
 
-  /* 地图图标跳动动画 */
-  .ele-map-view-anim-bounce {
-    animation: mapAnimBounce 500ms;
-    animation-direction: alternate;
-  }
+.ele-map-view-item-radio {
+  font-size: 14px;
+  color: elVar('color-primary');
+  margin: 0 -4px 0 0;
+  visibility: hidden;
 }
 
-@keyframes mapAnimBounce {
-  0%,
-  60%,
-  75%,
-  90%,
-  to {
-    transition-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
-  }
+.ele-map-view-item.is-active .ele-map-view-item-radio {
+  visibility: visible;
+}
 
-  0%,
-  to {
-    transform: translate3d(0, 0, 0);
+/* 地图底部提示信息 */
+.ele-map-view-body {
+  & > .ele-map-view-search {
+    position: absolute;
+    top: 8px;
+    left: 8px;
+    padding: 8px;
+    width: 228px;
+    max-width: calc(100% - 16px);
+    background: elVar('bg-color');
+    box-shadow: elVar('box-shadow', 'lighter');
+    border-radius: elVar('border-radius', 'base');
   }
 
-  25% {
-    transform: translate3d(0, -10px, 0);
+  & > .ele-map-view-message,
+  & > .ele-map-view-btn-ok {
+    position: absolute;
+    bottom: 20px;
+    left: 0;
+    right: 0;
+    margin: 0 auto;
+    width: max-content;
+    max-width: calc(100% - 32px);
+    box-shadow: elVar('box-shadow', 'light');
   }
 
-  50% {
-    transform: translate3d(0, -20px, 0);
+  & > .ele-map-view-btn-ok {
+    width: 120px;
+    border-radius: 32px;
   }
+}
 
-  75% {
-    transform: translate3d(0, -10px, 0);
-  }
+/* 搜索建议列表 */
+.ele-map-suggest-popper.el-popper .el-autocomplete-suggestion__list > li {
+  height: auto;
+}
+
+.ele-map-suggest-item {
+  line-height: normal;
+  box-sizing: border-box;
+  padding: 6px 0;
+}
+
+.ele-map-suggest-title {
+  word-break: break-all;
 }
 
 .ele-map-suggest-text {
   color: elVar('text-color', 'secondary');
   font-size: elVar('font-size', 'small');
-  margin-left: 6px;
+  word-break: break-all;
+  margin-top: 2px;
+}
+
+/* 地图图标跳动动画 */
+.ele-map-view-anim-bounce {
+  animation: mapAnimBounce 0.6s;
+}
+
+@keyframes mapAnimBounce {
+  from,
+  to {
+    transform: translateY(0);
+  }
+
+  50% {
+    transform: translateY(-20px);
+  }
 }
 
 /* 小屏幕适应 */
@@ -198,10 +239,11 @@
   .ele-map-picker.is-responsive {
     top: 0 !important;
     left: 0 !important;
+    margin: 0 !important;
     width: 100% !important;
     max-width: 100% !important;
     height: 100% !important;
-    margin: 0 !important;
+    border-radius: 0 !important;
     display: flex !important;
     flex-direction: column !important;
 
@@ -220,33 +262,20 @@
     }
 
     .ele-map-view {
-      display: flex;
+      height: 100% !important;
       flex-direction: column;
-      height: 100%;
-
-      .ele-map-view-header {
-        flex-shrink: 0;
-      }
-
-      .ele-map-view-body {
-        flex: 1;
-        flex-direction: column;
-        overflow: hidden;
-        height: auto;
+    }
 
-        .ele-map-view-main {
-          flex: none;
+    .ele-map-view-body {
+      height: auto;
+    }
 
-          & > div {
-            height: 240px !important;
-          }
-        }
+    .ele-map-view-side {
+      width: 100%;
+      height: 68%;
 
-        .ele-map-view-side {
-          flex: 1;
-          width: auto;
-          overflow: hidden;
-        }
+      & > .ele-map-view-search {
+        padding-top: 6px;
       }
     }
   }

package/es/ele-map-picker/types.d.ts

@@ -43,13 +43,11 @@ export interface PoiLocation {
  */
 export interface PoiItem {
   /** 地点名称 */
-  name: string;
+  name?: string;
   /** 详细地址 */
-  address: string;
+  address?: string;
   /** 经纬度坐标 */
   location: PoiLocation;
-  /** 是否选中 */
-  selected?: boolean;
   /** 数据唯一标识 */
   id?: string;
   /** 输入建议唯一标识 */
@@ -62,6 +60,11 @@ export interface PoiItem {
   value?: string;
 }
 
+/**
+ * 位置选择模式
+ */
+export type SelectMode = 'lnglat' | 'poi' | 'keyword';
+
 /**
  * 实例
  */
@@ -90,4 +93,5 @@ export interface MapLocale {
   placeholder: string;
   message: string;
   ok: string;
+  clickMessage: string;
 }

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

@@ -87,9 +87,9 @@ declare const _default: import("vue").DefineComponent<{
     showTimeout: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
     hideTimeout: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
 }>> & {
+    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;
-    onSelect?: ((index: string, indexPath: string[], item: MenuItemClicked, routerResult?: Promise<void | NavigationFailure> | undefined) => any) | undefined;
     onItemClick?: ((_item: import("./types").MenuItem, _e: MouseEvent) => any) | undefined;
     onItemMouseenter?: ((_item: import("./types").MenuItem, _e: MouseEvent) => any) | undefined;
     onItemMouseleave?: ((_item: import("./types").MenuItem, _e: MouseEvent) => any) | undefined;

package/es/ele-modal/index.js

@@ -199,7 +199,7 @@ const _sfc_main = defineComponent({
       emit("close");
     };
     const onClosed = () => {
-      if (dialogEnable.value) {
+      if (props.destroyOnClose && dialogEnable.value) {
         dialogEnable.value = false;
       }
       emit("closed");

package/es/ele-pro-table/index.d.ts

@@ -400,8 +400,8 @@ declare const _default: import("vue").DefineComponent<{
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: import("vue").PropType<import("../ele-data-table/types").DataKey[]>;
 }>> & {
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
     onCellMouseEnter?: ((_row: DataItem, _column: import("./types").Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;

package/es/ele-table-select/index.d.ts

@@ -160,10 +160,10 @@ declare const _default: import("vue").DefineComponent<{
     onBlur?: ((_e: FocusEvent) => any) | undefined;
     onChange?: ((_value: SelectValue) => any) | undefined;
     "onUpdate:modelValue"?: ((_value: SelectValue) => any) | undefined;
-    onVisibleChange?: ((_visible: boolean) => any) | undefined;
-    onRemoveTag?: ((_value: SingleValue) => any) | undefined;
     onClear?: (() => any) | undefined;
     onSelect?: ((_item: DataItem | DataItem[]) => any) | undefined;
+    onVisibleChange?: ((_visible: boolean) => any) | undefined;
+    onRemoveTag?: ((_value: SingleValue) => any) | undefined;
     onFilterChange?: ((_value: string) => any) | undefined;
 }, {
     placement: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined;
@@ -173,12 +173,12 @@ declare const _default: import("vue").DefineComponent<{
     clearable: boolean;
     persistent: boolean;
     transition: string;
+    valueKey: string;
     filterable: boolean;
     tagType: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined;
     multiple: boolean;
     responsive: boolean;
     automaticDropdown: boolean;
-    valueKey: string;
     labelKey: string;
 }, {}>;
 export default _default;

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

@@ -106,10 +106,10 @@ declare const _default: import("vue").DefineComponent<{
     popperStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }>> & {
     "onUpdate:visible"?: ((visible: boolean) => any) | undefined;
+    onHide?: ((e: Event) => any) | undefined;
     onOpen?: ((e: any) => any) | undefined;
     onClose?: ((e: any) => any) | undefined;
     onShow?: ((e: Event) => any) | undefined;
-    onHide?: ((e: Event) => any) | undefined;
     "onBefore-show"?: ((e: Event) => any) | undefined;
     "onBefore-hide"?: ((e: Event) => any) | undefined;
 }, {

package/es/ele-tree-select/index.d.ts

@@ -134,9 +134,9 @@ declare const _default: import("vue").DefineComponent<{
     onBlur?: ((_e: FocusEvent) => any) | undefined;
     onChange?: ((_value: SelectValue) => any) | undefined;
     "onUpdate:modelValue"?: ((_value: SelectValue) => any) | undefined;
+    onClear?: (() => any) | undefined;
     onVisibleChange?: ((_visible: boolean) => any) | undefined;
     onRemoveTag?: ((_value: SingleValue) => any) | undefined;
-    onClear?: (() => any) | undefined;
 }, {
     placement: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined;
     disabled: boolean;

package/es/ele-virtual-table/index.d.ts

@@ -345,8 +345,8 @@ declare const _default: import("vue").DefineComponent<{
     };
     flexible: BooleanConstructor;
 }>> & {
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
     onCellMouseEnter?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;

package/es/lang/en_US.js

@@ -26,7 +26,8 @@ const localeValues = {
     title: "Address",
     placeholder: "Enter keyword",
     message: "Please select an address",
-    ok: "OK"
+    ok: "OK",
+    clickMessage: "Please click on the map"
   },
   table: {
     refresh: "Refresh",

package/es/lang/zh_CN.js

@@ -26,7 +26,8 @@ const localeValues = {
     title: "选择位置",
     placeholder: "输入关键字搜索",
     message: "请点击列表选中位置",
-    ok: "确定"
+    ok: "确定",
+    clickMessage: "请点击地图选中位置"
   },
   table: {
     refresh: "刷新",

package/es/lang/zh_TW.js

@@ -26,7 +26,8 @@ const localeValues = {
     title: "選擇位置",
     placeholder: "輸入關鍵字蒐索",
     message: "請點擊清單選中位置",
-    ok: "確認"
+    ok: "確認",
+    clickMessage: "請點擊地圖選中位置"
   },
   table: {
     refresh: "重繪",

package/es/style/themes/default.scss

@@ -318,7 +318,7 @@ $ele: map.deep-merge(
     ),
     'map': (
       // 地图位置选择
-      'header-padding': 8px 14px
+      'header-padding': 6px 12px
     ),
     'menu': (
       // 菜单

package/es/style/themes/rounded.scss

@@ -62,7 +62,7 @@ $ele-rounded: map.deep-merge(
       'menu-active-line': 0
     ),
     'map': (
-      'header-padding': 4px 14px 12px 14px
+      'header-padding': 0 12px 6px 12px
     ),
     'menu': (
       'arrow-margin': 0 -8px 0 6px,

package/lib/ele-app/el.d.ts

@@ -31,6 +31,7 @@ import type {
   TableProps,
   TableV2Props,
   ImageProps,
+  ElAutocomplete,
   ElCascader,
   ElPopper,
   ElPopover,
@@ -136,6 +137,8 @@ export type ElImageProps = ComponentProps<ImageProps>;
 /**
  * 组件实例
  */
+export type ElAutocompleteInstance = InstanceType<typeof ElAutocomplete> | null;
+
 export type ElCascaderInstance = InstanceType<typeof ElCascader> | null;
 
 export type ElPopperInstance = InstanceType<typeof ElPopper> | null;

package/lib/ele-basic-select/index.d.ts

@@ -95,8 +95,8 @@ declare const _default: import("vue").DefineComponent<{
     onFocus?: ((_e: FocusEvent) => any) | undefined;
     onBlur?: ((_e: FocusEvent) => any) | undefined;
     "onUpdate:visible"?: ((_visible: boolean) => any) | undefined;
-    onRemoveTag?: ((_item: SelectedItem) => any) | undefined;
     onClear?: (() => any) | undefined;
+    onRemoveTag?: ((_item: SelectedItem) => any) | undefined;
     onFilterChange?: ((_value: string) => any) | undefined;
 }, {
     disabled: boolean;

package/lib/ele-data-table/index.d.ts

@@ -289,8 +289,8 @@ declare const _default: import("vue").DefineComponent<{
     };
     flexible: BooleanConstructor;
 }>> & {
-    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
+    onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
     onCellMouseEnter?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;

package/lib/ele-icon-select/index.d.ts

@@ -148,8 +148,8 @@ declare const _default: import("vue").DefineComponent<{
     onBlur?: ((_e: FocusEvent) => any) | undefined;
     onChange?: ((_value?: string | null | undefined) => any) | undefined;
     "onUpdate:modelValue"?: ((_value?: string | null | undefined) => any) | undefined;
-    onVisibleChange?: ((_visible: boolean) => any) | undefined;
     onClear?: (() => any) | undefined;
+    onVisibleChange?: ((_visible: boolean) => any) | undefined;
 }, {
     placement: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined;
     disabled: boolean;