sctj-components 1.1.33 → 1.1.36

package/lib/sctj-components.es.js

@@ -10198,8 +10198,8 @@ const _sfc_main$5 = {
   }
 };
 const SCTJTrackPlayback = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-87a3abe5"]]);
-const index_vue_vue_type_style_index_0_scoped_23d9c379_lang = "";
-const _withScopeId$3 = (n) => (pushScopeId("data-v-23d9c379"), n = n(), popScopeId(), n);
+const index_vue_vue_type_style_index_0_scoped_e5322b91_lang = "";
+const _withScopeId$3 = (n) => (pushScopeId("data-v-e5322b91"), n = n(), popScopeId(), n);
 const _hoisted_1$3 = {
   key: 0,
   class: "btn-container"
@@ -10517,7 +10517,9 @@ const _sfc_main$4 = {
     const mapContainer = ref$1(null);
     watch(() => props.center, () => {
       var _a;
-      props.center && ((_a = map.value) == null ? void 0 : _a.setCenter(parsePosition(props.center)));
+      if (props.center && map.value && !allOverlays.value.length) {
+        (_a = map.value) == null ? void 0 : _a.setCenter(parsePosition(props.center));
+      }
     });
     const markerDefaultConfig = reactive({
       icon: "https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png",
@@ -10671,6 +10673,7 @@ const _sfc_main$4 = {
             updatePolygonData(instance);
           if (type === "bezierCurve")
             updateBezierCurveData(instance);
+          props.immediateComplete && handleConfirm();
         });
       }
       instance.on("rightclick", () => {
@@ -10685,6 +10688,13 @@ const _sfc_main$4 = {
         });
       }
     };
+    const allOverlays = computed$1(() => [
+      ...localMarkers.value.map((item) => item.obj).filter((item) => item),
+      ...localPolylines.value.map((item) => item.obj).filter((item) => item),
+      ...localPolygons.value.map((item) => item.obj).filter((item) => item),
+      ...localBezierCurves.value.map((item) => item.obj).filter((item) => item),
+      ...localCircles.value.map((item) => item.obj).filter((item) => item)
+    ]);
     const renderInitialData = () => {
       if (!map.value)
         return;
@@ -10769,15 +10779,8 @@ const _sfc_main$4 = {
         setInstanceEvent("circle", circleObj);
         localCircles.value.push({ obj: circleObj, center, radius, type: "circle" });
       });
-      const allOverlays = [
-        ...localMarkers.value.map((item) => item.obj),
-        ...localPolylines.value.map((item) => item.obj),
-        ...localPolygons.value.map((item) => item.obj),
-        ...localBezierCurves.value.map((item) => item.obj),
-        ...localCircles.value.map((item) => item.obj)
-      ];
-      if (allOverlays.length > 0) {
-        map.value.setFitView(allOverlays);
+      if (allOverlays.value.length > 0) {
+        map.value.setFitView(allOverlays.value);
       }
     };
     const drawTypClick = (type) => {
@@ -10993,13 +10996,18 @@ const _sfc_main$4 = {
         } else if (target instanceof AMap.Polyline) {
           deletePolyline(target);
         } else if (target instanceof AMap.Polygon) {
+          console.log("target", target);
           deletePolygon(target);
         } else if (target instanceof AMap.BezierCurve) {
           deleteBezierCurve(target);
         } else if (target instanceof AMap.Circle) {
           deleteCircle(target);
         } else {
-          closeEditor();
+          if (props.immediateComplete && currentEditingObj.value) {
+            handleConfirm();
+          } else {
+            closeEditor();
+          }
           if (drawingType.value) {
             startDrawing(drawingType.value);
           }
@@ -11013,7 +11021,8 @@ const _sfc_main$4 = {
         return;
       }
       if (currentEditingObj.value) {
-        closeEditor();
+        !props.immediateComplete && closeEditor();
+        props.immediateComplete && handleConfirm();
       }
       if (target instanceof AMap.Polyline) {
         enablePolylineEditor(target);
@@ -11109,21 +11118,21 @@ const _sfc_main$4 = {
         return;
       if (polyEditor.value && currentEditingObj.value instanceof AMap.Polyline) {
         updatePolylineData();
-        !props.immediateComplete && polyEditor.value.close();
+        polyEditor.value.close();
       }
       if (polygonEditor.value && currentEditingObj.value instanceof AMap.Polygon) {
         updatePolygonData();
-        !props.immediateComplete && polygonEditor.value.close();
+        polygonEditor.value.close();
       }
       if (bezierCurveEditor.value && currentEditingObj.value instanceof AMap.BezierCurve) {
         updateBezierCurveData();
-        !props.immediateComplete && bezierCurveEditor.value.close();
+        bezierCurveEditor.value.close();
       }
       if (circleEditor.value && currentEditingObj.value instanceof AMap.Circle) {
         updateCircleData();
-        !props.immediateComplete && circleEditor.value.close();
+        circleEditor.value.close();
       }
-      !props.immediateComplete && (currentEditingObj.value = null);
+      currentEditingObj.value = null;
     };
     const updatePolylineData = (instance = null) => {
       const polyline = instance != null ? instance : polyEditor.value.getTarget();
@@ -11577,7 +11586,8 @@ const _sfc_main$4 = {
                     type: "primary",
                     icon: unref(QuestionFilled),
                     onClick: _cache[0] || (_cache[0] = ($event) => showHelpDialog.value = true),
-                    class: "help-button"
+                    class: "help-button",
+                    size: "small"
                   }, {
                     default: withCtx(() => [
                       createTextVNode(" \u64CD\u4F5C\u8BF4\u660E ")
@@ -11659,14 +11669,14 @@ const _sfc_main$4 = {
                       return openBlock(), createBlock(_component_el_radio, {
                         key: type,
                         onClick: withModifiers(($event) => drawTypClick(type), ["prevent"]),
-                        label: type,
+                        value: type,
                         border: ""
                       }, {
                         default: withCtx(() => [
                           createTextVNode(toDisplayString(getButtonLabel(type)), 1)
                         ]),
                         _: 2
-                      }, 1032, ["onClick", "label"]);
+                      }, 1032, ["onClick", "value"]);
                     }), 128))
                   ]),
                   _: 1
@@ -11741,7 +11751,8 @@ const _sfc_main$4 = {
           title: "\u64CD\u4F5C\u8BF4\u660E",
           modelValue: showHelpDialog.value,
           "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => showHelpDialog.value = $event),
-          width: "600px",
+          width: unref(isMobile) ? "90%" : "600px",
+          fullscreen: unref(isMobile),
           "append-to-body": ""
         }, {
           footer: withCtx(() => [
@@ -11761,12 +11772,12 @@ const _sfc_main$4 = {
             _hoisted_13
           ]),
           _: 1
-        }, 8, ["modelValue"])
+        }, 8, ["modelValue", "width", "fullscreen"])
       ], 4);
     };
   }
 };
-const SCTJMapDrawing = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-23d9c379"]]);
+const SCTJMapDrawing = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-e5322b91"]]);
 const BimViewer_vue_vue_type_style_index_0_scoped_5d1b1a03_lang = "";
 const _withScopeId$2 = (n) => (pushScopeId("data-v-5d1b1a03"), n = n(), popScopeId(), n);
 const _hoisted_1$2 = {