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

package/lib/ele-map-picker/components/map-view.d.ts

@@ -37,9 +37,8 @@ declare const _default: import("vue").DefineComponent<{
     message: StringConstructor;
     suggestionCity: {
         type: StringConstructor;
-        default: string;
-    };
-    keywordMode: BooleanConstructor;
+        default: string; /** 地图节点 */
+    }; /** 地图节点 */
     searchPlaceholder: StringConstructor;
     markerSrc: {
         type: StringConstructor;
@@ -47,27 +46,36 @@ declare const _default: import("vue").DefineComponent<{
     };
     mapKey: StringConstructor;
     mapVersion: {
-        type: StringConstructor; /** 确定按钮请求状态 */
+        type: StringConstructor;
         default: string;
     };
     mapStyle: StringConstructor;
     darkMode: BooleanConstructor;
-    okText: StringConstructor; /** 输入建议数据 */
-    emptyProps: import("vue").PropType<import("../../ele-app/el").ElEmptyProps>;
+    okText: StringConstructor;
+    emptyProps: import("vue").PropType<import("../../ele-app/el").ElEmptyProps>; /** 输入建议关键字 */
     headerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    mode: {
+        type: import("vue").PropType<import("../types").SelectMode>;
+        default: string;
+    };
+    filterable: {
+        type: BooleanConstructor;
+        default: boolean; /** 是否是关键字搜索模式 */
+    };
+    clickMessage: StringConstructor;
 }, {
+    SearchOutlined: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
     mapRef: import("vue").Ref<HTMLDivElement | null>;
     loading: import("vue").Ref<boolean>;
     poiLoading: import("vue").Ref<boolean>;
     confirmLoading: import("vue").Ref<boolean>;
     data: import("vue").Ref<{
-        name: string;
-        address: string;
+        name?: string | undefined;
+        address?: string | undefined;
         location: {
             lat: number;
             lng: number;
         };
-        selected?: boolean | undefined;
         id?: string | undefined;
         key?: string | undefined;
         district?: string | undefined;
@@ -75,13 +83,12 @@ declare const _default: import("vue").DefineComponent<{
         value?: string | undefined;
     }[]>;
     suggestionData: import("vue").Ref<{
-        name: string;
-        address: string;
+        name?: string | undefined;
+        address?: string | undefined;
         location: {
             lat: number;
             lng: number;
         };
-        selected?: boolean | undefined;
         id?: string | undefined;
         key?: string | undefined;
         district?: string | undefined;
@@ -91,28 +98,30 @@ declare const _default: import("vue").DefineComponent<{
     centerIconClass: import("vue").Ref<string[]>;
     keywords: import("vue").Ref<string>;
     selected: import("vue").Ref<{
-        name: string;
-        address: string;
+        name?: string | undefined;
+        address?: string | undefined;
         location: {
             lat: number;
             lng: number;
         };
-        selected?: boolean | undefined;
         id?: string | undefined;
         key?: string | undefined;
         district?: string | undefined;
         label?: string | undefined;
         value?: string | undefined;
     } | null>;
-    disabled: import("vue").ComputedRef<boolean>;
+    confirmDisabled: import("vue").ComputedRef<boolean>;
+    keywordMode: import("vue").ComputedRef<boolean>;
+    poiMode: import("vue").ComputedRef<boolean>;
     onSearch: (value: string, callback?: any) => void;
     onSearchSelect: (item: any) => void;
     onItemClick: (item: PoiItem) => void;
     onConfirm: () => void;
     getMapIns: () => any;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    done: (_result: CenterPoint) => true;
     mapDone: (_ins: any) => true;
+    select: (_selected: PoiItem | null) => true;
+    done: (_result: CenterPoint) => true;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     height: {
         type: StringConstructor;
@@ -151,9 +160,8 @@ declare const _default: import("vue").DefineComponent<{
     message: StringConstructor;
     suggestionCity: {
         type: StringConstructor;
-        default: string;
-    };
-    keywordMode: BooleanConstructor;
+        default: string; /** 地图节点 */
+    }; /** 地图节点 */
     searchPlaceholder: StringConstructor;
     markerSrc: {
         type: StringConstructor;
@@ -161,20 +169,32 @@ declare const _default: import("vue").DefineComponent<{
     };
     mapKey: StringConstructor;
     mapVersion: {
-        type: StringConstructor; /** 确定按钮请求状态 */
+        type: StringConstructor;
         default: string;
     };
     mapStyle: StringConstructor;
     darkMode: BooleanConstructor;
-    okText: StringConstructor; /** 输入建议数据 */
-    emptyProps: import("vue").PropType<import("../../ele-app/el").ElEmptyProps>;
+    okText: StringConstructor;
+    emptyProps: import("vue").PropType<import("../../ele-app/el").ElEmptyProps>; /** 输入建议关键字 */
     headerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    mode: {
+        type: import("vue").PropType<import("../types").SelectMode>;
+        default: string;
+    };
+    filterable: {
+        type: BooleanConstructor;
+        default: boolean; /** 是否是关键字搜索模式 */
+    };
+    clickMessage: StringConstructor;
 }>> & {
+    onSelect?: ((_selected: PoiItem | null) => any) | undefined;
     onDone?: ((_result: CenterPoint) => any) | undefined;
     onMapDone?: ((_ins: any) => any) | undefined;
 }, {
     required: boolean;
+    mode: import("../types").SelectMode;
     height: string;
+    filterable: boolean;
     zoom: number;
     selectedZoom: number;
     poiLimit: number;
@@ -183,7 +203,6 @@ declare const _default: import("vue").DefineComponent<{
     poiRadius: number;
     returnRegions: boolean;
     suggestionCity: string;
-    keywordMode: boolean;
     markerSrc: string;
     mapVersion: string;
     darkMode: boolean;

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

@@ -21,21 +21,21 @@ const _sfc_main = vue.defineComponent({
     const updateModelValue = (value) => {
       emit("update:modelValue", value);
     };
-    const onDone = (result) => {
-      emit("done", result);
-    };
     const onMapDone = (ins) => {
       emit("mapDone", ins);
     };
+    const onDone = (result) => {
+      emit("done", result);
+    };
     return {
-      mapRef,
       lang,
       isResponsive,
+      mapRef,
       aMapKey,
       mapProps,
       updateModelValue,
-      onDone,
-      onMapDone
+      onMapDone,
+      onDone
     };
   }
 });
@@ -50,7 +50,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_MapView = vue.resolveComponent("MapView");
   const _component_EleModal = vue.resolveComponent("EleModal");
   return vue.openBlock(), vue.createBlock(_component_EleModal, vue.mergeProps({
-    width: "780px",
+    width: "740px",
     title: _ctx.lang.title
   }, _ctx.modalProps, {
     modelValue: _ctx.modelValue,
@@ -61,43 +61,25 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       vue.createVNode(_component_MapView, vue.mergeProps(_ctx.mapProps, {
         ref: "mapRef",
         message: _ctx.lang.message,
+        clickMessage: _ctx.lang.clickMessage,
         searchPlaceholder: _ctx.lang.placeholder,
         okText: _ctx.lang.ok,
         mapKey: _ctx.aMapKey,
-        onDone: _ctx.onDone,
-        onMapDone: _ctx.onMapDone
-      }), null, 16, ["message", "searchPlaceholder", "okText", "mapKey", "onDone", "onMapDone"])
+        mode: _ctx.keywordMode ? "keyword" : _ctx.mode,
+        onMapDone: _ctx.onMapDone,
+        onDone: _ctx.onDone
+      }), null, 16, ["message", "clickMessage", "searchPlaceholder", "okText", "mapKey", "mode", "onMapDone", "onDone"])
     ]),
     _: 2
   }, [
-    _ctx.$slots.header ? {
-      name: "header",
-      fn: vue.withCtx((slotProps) => [
-        vue.renderSlot(_ctx.$slots, "header", vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-      ]),
-      key: "0"
-    } : void 0,
-    _ctx.$slots.footer ? {
-      name: "footer",
-      fn: vue.withCtx((slotProps) => [
-        vue.renderSlot(_ctx.$slots, "footer", vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-      ]),
-      key: "1"
-    } : void 0,
-    _ctx.$slots.maxIcon ? {
-      name: "maxIcon",
-      fn: vue.withCtx((slotProps) => [
-        vue.renderSlot(_ctx.$slots, "maxIcon", vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-      ]),
-      key: "2"
-    } : void 0,
-    _ctx.$slots.closeIcon ? {
-      name: "closeIcon",
-      fn: vue.withCtx((slotProps) => [
-        vue.renderSlot(_ctx.$slots, "closeIcon", vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-      ]),
-      key: "3"
-    } : void 0
+    vue.renderList(Object.keys(_ctx.$slots).filter((k) => "default" !== k), (name) => {
+      return {
+        name,
+        fn: vue.withCtx((slotProps) => [
+          vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+        ])
+      };
+    })
   ]), 1040, ["title", "modelValue", "class", "onUpdate:modelValue"]);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

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

@@ -11,6 +11,7 @@ declare const _default: import("vue").DefineComponent<{
         default: null;
     };
     locale: import("vue").PropType<Partial<MapLocale>>;
+    keywordMode: BooleanConstructor;
     height: {
         type: StringConstructor;
         default: string;
@@ -42,7 +43,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     returnRegions: BooleanConstructor;
     required: {
-        type: BooleanConstructor;
+        type: BooleanConstructor; /** 地图组件 */
         default: boolean;
     };
     message: StringConstructor;
@@ -50,8 +51,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    keywordMode: BooleanConstructor; /** 地图属性 */
-    searchPlaceholder: StringConstructor;
+    searchPlaceholder: StringConstructor; /** 地图属性 */
     markerSrc: {
         type: StringConstructor;
         default: string;
@@ -59,22 +59,31 @@ declare const _default: import("vue").DefineComponent<{
     mapKey: StringConstructor;
     mapVersion: {
         type: StringConstructor;
-        default: string;
-    };
+        default: string; /** 地图渲染完成事件 */
+    }; /** 地图渲染完成事件 */
     mapStyle: StringConstructor;
     darkMode: BooleanConstructor;
     okText: StringConstructor;
     emptyProps: import("vue").PropType<import("../ele-app/el").ElEmptyProps>;
     headerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    mode: {
+        type: import("vue").PropType<import("./types").SelectMode>;
+        default: string;
+    };
+    filterable: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    clickMessage: StringConstructor;
 }, {
-    mapRef: Ref<MapViewInstance>;
     lang: import("vue").ComputedRef<MapLocale>;
     isResponsive: import("vue").ComputedRef<boolean>;
+    mapRef: Ref<MapViewInstance>;
     aMapKey: import("vue").ComputedRef<string | undefined>;
     mapProps: import("vue").ComputedRef<Partial<MapProps>>;
     updateModelValue: (value: boolean) => void;
-    onDone: (result: CenterPoint) => void;
     onMapDone: (ins: any) => void;
+    onDone: (result: CenterPoint) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     done: (_result: CenterPoint) => boolean;
     mapDone: (_ins: any) => boolean;
@@ -89,6 +98,7 @@ declare const _default: import("vue").DefineComponent<{
         default: null;
     };
     locale: import("vue").PropType<Partial<MapLocale>>;
+    keywordMode: BooleanConstructor;
     height: {
         type: StringConstructor;
         default: string;
@@ -120,7 +130,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     returnRegions: BooleanConstructor;
     required: {
-        type: BooleanConstructor;
+        type: BooleanConstructor; /** 地图组件 */
         default: boolean;
     };
     message: StringConstructor;
@@ -128,8 +138,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    keywordMode: BooleanConstructor; /** 地图属性 */
-    searchPlaceholder: StringConstructor;
+    searchPlaceholder: StringConstructor; /** 地图属性 */
     markerSrc: {
         type: StringConstructor;
         default: string;
@@ -137,13 +146,22 @@ declare const _default: import("vue").DefineComponent<{
     mapKey: StringConstructor;
     mapVersion: {
         type: StringConstructor;
-        default: string;
-    };
+        default: string; /** 地图渲染完成事件 */
+    }; /** 地图渲染完成事件 */
     mapStyle: StringConstructor;
     darkMode: BooleanConstructor;
     okText: StringConstructor;
     emptyProps: import("vue").PropType<import("../ele-app/el").ElEmptyProps>;
     headerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    mode: {
+        type: import("vue").PropType<import("./types").SelectMode>;
+        default: string;
+    };
+    filterable: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    clickMessage: StringConstructor;
 }>> & {
     "onUpdate:modelValue"?: ((_value: boolean) => any) | undefined;
     onOpen?: (() => any) | undefined;
@@ -153,9 +171,12 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     required: boolean;
     modelValue: boolean;
+    mode: import("./types").SelectMode;
     height: string;
+    filterable: boolean;
     zoom: number;
     responsive: boolean;
+    keywordMode: boolean;
     selectedZoom: number;
     poiLimit: number;
     poiType: string;
@@ -163,7 +184,6 @@ declare const _default: import("vue").DefineComponent<{
     poiRadius: number;
     returnRegions: boolean;
     suggestionCity: string;
-    keywordMode: boolean;
     markerSrc: string;
     mapVersion: string;
     darkMode: boolean;

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

@@ -4,7 +4,7 @@ const mapProps = {
   /** 地图的高度 */
   height: {
     type: String,
-    default: "450px"
+    default: "460px"
   },
   /** 地图默认中心点 */
   center: Array,
@@ -52,8 +52,6 @@ const mapProps = {
     type: String,
     default: "全国"
   },
-  /** 是否使用关键字检索模式, 默认POI检索模式 */
-  keywordMode: Boolean,
   /** 搜索框提示文本 */
   searchPlaceholder: String,
   /** 地图中心图标地址 */
@@ -77,7 +75,19 @@ const mapProps = {
   /** 空组件属性 */
   emptyProps: Object,
   /** 自定义header样式 */
-  headerStyle: Object
+  headerStyle: Object,
+  /** 位置选择模式 */
+  mode: {
+    type: String,
+    default: "poi"
+  },
+  /** 非关键字模式是否显示搜索框 */
+  filterable: {
+    type: Boolean,
+    default: true
+  },
+  /** 强制选择点击地图提示文本 */
+  clickMessage: String
 };
 const mapPickerProps = {
   ...mapProps,
@@ -91,7 +101,9 @@ const mapPickerProps = {
     default: null
   },
   /** 国际化 */
-  locale: Object
+  locale: Object,
+  /** 是否使用关键字检索模式, 默认POI检索模式 */
+  keywordMode: Boolean
 };
 const mapPickerEmits = {
   /** 选择完成事件 */

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

@@ -1,7 +1,7 @@
 import type { PropType, ExtractPropTypes } from 'vue';
 import type { ElEmptyProps } from '../ele-app/el';
 import type { EleModalProps } from '../ele-app/plus';
-import type { MapLocale, CenterPoint } from './types';
+import type { MapLocale, CenterPoint, SelectMode } from './types';
 /**
  * 属性
  */
@@ -57,8 +57,6 @@ export declare const mapProps: {
         type: StringConstructor;
         default: string;
     };
-    /** 是否使用关键字检索模式, 默认POI检索模式 */
-    keywordMode: BooleanConstructor;
     /** 搜索框提示文本 */
     searchPlaceholder: StringConstructor;
     /** 地图中心图标地址 */
@@ -83,6 +81,18 @@ export declare const mapProps: {
     emptyProps: PropType<ElEmptyProps>;
     /** 自定义header样式 */
     headerStyle: PropType<Partial<import("vue").CSSProperties>>;
+    /** 位置选择模式 */
+    mode: {
+        type: PropType<SelectMode>;
+        default: string;
+    };
+    /** 非关键字模式是否显示搜索框 */
+    filterable: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    /** 强制选择点击地图提示文本 */
+    clickMessage: StringConstructor;
 };
 export declare const mapPickerProps: {
     /** 弹窗是否显示 */
@@ -96,6 +106,8 @@ export declare const mapPickerProps: {
     };
     /** 国际化 */
     locale: PropType<Partial<MapLocale>>;
+    /** 是否使用关键字检索模式, 默认POI检索模式 */
+    keywordMode: BooleanConstructor;
     /** 地图的高度 */
     height: {
         type: StringConstructor;
@@ -147,8 +159,6 @@ export declare const mapPickerProps: {
         type: StringConstructor;
         default: string;
     };
-    /** 是否使用关键字检索模式, 默认POI检索模式 */
-    keywordMode: BooleanConstructor;
     /** 搜索框提示文本 */
     searchPlaceholder: StringConstructor;
     /** 地图中心图标地址 */
@@ -173,6 +183,18 @@ export declare const mapPickerProps: {
     emptyProps: PropType<ElEmptyProps>;
     /** 自定义header样式 */
     headerStyle: PropType<Partial<import("vue").CSSProperties>>;
+    /** 位置选择模式 */
+    mode: {
+        type: PropType<SelectMode>;
+        default: string;
+    };
+    /** 非关键字模式是否显示搜索框 */
+    filterable: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    /** 强制选择点击地图提示文本 */
+    clickMessage: StringConstructor;
 };
 export type MapPickerProps = ExtractPropTypes<typeof mapPickerProps>;
 export type MapProps = ExtractPropTypes<typeof mapProps>;