hy-dispatch-ui-v3 0.2.59 → 0.2.61

package/lib/components/hyForm/cpns/locationSelect.vue.js

@@ -0,0 +1,362 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var vue = require('vue');
+var elementPlus = require('element-plus');
+var formItem = require('./formItem.vue.js');
+var useLocale = require('../../../hooks/useLocale.js');
+var is = require('../../../utils/is.js');
+var form = require('../../../utils/form.js');
+var index = require('../../../utils/map/index.js');
+var index$1 = require('../../hyInput/index.js');
+var index$2 = require('../../hyIcon/index.js');
+var index$3 = require('../../hyMap/index.js');
+
+const _sfc_main = {
+  __name: "locationSelect",
+  props: {
+    model: {
+      type: Object,
+      default: () => ({})
+    },
+    column: {
+      type: Object,
+      default: () => ({})
+    },
+    rules: {
+      type: Object,
+      default: () => ({})
+    },
+    columnNum: {
+      type: Number,
+      default: 1
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    size: {
+      type: String,
+      default: "default"
+    },
+    allMapSelect: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ["setMapSize"],
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const props = __props;
+    const emits = __emit;
+    const { t } = useLocale.useLocale();
+    const containerRef = vue.useTemplateRef("containerRef");
+    const addressValue = vue.computed({
+      get() {
+        const item = props.column.children.find((v) => v.type === "address");
+        if (item) {
+          const prop = is.isArray(item.field) ? item.field[0] : item.field;
+          return form.getValueByProp(props.model, prop);
+        }
+        return "";
+      },
+      set(val) {
+        const item = props.column.children.find((v) => v.type === "address");
+        if (item) {
+          const prop = is.isArray(item.field) ? item.field[0] : item.field;
+          form.setValueByProp(props.model, prop, val);
+        }
+      }
+    });
+    const lngValue = vue.computed({
+      get() {
+        const item = props.column.children.find((v) => v.type === "lng");
+        if (item) {
+          const prop = is.isArray(item.field) ? item.field[0] : item.field;
+          return form.getValueByProp(props.model, prop);
+        }
+        return "";
+      },
+      set(val) {
+        const item = props.column.children.find((v) => v.type === "lng");
+        if (item) {
+          const prop = is.isArray(item.field) ? item.field[0] : item.field;
+          form.setValueByProp(props.model, prop, val);
+        }
+      }
+    });
+    const latValue = vue.computed({
+      get() {
+        const item = props.column.children.find((v) => v.type === "lat");
+        if (item) {
+          const prop = is.isArray(item.field) ? item.field[0] : item.field;
+          return form.getValueByProp(props.model, prop);
+        }
+        return "";
+      },
+      set(val) {
+        const item = props.column.children.find((v) => v.type === "lat");
+        if (item) {
+          const prop = is.isArray(item.field) ? item.field[0] : item.field;
+          form.setValueByProp(props.model, prop, val);
+        }
+      }
+    });
+    const containerStyle = vue.computed(() => {
+      const columnNum = is.isNumber(props.column.columnNum) && props.column.columnNum > 0 ? props.column.columnNum : is.isNumber(props.columnNum) && props.columnNum > 0 ? props.columnNum || 1 : 1;
+      return {
+        gridTemplateColumns: `repeat(${columnNum}, minmax(0, 1fr))`
+      };
+    });
+    const children = vue.computed(
+      () => props.column.children.map((item) => {
+        if (item.type === "address") {
+          return {
+            rightSlot: "addressRight",
+            ...item,
+            type: "input",
+            slot: "address",
+            attrs: {
+              placeholder: "\u8F93\u5165\u5730\u5740\u53EF\u641C\u7D22",
+              ...item.attrs
+            }
+          };
+        }
+        return {
+          ...item,
+          type: "input",
+          attrs: {
+            // placeholder: item.type === 'lng' ? '经度' : '维度',
+            ...item.attrs
+          }
+        };
+      })
+    );
+    const mapConfig = JSON.parse(window.sessionStorage.getItem("mapConfig") || "{}");
+    let hyMap = null;
+    let map = null;
+    const poiServer = index.setPoiServer(mapConfig);
+    let marker = null;
+    function placeSearchFn(address) {
+      poiServer.placeSearch({
+        pageSize: 1,
+        // 单页显示结果条数
+        pageIndex: 1,
+        convertIngAndLat: false,
+        query: address
+      }).then(({ results }) => {
+        console.log(results);
+        if (results && results.length) {
+          const geographicalPosition = results[0];
+          throughCoordinatePosition(
+            geographicalPosition.lng,
+            geographicalPosition.lat
+          );
+        } else {
+          elementPlus.ElMessage.error("\u6CA1\u6709\u627E\u5230\u641C\u7D22\u5730\u7406\u4F4D\u7F6E");
+        }
+      }).catch((error) => {
+        console.log("\u672A\u627E\u5230\u5730\u5740", error);
+        elementPlus.ElMessage.error("\u6CA1\u6709\u627E\u5230\u641C\u7D22\u5730\u7406\u4F4D\u7F6E");
+      });
+    }
+    function throughCoordinatePosition(lng, lat) {
+      poiServer.geocoderFormat({
+        lat,
+        lng
+      }).then(({ results }) => {
+        geographicalPositionFn({
+          lng,
+          lat,
+          address: results.address,
+          name: results.address
+        });
+      }).catch(() => {
+        geographicalPositionFn({
+          lng,
+          lat,
+          address: `${Number(lat).toFixed(6)}\u3001${Number(lng).toFixed(6)}`,
+          name: `${Number(lat).toFixed(6)}\u3001${Number(lng).toFixed(6)}`
+        });
+      });
+    }
+    function geographicalPositionFn(obj) {
+      console.log("\u7ED3\u679C", obj);
+      addressValue.value = obj.address;
+      lngValue.value = obj.lng;
+      latValue.value = obj.lat;
+    }
+    function addressEnter() {
+      console.log("\u6848\u4EF6enter");
+      if (addressValue.value) {
+        placeSearchFn(addressValue.value);
+      }
+    }
+    function complete(initHyMap, initMap) {
+      hyMap = initHyMap;
+      map = initMap;
+      map.on("click", (res) => {
+        console.log(res);
+        const latlng = res.latlng;
+        setMarker(res.latlng);
+        throughCoordinatePosition(latlng.lng, latlng.lat);
+      });
+    }
+    function setMarker({ lat, lng }) {
+      if (marker) {
+        marker.setLatLng({ lat, lng });
+        map.setView({ lat, lng }, mapConfig.maxZoom || 18);
+      } else {
+        const divIcon = hyMap.DivIcon({
+          html: '<svg class="hy-icon !w-9 !h-14 mr-1 text-auxiliary" svgName="map-marker-trajectory-personnel"><use xlink:href="#hy-icon-map-marker-trajectory-personnel"></use></svg>',
+          iconSize: [36, 56],
+          iconAnchor: [20, 56]
+        });
+        marker = hyMap.Marker({
+          icon: divIcon,
+          zIndexOffset: 1,
+          position: {
+            lat,
+            lng
+          }
+        });
+        marker.addTo(map);
+        map.setView({ lat, lng }, mapConfig.maxZoom || 18);
+      }
+    }
+    function setMapSize() {
+      emits("setMapSize");
+      setTimeout(() => {
+        map.invalidateSize();
+      });
+    }
+    vue.onBeforeUnmount(() => {
+      if (marker) {
+        marker.remove();
+      }
+      map.removeMap();
+      map = null;
+      hyMap = null;
+    });
+    __expose({
+      setMarker
+    });
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createElementBlock("div", { class: "w-full h-full flex flex-col" }, [
+        vue.createElementVNode(
+          "div",
+          {
+            ref_key: "containerRef",
+            ref: containerRef,
+            class: "grid gap-x-6",
+            style: vue.normalizeStyle(containerStyle.value)
+          },
+          [
+            (vue.openBlock(true), vue.createElementBlock(
+              vue.Fragment,
+              null,
+              vue.renderList(children.value, (item, index) => {
+                return vue.openBlock(), vue.createBlock(formItem.default, {
+                  key: index,
+                  model: __props.model,
+                  column: item,
+                  rules: __props.rules,
+                  size: __props.size,
+                  loading: __props.loading,
+                  disabled: __props.disabled,
+                  readonly: __props.readonly
+                }, vue.createSlots({
+                  addressRight: vue.withCtx(() => [
+                    vue.createElementVNode("div", { class: "h-full flex items-center text-auxiliary" }, [
+                      vue.createElementVNode("span", { class: "text-xs" }, [
+                        vue.createVNode(vue.unref(index$2.HyIcon), {
+                          "svg-name": "dispatch-share-tips",
+                          class: "!w-3 !h-3 mr-1 text-auxiliary"
+                        }),
+                        vue.createElementVNode("span", null, "\u53EF\u901A\u8FC7\u5730\u56FE\u70B9\u9009\u4EE5\u83B7\u53D6\u7CBE\u786E\u5750\u6807")
+                      ])
+                    ])
+                  ]),
+                  address: vue.withCtx(({ column }) => [
+                    vue.createVNode(vue.unref(index$1.HyInput), vue.mergeProps({
+                      modelValue: addressValue.value,
+                      "onUpdate:modelValue": ($event) => addressValue.value = $event
+                    }, { ref_for: true }, column.attrs, {
+                      onKeyup: vue.withKeys(addressEnter, ["enter"])
+                    }), null, 16, ["modelValue", "onUpdate:modelValue"])
+                  ]),
+                  _: 2
+                  /* DYNAMIC */
+                }, [
+                  vue.renderList(_ctx.$slots, (_, slotName) => {
+                    return {
+                      name: slotName,
+                      fn: vue.withCtx((scope) => [
+                        vue.renderSlot(_ctx.$slots, slotName, vue.mergeProps({ ref_for: true }, scope))
+                      ])
+                    };
+                  })
+                ]), 1032, ["model", "column", "rules", "size", "loading", "disabled", "readonly"]);
+              }),
+              128
+              /* KEYED_FRAGMENT */
+            ))
+          ],
+          4
+          /* STYLE */
+        ),
+        vue.createElementVNode(
+          "div",
+          {
+            class: vue.normalizeClass([[__props.allMapSelect ? "h-0 flex-grow" : "h-[280px]"], "w-full border border-border rounded relative box-border"])
+          },
+          [
+            vue.createElementVNode("div", { class: "w-full h-full relative z-10" }, [
+              vue.createVNode(vue.unref(index$3.HyMap), {
+                mapType: vue.unref(mapConfig).mapType,
+                mapConfig: vue.unref(mapConfig),
+                onComplete: complete
+              }, null, 8, ["mapType", "mapConfig"])
+            ]),
+            vue.createElementVNode(
+              "div",
+              {
+                class: vue.normalizeClass(["z-20 cursor-pointer absolute rounded top-2 right-2 w-[110px] h-8 border bg-background/70 text-xs flex items-center justify-center gap-1", [
+                  __props.allMapSelect ? "border-theme text-theme" : "border-border/50 text-main"
+                ]]),
+                onClick: vue.withModifiers(setMapSize, ["stop"])
+              },
+              [
+                vue.createVNode(vue.unref(index$2.HyIcon), {
+                  svgName: __props.allMapSelect ? "ops-button-reduce" : "ops-button-amplify",
+                  class: vue.normalizeClass(["!w-3 !h-3 text-main", [__props.allMapSelect ? "text-theme" : "text-main"]])
+                }, null, 8, ["svgName", "class"]),
+                vue.createElementVNode(
+                  "span",
+                  null,
+                  vue.toDisplayString(__props.allMapSelect ? "\u9000\u51FA\u5730\u56FE\u653E\u5927" : "\u653E\u5927\u5730\u56FE\u70B9\u9009"),
+                  1
+                  /* TEXT */
+                )
+              ],
+              2
+              /* CLASS */
+            )
+          ],
+          2
+          /* CLASS */
+        )
+      ]);
+    };
+  }
+};
+
+exports.default = _sfc_main;

