@kq_npm/client3d_webgl_vue 4.5.55 → 4.5.56

package/airspaceprofileanalysis/style/airspaceprofileanalysis.css

@@ -0,0 +1 @@
+.kq3d-airspace-profile-analysis{z-index:999;border-radius:var(--kq-border-radius-base);padding:16px;pointer-events:auto;cursor:default;background-color:var(--kq-bg-color)}.kq3d-airspace-profile-analysis .kq3d-airspace-profile-analysis-box{width:332px}.kq3d-airspace-profile-analysis .kq3d-airspace-profile-analysis-tip{color:var(--kq-text-color-regular);font-size:var(--kq-font-size-base)}.kq3d-airspace-profile-analysis .kq3d-airspace-profile-analysis-tip p{margin-top:0;margin-bottom:16px}.kq3d-airspace-profile-analysis .kq-collapse{border:unset}.kq3d-airspace-profile-analysis .kq-collapse .kq-collapse-item__header{border:unset;height:38px;background-color:var(--kq-fill-color-light);font-weight:700;padding:0 16px;font-size:16px}.kq3d-airspace-profile-analysis .kq-collapse .kq-collapse-item__arrow{margin:0 0 0 auto}.kq3d-airspace-profile-analysis .kq-collapse .kq-collapse-item__wrap .kq-collapse-item__content{padding-bottom:unset;border:unset;padding-top:10px}.kq3d-airspace-profile-analysis .kq-form-item{margin-bottom:8px}.kq3d-airspace-profile-analysis .kq-form-item__content{text-align:end;display:block}.kq3d-airspace-profile-analysis .kq-row{display:block}.kq3d-airspace-profile-analysis .kq-slider{width:95%;padding-left:7px}.kq3d-airspace-profile-analysis .kq-slider .kq-slider__button{width:14px;height:14px}.kq3d-airspace-profile-analysis .kq-input-number.is-controls-right{width:65px}.kq3d-airspace-profile-analysis .kq-input-number.is-controls-right .kq-input-number__decrease,.kq3d-airspace-profile-analysis .kq-input-number.is-controls-right .kq-input-number__increase{width:20px}.kq3d-airspace-profile-analysis .kq-col-8 .kq-input-number .kq-input__wrapper,.kq3d-airspace-profile-analysis .kq-input-number.is-controls-right .kq-input__wrapper{padding-left:0;padding-right:20px}.kq3d-airspace-profile-analysis .kq-radio-group{float:left}.kq3d-airspace-profile-analysis .kq-radio__input{display:inline;vertical-align:top}.kq3d-airspace-profile-analysis .kq3d-airspace-profile-analysis-footer{text-align:right;padding:16px 0 0}

package/airspaceprofileanalysis/style/index.js

@@ -0,0 +1,3 @@
+"use strict";
+
+require("./airspaceprofileanalysis.css");

package/buildpointmodel/index.js

