vue-openlayers-plugin 1.0.50 → 1.0.51

package/lib/{index-dd9c537c.mjs → index-0cfcd57c.mjs}

@@ -83735,16 +83735,20 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
   parseCQLExpression(cqlExpression) {
     const filters = [];
     let expression = cqlExpression.trim();
-    if (expression.startsWith("(") && expression.endsWith(")")) {
+    const stripOuter = (s2) => {
+      if (!(s2.startsWith("(") || s2.startsWith("（")))
+        return s2;
+      const openChar = s2[0];
+      const closeChar = openChar === "(" ? ")" : "）";
       let depth = 0;
       let wrapsWhole = true;
-      for (let i = 0; i < expression.length; i++) {
-        const ch = expression[i];
-        if (ch === "(")
+      for (let i = 0; i < s2.length; i++) {
+        const ch = s2[i];
+        if (ch === openChar)
           depth++;
-        else if (ch === ")") {
+        else if (ch === closeChar) {
           depth--;
-          if (depth === 0 && i < expression.length - 1) {
+          if (depth === 0 && i < s2.length - 1) {
             wrapsWhole = false;
             break;
           }
@@ -83755,9 +83759,15 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
         }
       }
       if (wrapsWhole && depth === 0) {
-        expression = expression.slice(1, -1).trim();
+        return s2.slice(1, -1).trim();
       }
-    }
+      return s2;
+    };
+    let prevExp;
+    do {
+      prevExp = expression;
+      expression = stripOuter(expression);
+    } while (expression !== prevExp);
     const conditions = expression.split(/\s+AND\s+/i);
     for (let i = 0; i < conditions.length; i++) {
       const condition = conditions[i].trim();
@@ -83790,7 +83800,7 @@ class GeoJSONLayerHandler extends BaseLayer$2 {
       // property LIKE 'pattern'
       { regex: /^(\w+)\s+LIKE\s+'([^']*)'$/i, operator: FilterOperator.LIKE },
       // property IN ('a','b',...) 或 property IN (1,2,...)
-      { regex: /^(\w+)\s+IN\s*\(\s*([^)]+)\s*\)$/i, operator: FilterOperator.IN }
+      { regex: /^(\w+)\s+IN\s*[\(（]\s*([\s\S]+?)\s*[\)）]\s*$/i, operator: FilterOperator.IN }
     ];
     for (const pattern of patterns) {
       const match2 = condition.match(pattern.regex);
@@ -490512,7 +490522,7 @@ function(t3) {
  */
 function(t3) {
   function e8() {
-    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-86beb4f4.mjs")).catch(function(t4) {
+    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-7867bf7f.mjs")).catch(function(t4) {
       return Promise.reject(new Error("Could not load canvg: " + t4));
     }).then(function(t4) {
       return t4.default ? t4.default : t4;

package/lib/{index.es-86beb4f4.mjs → index.es-7867bf7f.mjs}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, R as RGBColor, r as requestAnimationFrame, _ as _asyncToGenerator, a as _, p as processCanvasRGBA, b as _defineProperty } from "./index-dd9c537c.mjs";
+import { c as commonjsGlobal, R as RGBColor, r as requestAnimationFrame, _ as _asyncToGenerator, a as _, p as processCanvasRGBA, b as _defineProperty } from "./index-0cfcd57c.mjs";
 import "vue";
 import "ol";
 var check = function(it) {

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-import { z, B, d, C, D, a2, a3, u, y, a7, a6, I, H, Z, $, L, J, K, a4, h, M, a0, a1, X, Y, U, W, Q, S, P, A, F, G, N, O, a8, e, T, E, V, x, j, o, t, f, k, g, w, q, m, n, a5, i, s, l, v } from "./index-dd9c537c.mjs";
+import { z, B, d, C, D, a2, a3, u, y, a7, a6, I, H, Z, $, L, J, K, a4, h, M, a0, a1, X, Y, U, W, Q, S, P, A, F, G, N, O, a8, e, T, E, V, x, j, o, t, f, k, g, w, q, m, n, a5, i, s, l, v } from "./index-0cfcd57c.mjs";
 import "vue";
 import "ol";
 export {

package/lib/index.umd.js

@@ -84244,16 +84244,20 @@ ${this.attributes_.map(
     parseCQLExpression(cqlExpression) {
       const filters = [];
       let expression = cqlExpression.trim();
-      if (expression.startsWith("(") && expression.endsWith(")")) {
+      const stripOuter = (s2) => {
+        if (!(s2.startsWith("(") || s2.startsWith("（")))
+          return s2;
+        const openChar = s2[0];
+        const closeChar = openChar === "(" ? ")" : "）";
         let depth = 0;
         let wrapsWhole = true;
-        for (let i2 = 0; i2 < expression.length; i2++) {
-          const ch = expression[i2];
-          if (ch === "(")
+        for (let i2 = 0; i2 < s2.length; i2++) {
+          const ch = s2[i2];
+          if (ch === openChar)
             depth++;
-          else if (ch === ")") {
+          else if (ch === closeChar) {
             depth--;
-            if (depth === 0 && i2 < expression.length - 1) {
+            if (depth === 0 && i2 < s2.length - 1) {
               wrapsWhole = false;
               break;
             }
@@ -84264,9 +84268,15 @@ ${this.attributes_.map(
           }
         }
         if (wrapsWhole && depth === 0) {
-          expression = expression.slice(1, -1).trim();
+          return s2.slice(1, -1).trim();
         }
-      }
+        return s2;
+      };
+      let prevExp;
+      do {
+        prevExp = expression;
+        expression = stripOuter(expression);
+      } while (expression !== prevExp);
       const conditions = expression.split(/\s+AND\s+/i);
       for (let i2 = 0; i2 < conditions.length; i2++) {
         const condition = conditions[i2].trim();
@@ -84299,7 +84309,7 @@ ${this.attributes_.map(
         // property LIKE 'pattern'
         { regex: /^(\w+)\s+LIKE\s+'([^']*)'$/i, operator: exports2.FilterOperator.LIKE },
         // property IN ('a','b',...) 或 property IN (1,2,...)
-        { regex: /^(\w+)\s+IN\s*\(\s*([^)]+)\s*\)$/i, operator: exports2.FilterOperator.IN }
+        { regex: /^(\w+)\s+IN\s*[\(（]\s*([\s\S]+?)\s*[\)）]\s*$/i, operator: exports2.FilterOperator.IN }
       ];
       for (const pattern of patterns) {
         const match2 = condition.match(pattern.regex);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-openlayers-plugin",
-  "version": "1.0.50",
+  "version": "1.0.51",
   "description": "A Vue 3 plugin for OpenLayers with custom components and utilities",
   "main": "lib/index.umd.js",
   "module": "lib/index.esm.js",

package/types/src/components/CustomOpenlayer/utils/layers/GeoJSONLayerHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeoJSONLayerHandler.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CustomOpenlayer/utils/layers/GeoJSONLayerHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAM5C,OAAO,EAAE,GAAG,IAAI,KAAK,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,KAAK,EAAE,WAAW,EAA0D,MAAM,aAAa,CAAC;AAEvG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEjD;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,SAAS;IAChD,OAAO,CAAC,WAAW,CAAC,CAAkB;gBAE1B,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,KAAK;IAI5C,WAAW,IAAI,KAAK,CAAC,YAAY,CAAC;IAclC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAyB1B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAQ3B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA4DxB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAmD1B;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI;IAiBlC;;OAEG;IACH,aAAa,IAAI,IAAI;IAQrB;;OAEG;IACH,eAAe,IAAI,MAAM;IAMzB;;OAEG;IACH,WAAW,CAAC,WAAW,EAAE,GAAG,GAAG,IAAI;IAanC;;OAEG;IACH,cAAc,CAAC,WAAW,EAAE,eAAe,GAAG,IAAI;IAOlD;;OAEG;IACH,cAAc,IAAI,eAAe,GAAG,SAAS;IAI7C;;OAEG;IACH,qBAAqB,CACnB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,EAC1D,kBAAkB,CAAC,EAAE,eAAe,GACnC,IAAI;IAUP;;;OAGG;IACH,aAAa,CAAC,OAAO,CAAC,EAAE;QACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;QAClB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB,GAAG,IAAI;IA6DR;;;;OAIG;IACH,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAa,GAAG,IAAI;IAuDzD;;;;;OAKG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAa,GAAG,IAAI;IAkDtF;;;OAGG;IACH,SAAS,IAAI,MAAM,EAAE,GAAG,IAAI;IA+B5B;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;IA4B9B;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAkBjC;;;OAGG;IACH,OAAO,CAAC,cAAc;IAqBtB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IA0C1B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IA6E/B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAkD5B;;OAEG;IACH,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAI5D;;OAEG;IACH,sBAAsB,IAAI,IAAI;CAG/B"}
+{"version":3,"file":"GeoJSONLayerHandler.d.ts","sourceRoot":"","sources":["../../../../../../src/components/CustomOpenlayer/utils/layers/GeoJSONLayerHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAM5C,OAAO,EAAE,GAAG,IAAI,KAAK,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,KAAK,EAAE,WAAW,EAA0D,MAAM,aAAa,CAAC;AAEvG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEjD;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,SAAS;IAChD,OAAO,CAAC,WAAW,CAAC,CAAkB;gBAE1B,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,KAAK;IAI5C,WAAW,IAAI,KAAK,CAAC,YAAY,CAAC;IAclC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAyB1B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAQ3B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA4DxB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAmD1B;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI;IAiBlC;;OAEG;IACH,aAAa,IAAI,IAAI;IAQrB;;OAEG;IACH,eAAe,IAAI,MAAM;IAMzB;;OAEG;IACH,WAAW,CAAC,WAAW,EAAE,GAAG,GAAG,IAAI;IAanC;;OAEG;IACH,cAAc,CAAC,WAAW,EAAE,eAAe,GAAG,IAAI;IAOlD;;OAEG;IACH,cAAc,IAAI,eAAe,GAAG,SAAS;IAI7C;;OAEG;IACH,qBAAqB,CACnB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE;QAAE,CAAC,aAAa,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,EAC1D,kBAAkB,CAAC,EAAE,eAAe,GACnC,IAAI;IAUP;;;OAGG;IACH,aAAa,CAAC,OAAO,CAAC,EAAE;QACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;QAClB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB,GAAG,IAAI;IA6DR;;;;OAIG;IACH,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAa,GAAG,IAAI;IAuDzD;;;;;OAKG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAa,GAAG,IAAI;IAkDtF;;;OAGG;IACH,SAAS,IAAI,MAAM,EAAE,GAAG,IAAI;IA+B5B;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;IA4B9B;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAkBjC;;;OAGG;IACH,OAAO,CAAC,cAAc;IAqBtB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAmD1B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IA6E/B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAkD5B;;OAEG;IACH,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAI5D;;OAEG;IACH,sBAAsB,IAAI,IAAI;CAG/B"}