@vunk/form 1.1.28 → 1.1.30

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;
@@ -1381,7 +1385,6 @@ var _sfc_main = defineComponent({
       if (sketchValueUpdating.value)
         return;
       uSketchValue();
-      console.log("watch", v, ov);
       if (!(ov == null ? void 0 : ov.features.length)) {
         fly();
       }
@@ -1414,14 +1417,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)
@@ -1433,7 +1445,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;
@@ -1471,7 +1488,6 @@ var _sfc_main = defineComponent({
     });
     async function fly() {
       const view = await viewDef.promise;
-      console.log("fly", view);
       if (!view)
         return;
       emit("update:flying", true);
@@ -1498,15 +1514,16 @@ var _sfc_main = defineComponent({
       mapTo,
       doSave,
       readonly,
-      layerLoad
+      layerLoad,
+      sketchIf
     };
   }
 });
 
 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",
@@ -1526,17 +1543,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return (openBlock(), createElementBlock("div", _hoisted_1, [
     createVNode(_component_VkfInput, mergeProps({
       readonly: true,
-      modelValue: JSON.stringify(_ctx.modelValue)
-    }, _ctx.inputBindProps, toHandlers(_ctx.inputOnEmits), {
-      inputSlots: {
+      "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)
+            (_ctx.readonly || !_ctx.sketchIf)
               ? (openBlock(), createBlock(_component_VaGraphicsLayer, {
                   key: 0,
                   graphics: _ctx.sketchValue,
@@ -1544,12 +1561,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 }, null, 8 /* PROPS */, ["graphics", "onLoad"]))
               : (openBlock(), createBlock(_component_VaSketch, {
                   key: 1,
-                  viewModelActiveFillSymbol: _ctx.viewModelActiveFillSymbol,
-                  viewModelActiveLineSymbol: _ctx.viewModelActiveLineSymbol,
-                  viewModelActivePointSymbol: _ctx.viewModelActivePointSymbol,
+                  "view-model-active-fill-symbol": _ctx.viewModelActiveFillSymbol,
+                  "view-model-active-line-symbol": _ctx.viewModelActiveLineSymbol,
+                  "view-model-active-point-symbol": _ctx.viewModelActivePointSymbol,
                   multiple: _ctx.multiple,
-                  availableCreatureTools: _ctx.availableCreatureTools,
-                  modelValue: _ctx.sketchValue,
+                  "available-creature-tools": _ctx.availableCreatureTools,
+                  "model-value": _ctx.sketchValue,
                   "onUpdate:modelValue": _ctx.handleUpdateSketchValue,
                   onLoad: _ctx.sketchLoad
                 }, {
@@ -1575,7 +1592,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                       : createCommentVNode("v-if", true)
                   ]),
                   _: 1 /* STABLE */
-                }, 8 /* PROPS */, ["viewModelActiveFillSymbol", "viewModelActiveLineSymbol", "viewModelActivePointSymbol", "multiple", "availableCreatureTools", "modelValue", "onUpdate:modelValue", "onLoad"]))
+                }, 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"]))
           ]),
           _: 1 /* STABLE */
         }, 8 /* PROPS */, ["view"])
@@ -1590,12 +1607,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

@@ -258,9 +258,12 @@ declare const _default: import("vue").DefineComponent<{
     doSave: () => void;
     readonly: import("vue").ComputedRef<boolean>;
     layerLoad: __VaGraphicsLayer.OnLoad;
+    sketchIf: Ref<boolean>;
 }, 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 +476,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/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/package.json

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