@@ -932,8 +932,8 @@ class BuildPointModelViewModel {
       PMExtrudedCylinder: () => ({
         ...baseConfig,
         slices: util.getNumberValue(properties, that._options, "slicesFields", "slices", _BuildPointModelUtil.GEOMETRY_DEFAULT_CONFIG.SLICES),
-        heights: JSON.parse(that._options.heights || null),
-        radii: JSON.parse(that._options.radii || null)
+        heights: (that._options.heights || '').split(',').map(s => s.trim()).filter(Boolean).map(Number),
+        radii: (that._options.radii || '').split(',').map(s => s.trim()).filter(Boolean).map(Number)
       }),
       PMWedge: () => ({
         ...baseConfig,
@@ -948,7 +948,7 @@ class BuildPointModelViewModel {
       PMCustomPointModel: () => ({
         ...baseConfig,
         stretchHeight: that._options.stretchHeight ?? 20,
-        coordinates: JSON.parse(that._options.coordinates ?? null),
+        coordinates: that._safelyParse(that._options.coordinates),
         scale: {
           x: that._options.scaleX ?? 1,
           y: that._options.scaleY ?? 1
@@ -1014,13 +1014,53 @@ class BuildPointModelViewModel {
       ofModelName: () => {
         this._pointModel.label = this._options.ofModelName || this._pointModel.label;
       },
+      heights: () => {
+        this._pointModel.heights = (this._options.heights || '').split(',').map(s => s.trim()).filter(Boolean).map(Number);
+      },
+      radii: () => {
+        this._pointModel.radii = (this._options.radii || '').split(',').map(s => s.trim()).filter(Boolean).map(Number);
+      },
+      coordinates: () => {
+        this._pointModel.coordinates = this._safelyParse(this._options.coordinates);
+      },
       default: () => {
         this._pointModel[key] = this._options[key];
       }
     };
     (paramUpdater[key] || paramUpdater.default)();
   }
+  /**
+   * 安全解析类JSON字符串（兼容单引号、标准双引号）
+   * @param {string|any} data 字符串/普通值
+   * @returns {any|null} 解析结果
+   */
+  _safelyParse(data) {
+    // 非字符串直接原值返回
+    if (typeof data !== 'string') return data;
+    const str = data.trim();
+    if (!str) return null;
 
+    // 第一层：优先解析标准合法JSON（双引号，无多余替换，性能最好）
+    try {
+      return JSON.parse(str);
+    } catch (err) {
+      // 第二层：处理单引号包裹的json
+      let temp = str.replace(/(?<!\\)'(?=[\w_]+:)/g, '"'); // 仅替换键名单引号
+      temp = temp.replace(/(:\s*)'(.*?)(?<!\\)'/g, '$1"$2"'); // 仅替换值单引号
+      try {
+        return JSON.parse(temp);
+      } catch (err2) {
+        // 第三层：处理无引号键 {x:1,y:2} 格式
+        temp = temp.replace(/([{,]\s*)(\w+)(\s*:)/g, '$1"$2"$3');
+        try {
+          return JSON.parse(temp);
+        } catch (err3) {
+          // 全部解析失败返回null
+          return null;
+        }
+      }
+    }
+  }
   /**
    * 提取属性字段（对外暴露，复用工具类方法）
    * @param {Object} geojsonData - GeoJSON数据
@@ -1704,34 +1744,74 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
       });
       initScroll();
     });
-    // 计算属性
+    /**
+     * 安全解析类JSON字符串
+     * 兼容：标准双引号JSON / 单引号JSON / 无引号键名对象数组 / 多行换行字符串
+     * @param {string|any} data 字符串/普通值
+     * @returns {any|null} 解析结果，失败返回null
+     */
+    function safelyParse(data) {
+      // 非字符串直接原值返回
+      if (typeof data !== 'string') return data;
+      const str = data.trim();
+      if (!str) return null;
+
+      // 第一层：优先解析标准合法JSON（双引号，无多余替换，性能最好）
+      try {
+        return JSON.parse(str);
+      } catch (err) {
+        // 第二层：处理单引号包裹的json
+        let temp = str.replace(/(?<!\\)'(?=[\w_]+:)/g, '"'); // 仅替换键名单引号
+        temp = temp.replace(/(:\s*)'(.*?)(?<!\\)'/g, '$1"$2"'); // 仅替换值单引号
+        try {
+          return JSON.parse(temp);
+        } catch (err2) {
+          // 第三层：处理无引号键 {x:1,y:2} 格式
+          temp = temp.replace(/([{,]\s*)(\w+)(\s*:)/g, '$1"$2"$3');
+          try {
+            return JSON.parse(temp);
+          } catch (err3) {
+            // 全部解析失败返回null
+            return null;
+          }
+        }
+      }
+    }
+
+    /**
+     * 校验是否为有效数字
+     * @param {*} val 
+     * @returns {boolean}
+     */
+    function isEffectiveNumber(val) {
+      const num = Number(val);
+      return !isNaN(num) && isFinite(num);
+    }
     const isDisabled = (0, _vue.computed)(() => {
-      // 1. 基础判断：没有 geometry 直接禁用
-      if (!currentItemGeometry.value) return true;
-      const type = currentItemGeometry.value?.value;
+      const geometry = currentItemGeometry.value;
+      // 无几何配置直接禁用
+      if (!geometry?.value) return true;
+      const type = geometry.value;
 
-      // 2. 圆柱体类型：需要高度 + 半径
+      // 圆柱体：高度、半径必须为有效数字
       if (type === 'PMExtrudedCylinder') {
-        return !(formItem.heights && formItem.radii && safelyParse(formItem.heights) && safelyParse(formItem.radii));
+        return !(formItem.heights && formItem.radii);
       }
 
-      // 3. 自定义点模型：需要坐标
+      // 自定义点模型：解析后必须是非空数组，且每个点 x/y 都是有效数字
       if (type === 'PMCustomPointModel') {
-        return !(formItem.coordinates && safelyParse(formItem.coordinates));
+        const coords = safelyParse(formItem.coordinates);
+        // 校验：是数组 + 数组不为空
+        if (!Array.isArray(coords) || coords.length === 0) return true;
+        // 校验每一个坐标点
+        return coords.some(point => {
+          return !(isEffectiveNumber(point.x) && isEffectiveNumber(point.y));
+        });
       }
 
-      // 4. 其他类型：不禁用
+      // 其他类型：不禁用
       return false;
     });
-
-    // 工具函数：安全解析 JSON，防止报错
-    function safelyParse(str) {
-      try {
-        return JSON.parse(str);
-      } catch {
-        return null;
-      }
-    }
     function initScroll() {
       const el = scrollBox.value;
       if (!el) return;
@@ -1910,8 +1990,8 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
         topSlopeY: topSlopeY ?? formItem.topSlopeY,
         bottomSlopeX: bottomSlopeX ?? formItem.bottomSlopeX,
         bottomSlopeY: bottomSlopeY ?? formItem.bottomSlopeY,
-        heights: heights ?? formItem.heights,
-        radii: radii ?? formItem.radii,
+        heights: heights ? Array.isArray(heights) ? heights.join(",") : heights : formItem.heights,
+        radii: radii ? Array.isArray(radii) ? radii.join(",") : radii : formItem.radii,
         bottomLength: bottomLength ?? formItem.bottomLength,
         bottomWidth: bottomWidth ?? formItem.bottomWidth,
         topLength: topLength ?? formItem.topLength,
@@ -1919,7 +1999,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
         topCenterOffsetX: topCenterOffsetX ?? formItem.topCenterOffsetX,
         topCenterOffsetY: topCenterOffsetY ?? formItem.topCenterOffsetY,
         stretchHeight: stretchHeight ?? formItem.stretchHeight,
-        coordinates: coordinates ?? formItem.coordinates
+        coordinates: coordinates ? Array.isArray(coordinates) ? JSON.stringify(coordinates) : coordinates : formItem.coordinates
       });
       if (modelingType == "geometrySymbol") {
         currentItemGeometry.value = {
@@ -4308,7 +4388,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
                     style: {
                       "width": "100%"
                     },
-                    placeholder: "[0, 200, 400, 600]"
+                    placeholder: "0, 200, 400, 600"
                   }, null, 8 /* PROPS */, ["modelValue"])]),
                   _: 1 /* STABLE */
                 })]),
@@ -4335,7 +4415,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
                     style: {
                       "width": "100%"
                     },
-                    placeholder: "[100, 50, 150, 80]"
+                    placeholder: "100, 50, 150, 80"
                   }, null, 8 /* PROPS */, ["modelValue"])]),
                   _: 1 /* STABLE */
                 })]),
