@vunk/form 1.1.29 → 1.1.31

package/components/esri-input-geojson/index.css

@@ -1,35 +1,37 @@
 
-.vkf-esri-input-geojson__map{
+.vkf-esri-input-geojson__map {
   height: 350px;
 }
 
-.vkf-esri-input-geojson-dialog .el-dialog.is-fullscreen{
+.vkf-esri-input-geojson-dialog .el-dialog.is-fullscreen {
   height: 100%;
 }
-.vkf-esri-input-geojson-dialog .el-dialog{
+
+.vkf-esri-input-geojson-dialog .el-dialog {
   display: flex;
   flex-direction: column;
   min-height: 50%;
 }
-.vkf-esri-input-geojson-dialog .el-dialog__body{
+
+.vkf-esri-input-geojson-dialog .el-dialog__body {
   display: flex;
   flex-direction: column;
   flex: 1;
   overflow: hidden;
   padding: 0;
 }
-.vkf-esri-input-geojson-dialog__map{
+
+.vkf-esri-input-geojson-dialog__map {
   flex: 1;
   display: flex;
   flex-direction: column;
   overflow: hidden;
 }
 
-.vkf-esri-input-geojson-dialog__map > .va-map-view{
+.vkf-esri-input-geojson-dialog__map>.va-map-view {
   flex: 1;
 }
 
-
 .el-button.vkf-esri-input-geojson__upload{
   border-color: transparent;
   background-color: transparent;

package/components/esri-input-geojson/index.js

@@ -1,4 +1,4 @@
-import { openBlock, createElementBlock, createElementVNode, defineComponent, resolveComponent, createBlock, withCtx, createVNode, createCommentVNode, provide, renderSlot, shallowRef, computed, ref, watch, onMounted, nextTick, mergeProps, toHandlers, withDirectives, vShow } from 'vue';
+import { openBlock, createElementBlock, createElementVNode, defineComponent, resolveComponent, createBlock, withCtx, createVNode, createCommentVNode, provide, renderSlot, ref, shallowRef, computed, watch, onMounted, nextTick, mergeProps, toHandlers, withDirectives, vShow } from 'vue';
 import { _VkfInputCtx, VkfInput } from '@vunk/form/components/input';
 import { bindPropsFactory, onEmitsFactory } from '@vunk/core/shared/utils-vue';
 import { ElButton, ElIcon, ElButtonGroup, ElUpload, ElMessage } from 'element-plus';
@@ -128,7 +128,9 @@ const props = __spreadProps(__spreadValues({}, _VkfInputCtx.props), {
 bindPropsFactory(props);
 const emits = __spreadProps(__spreadValues({}, _VkfInputCtx.emits), {
   "update:modelValue": (e) => e,
-  "update:flying": null
+  "update:flying": null,
+  "appendFly": null,
+  appendEdit: null
 });
 onEmitsFactory(emits);
 
@@ -335,8 +337,8 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
       }, 8, ["on-change", "disabled", "onClick"])) : createCommentVNode("v-if", true),
       _ctx.dialog ? (openBlock(), createBlock(_component_ElButton, {
         key: 1,
-        onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("edit")),
-        disabled: _ctx.disabled
+        disabled: _ctx.disabled,
+        onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("edit"))
       }, {
         default: withCtx(() => [
           createVNode(_component_ElIcon, { color: "var(--el-color-primary)" }, {
@@ -374,7 +376,8 @@ const _sfc_main$1 = defineComponent({
   },
   props: {
     view: {
-      type: Object
+      type: Object,
+      default: void 0
     }
   },
   setup(props) {
@@ -1341,14 +1344,15 @@ var _sfc_main = defineComponent({
     DocumentChecked: document_checked_default,
     VaGraphicsLayer
   },
-  emits,
   props,
+  emits,
   setup(props2, {
     emit
   }) {
     const inputBindProps = _VkfInputCtx.createBindProps(props2, ["inputSlots", "readonly", "modelValue"]);
     const inputOnEmits = _VkfInputCtx.createOnEmits(emit, ["update:modelValue"]);
     const readonly = useComputedReadonly(props2);
+    const sketchIf = ref(!props2.view);
     const sketchRef = shallowRef();
     const shetchPanel = computed(() => {
       var _a;
@@ -1356,15 +1360,18 @@ var _sfc_main = defineComponent({
       return container == null ? void 0 : container.querySelector(".esri-sketch__panel");
     });
     const viewDef = new Deferred();
+    const layerRef = shallowRef();
     const sketchLoad = async (e) => {
       await e.sketch.when();
       sketchRef.value = e.sketch;
       viewDef.resolve(sketchRef.value.view);
     };
     const layerLoad = async ({
-      view
+      view,
+      layer
     }) => {
       viewDef.resolve(view);
+      layerRef.value = layer;
     };
     const availableCreatureTools = computed(() => {
       if (Array.isArray(props2.editTypes)) {
@@ -1400,6 +1407,9 @@ var _sfc_main = defineComponent({
       mapTo.value = normalMapRef.value;
     });
     const dialogShow = ref(false);
+    const setDialogShow = (v) => {
+      dialogShow.value = v;
+    };
     const dialogOnOpen = async () => {
       mapTo.value = dialogMapRef.value;
     };
@@ -1413,14 +1423,23 @@ var _sfc_main = defineComponent({
         type: "success"
       });
       dialogShow.value = false;
+      if (props2.view) {
+        sketchIf.value = false;
+      }
     };
     const append = () => createVNode(AppendVue, {
-      "dialog": props2.dialogEdit,
+      "dialog": !readonly.value && props2.dialogEdit,
       "upload": !readonly.value,
       "disabled": props2.disabled,
       "onUpload": onUpload,
       "onEdit": onEdit,
-      "onFly": fly
+      "onFly": () => {
+        if (!props2.showMap && !props2.view) {
+          dialogShow.value = true;
+        }
+        emit("appendFly");
+        fly();
+      }
     }, null);
     async function onUpload(e) {
       if (!e.raw)
@@ -1432,7 +1451,12 @@ var _sfc_main = defineComponent({
       }).then(fly);
     }
     function onEdit() {
-      dialogShow.value = true;
+      if (!props2.view) {
+        dialogShow.value = true;
+      } else {
+        sketchIf.value = true;
+      }
+      emit("appendEdit");
     }
     function u() {
       sketchValueUpdating.value = true;
@@ -1489,6 +1513,7 @@ var _sfc_main = defineComponent({
       sketchLoad,
       shetchPanel,
       dialogShow,
+      setDialogShow,
       normalMapRef,
       dialogMapRef,
       dialogOnOpen,
@@ -1496,15 +1521,18 @@ var _sfc_main = defineComponent({
       mapTo,
       doSave,
       readonly,
-      layerLoad
+      layerLoad,
+      sketchIf,
+      fly,
+      layerRef
     };
   }
 });
 
 const _hoisted_1 = { class: "vkf-form-item" };
 const _hoisted_2 = {
-  class: "vkf-esri-input-geojson__map",
-  ref: "normalMapRef"
+  ref: "normalMapRef",
+  class: "vkf-esri-input-geojson__map"
 };
 const _hoisted_3 = {
   ref: "dialogMapRef",
@@ -1513,67 +1541,79 @@ const _hoisted_3 = {
 
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_VkfInput = resolveComponent("VkfInput");
-  const _component_VaGraphicsLayer = resolveComponent("VaGraphicsLayer");
   const _component_DocumentChecked = resolveComponent("DocumentChecked");
   const _component_ElIcon = resolveComponent("ElIcon");
   const _component_VkAsyncTeleport = resolveComponent("VkAsyncTeleport");
   const _component_VaSketch = resolveComponent("VaSketch");
+  const _component_VaGraphicsLayer = resolveComponent("VaGraphicsLayer");
   const _component_ViewerVue = resolveComponent("ViewerVue");
   const _component_ElDialog = resolveComponent("ElDialog");
 
   return (openBlock(), createElementBlock("div", _hoisted_1, [
-    createVNode(_component_VkfInput, mergeProps({
-      readonly: true,
-      modelValue: JSON.stringify(_ctx.modelValue)
-    }, _ctx.inputBindProps, toHandlers(_ctx.inputOnEmits), {
-      inputSlots: {
+    renderSlot(_ctx.$slots, "custom", {
+      modelValue: _ctx.modelValue,
+      fly: _ctx.fly,
+      setDialogShow: _ctx.setDialogShow,
+      layer: _ctx.layerRef,
+      showMap: _ctx.showMap
+    }, () => [
+      createVNode(_component_VkfInput, mergeProps({
+        readonly: true,
+        "model-value": JSON.stringify(_ctx.modelValue)
+      }, _ctx.inputBindProps, {
+        "input-slots": {
         append: _ctx.append
       }
-    }), null, 16 /* FULL_PROPS */, ["modelValue", "inputSlots"]),
+      }, toHandlers(_ctx.inputOnEmits)), null, 16 /* FULL_PROPS */, ["model-value", "input-slots"])
+    ]),
     createVNode(_component_VkAsyncTeleport, { to: _ctx.mapTo }, {
       default: withCtx(() => [
         createVNode(_component_ViewerVue, { view: _ctx.view }, {
           default: withCtx(() => [
-            (_ctx.readonly)
-              ? (openBlock(), createBlock(_component_VaGraphicsLayer, {
-                  key: 0,
-                  graphics: _ctx.sketchValue,
-                  onLoad: _ctx.layerLoad
-                }, null, 8 /* PROPS */, ["graphics", "onLoad"]))
-              : (openBlock(), createBlock(_component_VaSketch, {
-                  key: 1,
-                  viewModelActiveFillSymbol: _ctx.viewModelActiveFillSymbol,
-                  viewModelActiveLineSymbol: _ctx.viewModelActiveLineSymbol,
-                  viewModelActivePointSymbol: _ctx.viewModelActivePointSymbol,
-                  multiple: _ctx.multiple,
-                  availableCreatureTools: _ctx.availableCreatureTools,
-                  modelValue: _ctx.sketchValue,
-                  "onUpdate:modelValue": _ctx.handleUpdateSketchValue,
-                  onLoad: _ctx.sketchLoad
-                }, {
-                  default: withCtx(() => [
-                    (!_ctx.skipSave && _ctx.shetchPanel)
-                      ? (openBlock(), createBlock(_component_VkAsyncTeleport, {
-                          key: 0,
-                          to: _ctx.shetchPanel
-                        }, {
-                          default: withCtx(() => [
-                            createVNode(_component_ElIcon, {
-                              class: "esri-sketch-ui-save esri-widget--button",
-                              onClick: _ctx.doSave
+            createVNode(_component_VaGraphicsLayer, {
+              graphics: _ctx.sketchValue,
+              onLoad: _ctx.layerLoad
+            }, {
+              default: withCtx(() => [
+                (!(_ctx.readonly || !_ctx.sketchIf))
+                  ? (openBlock(), createBlock(_component_VaSketch, {
+                      key: 0,
+                      "view-model-active-fill-symbol": _ctx.viewModelActiveFillSymbol,
+                      "view-model-active-line-symbol": _ctx.viewModelActiveLineSymbol,
+                      "view-model-active-point-symbol": _ctx.viewModelActivePointSymbol,
+                      multiple: _ctx.multiple,
+                      "available-creature-tools": _ctx.availableCreatureTools,
+                      "model-value": _ctx.sketchValue,
+                      "onUpdate:modelValue": _ctx.handleUpdateSketchValue,
+                      onLoad: _ctx.sketchLoad
+                    }, {
+                      default: withCtx(() => [
+                        (!_ctx.skipSave && _ctx.shetchPanel)
+                          ? (openBlock(), createBlock(_component_VkAsyncTeleport, {
+                              key: 0,
+                              to: _ctx.shetchPanel
                             }, {
                               default: withCtx(() => [
-                                createVNode(_component_DocumentChecked)
+                                createVNode(_component_ElIcon, {
+                                  class: "esri-sketch-ui-save esri-widget--button",
+                                  onClick: _ctx.doSave
+                                }, {
+                                  default: withCtx(() => [
+                                    createVNode(_component_DocumentChecked)
+                                  ]),
+                                  _: 1 /* STABLE */
+                                }, 8 /* PROPS */, ["onClick"])
                               ]),
                               _: 1 /* STABLE */
-                            }, 8 /* PROPS */, ["onClick"])
-                          ]),
-                          _: 1 /* STABLE */
-                        }, 8 /* PROPS */, ["to"]))
-                      : createCommentVNode("v-if", true)
-                  ]),
-                  _: 1 /* STABLE */
-                }, 8 /* PROPS */, ["viewModelActiveFillSymbol", "viewModelActiveLineSymbol", "viewModelActivePointSymbol", "multiple", "availableCreatureTools", "modelValue", "onUpdate:modelValue", "onLoad"]))
+                            }, 8 /* PROPS */, ["to"]))
+                          : createCommentVNode("v-if", true)
+                      ]),
+                      _: 1 /* STABLE */
+                    }, 8 /* PROPS */, ["view-model-active-fill-symbol", "view-model-active-line-symbol", "view-model-active-point-symbol", "multiple", "available-creature-tools", "model-value", "onUpdate:modelValue", "onLoad"]))
+                  : createCommentVNode("v-if", true)
+              ]),
+              _: 1 /* STABLE */
+            }, 8 /* PROPS */, ["graphics", "onLoad"])
           ]),
           _: 1 /* STABLE */
         }, 8 /* PROPS */, ["view"])
@@ -1588,12 +1628,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => ((_ctx.dialogShow) = $event)),
       title: _ctx.dialogEditTitle,
       fullscreen: _ctx.dialogEditFullscreen,
-      modalClass: "vkf-esri-input-geojson-dialog",
-      appendToBody: true,
+      "modal-class": "vkf-esri-input-geojson-dialog",
+      "append-to-body": true,
+      "close-on-click-modal": false,
+      draggable: true,
       onOpen: _ctx.dialogOnOpen,
-      onClose: _ctx.dialogOnClose,
-      closeOnClickModal: false,
-      draggable: true
+      onClose: _ctx.dialogOnClose
     }, {
       default: withCtx(() => [
         createElementVNode("div", _hoisted_3, null, 512 /* NEED_PATCH */)

package/components/esri-input-geojson/src/ctx.d.ts

@@ -193,6 +193,11 @@ export declare const createBindProps: <T2 extends import("@vunk/core").NormalObj
 export declare const emits: {
     'update:modelValue': (e: FeatureCollection) => FeatureCollection<Geometry, import("geojson").GeoJsonProperties>;
     'update:flying': null;
+    /**
+     * 点击地图定位按钮
+     */
+    appendFly: null;
+    appendEdit: null;
     input: (value: string) => boolean;
     change: (value: string) => boolean;
     focus: (evt: FocusEvent) => boolean;
@@ -205,9 +210,11 @@ export declare const emits: {
     compositionupdate: (evt: CompositionEvent) => boolean;
     compositionend: (evt: CompositionEvent) => boolean;
 };
-export declare const createOnEmits: <T2 extends import("@vunk/core").AnyFunc, EX extends ("update:modelValue" | "input" | "change" | "focus" | "blur" | "clear" | "mouseleave" | "mouseenter" | "keydown" | "compositionstart" | "compositionupdate" | "compositionend" | "update:flying")[] | undefined>(emit: T2, excludes?: EX | undefined) => { [P in EX extends (infer KE)[] ? Exclude<"update:modelValue", KE> | Exclude<"input", KE> | Exclude<"change", KE> | Exclude<"focus", KE> | Exclude<"blur", KE> | Exclude<"clear", KE> | Exclude<"mouseleave", KE> | Exclude<"mouseenter", KE> | Exclude<"keydown", KE> | Exclude<"compositionstart", KE> | Exclude<"compositionupdate", KE> | Exclude<"compositionend", KE> | Exclude<"update:flying", KE> : "update:modelValue" | "input" | "change" | "focus" | "blur" | "clear" | "mouseleave" | "mouseenter" | "keydown" | "compositionstart" | "compositionupdate" | "compositionend" | "update:flying"]: {
+export declare const createOnEmits: <T2 extends import("@vunk/core").AnyFunc, EX extends ("update:modelValue" | "input" | "change" | "focus" | "blur" | "clear" | "mouseleave" | "mouseenter" | "keydown" | "compositionstart" | "compositionupdate" | "compositionend" | "update:flying" | "appendFly" | "appendEdit")[] | undefined>(emit: T2, excludes?: EX | undefined) => { [P in EX extends (infer KE)[] ? Exclude<"update:modelValue", KE> | Exclude<"input", KE> | Exclude<"change", KE> | Exclude<"focus", KE> | Exclude<"blur", KE> | Exclude<"clear", KE> | Exclude<"mouseleave", KE> | Exclude<"mouseenter", KE> | Exclude<"keydown", KE> | Exclude<"compositionstart", KE> | Exclude<"compositionupdate", KE> | Exclude<"compositionend", KE> | Exclude<"update:flying", KE> | Exclude<"appendFly", KE> | Exclude<"appendEdit", KE> : "update:modelValue" | "input" | "change" | "focus" | "blur" | "clear" | "mouseleave" | "mouseenter" | "keydown" | "compositionstart" | "compositionupdate" | "compositionend" | "update:flying" | "appendFly" | "appendEdit"]: {
     'update:modelValue': (...e: import("@vunk/core").RestParameters<T2>) => void;
     'update:flying': (...e: import("@vunk/core").RestParameters<T2>) => void;
+    appendFly: (...e: import("@vunk/core").RestParameters<T2>) => void;
+    appendEdit: (...e: import("@vunk/core").RestParameters<T2>) => void;
     input: (...e: import("@vunk/core").RestParameters<T2>) => void;
     change: (...e: import("@vunk/core").RestParameters<T2>) => void;
     focus: (...e: import("@vunk/core").RestParameters<T2>) => void;

package/components/esri-input-geojson/src/ctx.js

@@ -113,7 +113,9 @@ const props = __spreadProps(__spreadValues({}, _VkfInputCtx.props), {
 const createBindProps = bindPropsFactory(props);
 const emits = __spreadProps(__spreadValues({}, _VkfInputCtx.emits), {
   "update:modelValue": (e) => e,
-  "update:flying": null
+  "update:flying": null,
+  "appendFly": null,
+  appendEdit: null
 });
 const createOnEmits = onEmitsFactory(emits);
 

package/components/esri-input-geojson/src/index.vue.d.ts

@@ -250,6 +250,7 @@ declare const _default: import("vue").DefineComponent<{
     sketchLoad: __VaSketch.OnLoad;
     shetchPanel: import("vue").ComputedRef<Element | null>;
     dialogShow: Ref<boolean>;
+    setDialogShow: (v: boolean) => void;
     normalMapRef: Ref<HTMLDivElement>;
     dialogMapRef: Ref<HTMLDivElement>;
     dialogOnOpen: () => Promise<void>;
@@ -258,9 +259,14 @@ declare const _default: import("vue").DefineComponent<{
     doSave: () => void;
     readonly: import("vue").ComputedRef<boolean>;
     layerLoad: __VaGraphicsLayer.OnLoad;
+    sketchIf: Ref<boolean>;
+    fly: () => Promise<void>;
+    layerRef: Ref<__esri.GraphicsLayer>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     'update:modelValue': (e: import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>) => import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
     'update:flying': null;
+    appendFly: null;
+    appendEdit: null;
     input: (value: string) => boolean;
     change: (value: string) => boolean;
     focus: (evt: FocusEvent) => boolean;
@@ -473,6 +479,8 @@ declare const _default: import("vue").DefineComponent<{
     onCompositionupdate?: ((evt: CompositionEvent) => any) | undefined;
     onCompositionend?: ((evt: CompositionEvent) => any) | undefined;
     "onUpdate:flying"?: ((...args: any[]) => any) | undefined;
+    onAppendFly?: ((...args: any[]) => any) | undefined;
+    onAppendEdit?: ((...args: any[]) => any) | undefined;
 }, {
     required: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     type: string;

package/components/esri-input-geojson/src/types.d.ts

@@ -1,8 +1,10 @@
 import { __VaSketch } from '@vuesri/core';
-import { Media, VueComponentPropsType } from '@vunk/core';
+import { AnyFunc, Media, VueComponentPropsType } from '@vunk/core';
 import { EDIT_TYPE } from './const';
 import type { VkfEsriInputGeojson } from '@vunk/form/components/esri-input-geojson';
 import { BasicSource } from '@vunk/form/shared';
+import type { FeatureCollection } from 'geojson';
+import GraphicsLayer from '@arcgis/core/layers/GraphicsLayer';
 export interface EditTypeMedia extends Media {
     value: EDIT_TYPE;
     availableCreatureTools: __VaSketch.AvailableCreatureTool[];
@@ -11,3 +13,10 @@ export interface Source<P extends string = string> extends VueComponentPropsType
     prop?: P;
     templateType: 'VkfEsriInputGeojson';
 }
+export interface CustomSlotProps {
+    setDialogShow: (show: boolean) => void;
+    fly: AnyFunc;
+    modelValue: FeatureCollection<any, any>;
+    layer: GraphicsLayer;
+    showMap: boolean;
+}

package/components/esri-input-geojson/src/viewer.vue.d.ts

@@ -3,10 +3,14 @@ import MapView from '@arcgis/core/views/MapView';
 declare const _default: import("vue").DefineComponent<{
     view: {
         type: PropType<MapView>;
+        default: undefined;
     };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     view: {
         type: PropType<MapView>;
+        default: undefined;
     };
-}>>, {}>;
+}>>, {
+    view: MapView;
+}>;
 export default _default;

package/index.css

@@ -49,37 +49,39 @@
 }
 
 
-.vkf-esri-input-geojson__map{
+.vkf-esri-input-geojson__map {
   height: 350px;
 }
 
-.vkf-esri-input-geojson-dialog .el-dialog.is-fullscreen{
+.vkf-esri-input-geojson-dialog .el-dialog.is-fullscreen {
   height: 100%;
 }
-.vkf-esri-input-geojson-dialog .el-dialog{
+
+.vkf-esri-input-geojson-dialog .el-dialog {
   display: flex;
   flex-direction: column;
   min-height: 50%;
 }
-.vkf-esri-input-geojson-dialog .el-dialog__body{
+
+.vkf-esri-input-geojson-dialog .el-dialog__body {
   display: flex;
   flex-direction: column;
   flex: 1;
   overflow: hidden;
   padding: 0;
 }
-.vkf-esri-input-geojson-dialog__map{
+
+.vkf-esri-input-geojson-dialog__map {
   flex: 1;
   display: flex;
   flex-direction: column;
   overflow: hidden;
 }
 
-.vkf-esri-input-geojson-dialog__map > .va-map-view{
+.vkf-esri-input-geojson-dialog__map>.va-map-view {
   flex: 1;
 }
 
-
 .el-button.vkf-esri-input-geojson__upload{
   border-color: transparent;
   background-color: transparent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vunk/form",
-  "version": "1.1.29",
+  "version": "1.1.31",
   "description": "",
   "main": "index.esm.js",
   "scripts": {