package/lib/components/hyForm/form.vue.js

@@ -7,6 +7,7 @@ var elementPlus = require('element-plus');
 var formItem = require('./cpns/formItem.vue.js');
 var extraItem = require('./cpns/extraItem.vue.js');
 var arrayItem = require('./cpns/arrayItem.vue.js');
+var locationSelect = require('./cpns/locationSelect.vue.js');
 var index = require('./js/index.js');
 var useAppForm = require('./js/useAppForm.js');
 var useLocale = require('../../hooks/useLocale.js');
@@ -53,7 +54,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       // 'large' | 'default' | 'small'
     }
   },
-  setup(__props, { expose: __expose }) {
+  emits: ["on-allMapSelect"],
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const emit = __emit;
     const props = __props;
     const { t } = useLocale.useLocale();
     const formTemplateRef = vue.useTemplateRef("formTemplateRef");
@@ -73,6 +76,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         gridTemplateColumns: `repeat(${columnNum}, minmax(0, 1fr))`
       };
     });
+    const locationSelectRef = vue.useTemplateRef("locationSelectRef");
+    const allMapSelect = vue.ref(false);
+    function setMapSize() {
+      allMapSelect.value = !allMapSelect.value;
+      emit("on-allMapSelect", allMapSelect.value);
+    }
     __expose({
       validate: async (callback) => {
         await vue.nextTick();
@@ -104,6 +113,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getField: async (fields) => {
         await vue.nextTick();
         return vue.unref(formTemplateRef).getField(fields);
+      },
+      setMarker: (latlng) => {
+        if (locationSelectRef.value) {
+          is.isArray(locationSelectRef.value) ? locationSelectRef.value.map((item) => item.setMarker(latlng)) : locationSelectRef.value.setMarker(latlng);
+        }
       }
       // setInitialValue: async (value) => {
       //   await nextTick()
@@ -125,7 +139,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           vue.createElementVNode(
             "div",
             {
-              class: "hy-form-container",
+              class: "hy-form-container h-full",
               style: vue.normalizeStyle(containerStyle.value)
             },
             [
@@ -142,29 +156,40 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                     [
                       vue.createCommentVNode(" \u6807\u9898 "),
                       column.type === "title" ? (vue.openBlock(), vue.createElementBlock(
-                        "div",
-                        {
-                          key: 0,
-                          class: vue.normalizeClass(["w-full flex items-center text-theme whitespace-nowrap relative mb-3 mt-1", [__props.size === "small" ? "text-xs" : "text-sm"]]),
-                          style: vue.normalizeStyle(vue.unref(index.columnItemStyle)(props, column))
-                        },
+                        vue.Fragment,
+                        { key: 0 },
                         [
-                          vue.createElementVNode(
-                            "span",
-                            { class: "mr-2" },
-                            vue.toDisplayString(column.label),
-                            1
-                            /* TEXT */
-                          ),
-                          vue.createVNode(vue.unref(elementPlus.ElDivider), {
-                            "content-position": "left",
-                            "border-style": "dashed",
-                            class: "border-[rgba(var(--hy-theme),0.5)] my-0"
-                          }),
-                          vue.createElementVNode("div", { class: "absolute top-1/2 -left-1.5 transform -translate-x-full -translate-y-1/2 w-0.5 h-3 bg-theme" })
+                          vue.unref(index.columnShowHandler)(props, column) ? (vue.openBlock(), vue.createElementBlock(
+                            "div",
+                            {
+                              key: 0,
+                              class: vue.normalizeClass(["w-full flex items-center text-theme whitespace-nowrap relative mb-3 mt-1", [
+                                __props.size === "small" ? "text-xs" : "text-sm",
+                                allMapSelect.value ? "hidden" : ""
+                              ]]),
+                              style: vue.normalizeStyle(vue.unref(index.columnItemStyle)(props, column))
+                            },
+                            [
+                              vue.createElementVNode(
+                                "span",
+                                { class: "mr-2" },
+                                vue.toDisplayString(column.label),
+                                1
+                                /* TEXT */
+                              ),
+                              vue.createVNode(vue.unref(elementPlus.ElDivider), {
+                                "content-position": "left",
+                                "border-style": "dashed",
+                                class: "border-[rgba(var(--hy-theme),0.5)] my-0"
+                              }),
+                              vue.createElementVNode("div", { class: "absolute top-1/2 -left-1.5 transform -translate-x-full -translate-y-1/2 w-0.5 h-3 bg-theme" })
+                            ],
+                            6
+                            /* CLASS, STYLE */
+                          )) : vue.createCommentVNode("v-if", true)
                         ],
-                        6
-                        /* CLASS, STYLE */
+                        64
+                        /* STABLE_FRAGMENT */
                       )) : column.type === "extra" && !_ctx.$slots[column.slot] ? (vue.openBlock(), vue.createElementBlock(
                         vue.Fragment,
                         { key: 1 },
@@ -172,6 +197,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                           vue.createCommentVNode(" \u8865\u5145\u4FE1\u606F\u8868\u5355 "),
                           vue.unref(index.columnShowHandler)(props, column) ? (vue.openBlock(), vue.createBlock(extraItem.default, {
                             key: 0,
+                            class: vue.normalizeClass([allMapSelect.value ? "hidden" : ""]),
                             model: __props.model,
                             column,
                             rules: __props.rules,
@@ -192,7 +218,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "style"])) : vue.createCommentVNode("v-if", true)
+                          ]), 1032, ["class", "model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "style"])) : vue.createCommentVNode("v-if", true)
                         ],
                         64
                         /* STABLE_FRAGMENT */
@@ -203,6 +229,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                           vue.createCommentVNode(" \u8868\u5355\u6570\u7EC4 "),
                           vue.unref(index.columnShowHandler)(props, column) ? (vue.openBlock(), vue.createBlock(arrayItem.default, {
                             key: 0,
+                            class: vue.normalizeClass([allMapSelect.value ? "hidden" : ""]),
                             model: __props.model,
                             column,
                             rules: __props.rules,
@@ -224,16 +251,41 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style"])) : vue.createCommentVNode("v-if", true)
+                          ]), 1032, ["class", "model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style"])) : vue.createCommentVNode("v-if", true)
                         ],
                         64
                         /* STABLE_FRAGMENT */
-                      )) : (vue.openBlock(), vue.createElementBlock(
+                      )) : column.type === "location-select" ? (vue.openBlock(), vue.createElementBlock(
                         vue.Fragment,
                         { key: 3 },
+                        [
+                          vue.unref(index.columnShowHandler)(props, column) ? (vue.openBlock(), vue.createBlock(locationSelect.default, {
+                            key: 0,
+                            ref_for: true,
+                            ref_key: "locationSelectRef",
+                            ref: locationSelectRef,
+                            model: __props.model,
+                            column,
+                            rules: __props.rules,
+                            columnNum: __props.columnNum,
+                            loading: __props.loading,
+                            disabled: __props.disabled,
+                            readonly: __props.readonly,
+                            size: __props.size,
+                            style: vue.normalizeStyle(vue.unref(index.columnItemStyle)(props, column)),
+                            allMapSelect: allMapSelect.value,
+                            onSetMapSize: setMapSize
+                          }, null, 8, ["model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style", "allMapSelect"])) : vue.createCommentVNode("v-if", true)
+                        ],
+                        64
+                        /* STABLE_FRAGMENT */
+                      )) : (vue.openBlock(), vue.createElementBlock(
+                        vue.Fragment,
+                        { key: 4 },
                         [
                           vue.createCommentVNode(" \u8868\u5355 "),
                           vue.createVNode(formItem.default, {
+                            class: vue.normalizeClass([allMapSelect.value ? "hidden" : ""]),
                             model: __props.model,
                             column,
                             rules: __props.rules,
@@ -252,7 +304,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["model", "column", "rules", "loading", "disabled", "readonly"])
+                          ]), 1032, ["class", "model", "column", "rules", "loading", "disabled", "readonly"])
                         ],
                         64
                         /* STABLE_FRAGMENT */

package/lib/components/hyForm/js/index.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var vue = require('vue');
-var handler = require('../../../utils/handler.js');
 var is = require('../../../utils/is.js');
+var handler = require('../../../utils/handler.js');
 var form = require('../../../utils/form.js');
 var useLocale = require('../../../hooks/useLocale.js');
 
@@ -17,6 +17,7 @@ function columnItemStyle(props, column) {
       case "title":
       case "extra":
       case "array":
+      case "location-select":
         style["grid-column"] = `span ${props.columnNum}`;
         break;
     }
@@ -29,6 +30,12 @@ function columnShowHandler(props, column) {
   if (is.isFunction(show)) return show(column, props.model);
   return true;
 }
+function columnVisibleHandler(props, column) {
+  const visible = vue.unref(column.visible);
+  if (is.isBoolean(visible)) return visible;
+  if (is.isFunction(visible)) return visible(column, props.model);
+  return true;
+}
 function columnHelpHandler(props, column) {
   const help = vue.unref(column.help);
   if (is.isString(help)) return help;
@@ -115,6 +122,7 @@ function optionsHandler(props, column) {
 exports.columnHelpHandler = columnHelpHandler;
 exports.columnItemStyle = columnItemStyle;
 exports.columnShowHandler = columnShowHandler;
+exports.columnVisibleHandler = columnVisibleHandler;
 exports.isDisabled = isDisabled;
 exports.isReadonly = isReadonly;
 exports.isRequired = isRequired;

package/lib/components/hyForm/js/useAppForm.js

@@ -4,40 +4,10 @@ var vue = require('vue');
 var handler = require('../../../utils/handler.js');
 var is = require('../../../utils/is.js');
 var form = require('../../../utils/form.js');
-var useLocale = require('../../../hooks/useLocale.js');
 
-const genDefaultLabel = (config) => {
-  if (config.label) return config.label;
-  const { t } = useLocale.useLocale();
-  switch (config.type) {
-    // 部门级联选择框
-    case "org-cascader":
-      return t("form.department");
-  }
-};
-const genPlaceholderHandler = (config) => {
-  const { t } = useLocale.useLocale();
-  const { type, label, attrs = {} } = config || {};
-  let placeholder = attrs.placeholder, startPlaceholder = attrs.startPlaceholder, endPlaceholder = attrs.endPlaceholder;
-  switch (type) {
-    case "input":
-    case "input-number":
-      placeholder = placeholder || t("hy.pleaseEnterPlaceholder", [label]);
-      break;
-    case "select":
-    case "date-picker":
-    case "time-picker":
-      placeholder = placeholder || t("hy.pleaseSelectPlaceholder", [label]);
-      break;
-    default:
-      placeholder = placeholder || label;
-  }
-  return { placeholder, startPlaceholder, endPlaceholder };
-};
 function appFormItemHandler(column = {}) {
-  const label = genDefaultLabel(column);
-  const { placeholder} = genPlaceholderHandler({ ...column, label });
-  const attrs = { ...column.attrs || {}, placeholder };
+  const label = form.genColumnDefaultLabel(column);
+  const attrs = { ...column.attrs || {} };
   column = handler.mergeDeep(
     { ...column },
     {
@@ -57,7 +27,7 @@ function appFormItemHandler(column = {}) {
         ...attrs
       }
     };
-  } else if (/^(radio|checkbox|select)$/.test(column.type)) {
+  } else if (/^(radio|radio-group|checkbox|select)$/.test(column.type)) {
     return {
       ...column,
       attrs: {
@@ -71,7 +41,7 @@ function appFormItemHandler(column = {}) {
         }
       }
     };
-  } else if (/^(extra)$/.test(column.type)) {
+  } else if (/^(extra)$/.test(column.type) || /^(location-select)$/.test(column.type)) {
     return {
       ...column,
       children: (column.children || []).map((item) => appFormItemHandler(item))
@@ -107,7 +77,7 @@ const resetAppFormValue = (columns = [], obj = {}) => {
         const childValue = resetAppFormValue(item.children);
         obj[item.prop] = [childValue];
       }
-    } else if (item.type === "extra") {
+    } else if (item.type === "extra" || item.type === "location-select") {
       resetAppFormValue(item.children, obj);
     } else if (Array.isArray(item.prop)) {
       for (let i = 0; i < item.prop.length; i++) {

package/lib/components/hyMap/map.vue.js

@@ -20,7 +20,7 @@ const _sfc_main = {
       type: Object,
       default: () => ({})
     },
-    // 地图类型 gaode leaflet bugMap
+    // 地图类型 gaode leafletjs bugMap
     mapType: {
       type: String,
       default: "gaode"
@@ -31,7 +31,7 @@ const _sfc_main = {
     const props = __props;
     const emits = __emit;
     const mapRef = vue.ref();
-    const { newMap } = useMixins.useMixins(
+    const { newMap, map, hyMap } = useMixins.useMixins(
       {
         props,
         emits,
@@ -43,7 +43,7 @@ const _sfc_main = {
       newMap(props.mapType);
     });
     return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createElementBlock("div", { class: "w-full h-full p-5 box-border border-border border relative" }, [
+      return vue.openBlock(), vue.createElementBlock("div", { class: "w-full h-full box-border border-border border relative" }, [
         vue.createElementVNode(
           "div",
           {