@@ -4642,7 +4722,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
                     style: {
                       "width": "100%"
                     },
-                    placeholder: "[{x: 0, y: -10},{x: 2.469, y: -3.399},{x: 9.511, y: -3.090},{x: 3.995, y: 1.298}]"
+                    placeholder: "[{'x': 0, 'y': -10},{'x': 2.469, 'y': -3.399},{'x': 9.511, 'y': -3.090},{'x': 3.995, 'y': 1.298}]"
                   }, null, 8 /* PROPS */, ["modelValue"])]),
                   _: 1 /* STABLE */
                 })]),
@@ -4707,7 +4787,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
                       min: (0, _vue.unref)(formItem).minScale,
                       max: (0, _vue.unref)(formItem).maxScale,
                       step: (0, _vue.unref)(formItem).scaleStep,
-                      onChange: _cache[212] || (_cache[212] = $event => paramsChanged('scalePoint'))
+                      onChange: _cache[212] || (_cache[212] = $event => paramsChanged('scale'))
                     }, null, 8 /* PROPS */, ["modelValue", "min", "max", "step"])]),
                     _: 1 /* STABLE */
                   }), (0, _vue.createVNode)(_component_kq_col, {
@@ -4720,7 +4800,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
                       max: (0, _vue.unref)(formItem).maxScale,
                       step: (0, _vue.unref)(formItem).scaleStep,
                       "controls-position": "right",
-                      onChange: _cache[214] || (_cache[214] = $event => paramsChanged('scalePoint'))
+                      onChange: _cache[214] || (_cache[214] = $event => paramsChanged('scale'))
                     }, null, 8 /* PROPS */, ["modelValue", "min", "max", "step"])]),
                     _: 1 /* STABLE */
                   })]),
@@ -4747,7 +4827,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
                       min: (0, _vue.unref)(formItem).minScale,
                       max: (0, _vue.unref)(formItem).maxScale,
                       step: (0, _vue.unref)(formItem).scaleStep,
-                      onChange: _cache[216] || (_cache[216] = $event => paramsChanged('scalePoint'))
+                      onChange: _cache[216] || (_cache[216] = $event => paramsChanged('scale'))
                     }, null, 8 /* PROPS */, ["modelValue", "min", "max", "step"])]),
                     _: 1 /* STABLE */
                   }), (0, _vue.createVNode)(_component_kq_col, {
@@ -4760,7 +4840,7 @@ var _default = exports.A = /*@__PURE__*/Object.assign(__default__, {
                       max: (0, _vue.unref)(formItem).maxScale,
                       step: (0, _vue.unref)(formItem).scaleStep,
                       "controls-position": "right",
-                      onChange: _cache[218] || (_cache[218] = $event => paramsChanged('scalePoint'))
+                      onChange: _cache[218] || (_cache[218] = $event => paramsChanged('scale'))
                     }, null, 8 /* PROPS */, ["modelValue", "min", "max", "step"])]),
                     _: 1 /* STABLE */
                   })]),