@kengic/vue 0.28.2-beta.14 → 0.28.2-beta.16

package/dist/kengic-vue.js

@@ -71373,7 +71373,7 @@ function fi(e) {
     })
   );
 }
-const version = "0.28.2-beta.14", en$1 = {
+const version = "0.28.2-beta.16", en$1 = {
   kg: {
     KgAppSelect: {
       businessManager: "Business Manager",
@@ -77744,7 +77744,7 @@ const KG_HTTP_HEADER = {
   KG_PAGE_INDEX: "Kg-Page-Index",
   KG_PAGE_SIZE: "Kg-Page-Size",
   KG_QUERY_OBJECT: "Kg-Query-Object",
-  KG_QUERY_OPERATOR: "Kg-Query-Operator",
+  KG_QUERY_OPERATOR_OBJECT: "Kg-Query-Operator",
   KG_QUERY_ORDER_BY_SQL: "Kg-Query-Order-By-Sql",
   KG_QUERY_WHERE_OBJECT: "Kg-Query-Where-Object",
   KG_QUERY_WHERE_SQL: "Kg-Query-Where-Sql",
@@ -79353,7 +79353,7 @@ class _KgUtil {
                 default:
                   throw new Error("KgUtil.parseParamsForDynamicQuery() | \u65E5\u671F\u683C\u5F0F\u6709\u8BEF.");
               }
-              Ga = `(${Oa} < '${za}' OR ${Oa} >= '${Ya}')`;
+              Ga = `((${Oa} < '${za}') OR (${Oa} >= '${Ya}'))`;
               break;
             }
             case KG_DYNAMIC_QUERY_OPERATOR.LT: {
@@ -79455,7 +79455,7 @@ class _KgUtil {
                 default:
                   throw new Error("KgUtil.parseParamsForDynamicQuery() | \u65E5\u671F\u683C\u5F0F\u6709\u8BEF.");
               }
-              Ga = `(${Oa} >= '${za}'${Oa} < '${Ya}')`;
+              Ga = `((${Oa} >= '${za}') AND (${Oa} < '${Ya}'))`;
               break;
             }
           }
@@ -79492,7 +79492,7 @@ class _KgUtil {
               break;
             }
           }
-          Ya && (za += `(${Oa} >= N'${Ya}')`), Va && (za += `(${Oa} < N'${Va}')`), oa[Sa] = za;
+          Ya && (za += `(${Oa} >= N'${Ya}')`), Va && (za && (za += " AND "), za += `(${Oa} < N'${Va}')`), oa[Sa] = za;
           break;
         }
         case Array.isArray(Na): {
@@ -79689,9 +79689,9 @@ class _KgUtil {
       ((ya = ea == null ? void 0 : ea.varGridConfig.value) == null ? void 0 : ya.convert_sort_field_to_under_score_flg) === 1 && (Sa = ie.column.split(".").map((Ta) => _KgUtil.snakeCase(Ta)).join(".")), Sa && (da = `ORDER BY ${Sa}`, ie.order === "asc" ? da += " ASC" : ie.order === "desc" && (da += " DESC"), da = encodeURIComponent(da.trim()));
     }
     return {
-      operatorJSON: JSON.stringify(na != null ? na : {}),
+      operatorJSON: encodeURIComponent(JSON.stringify(na != null ? na : {})),
       orderBySql: da,
-      whereObjectJSON: JSON.stringify(oa != null ? oa : {}),
+      whereObjectJSON: encodeURIComponent(JSON.stringify(oa != null ? oa : {})),
       whereSql: ca
     };
   }
@@ -105277,9 +105277,6 @@ const KgTable$1 = "", getProps$g = () => ({
               kgSearchFormID: oe.kgTable.kgSearchFormID.value,
               params: Fi
             }), Ps = await httpClient().request({
-              url: pa.value,
-              method: (us = (qi = oe.kgButton.searchButton.value) == null ? void 0 : qi.cmd_method) != null ? us : "GET",
-              params: Os,
               data: Os,
               headers: {
                 [KG_HTTP_HEADER.KG_FORM_ID]: oe.formID,
@@ -105287,11 +105284,14 @@ const KgTable$1 = "", getProps$g = () => ({
                 [KG_HTTP_HEADER.KG_PAGE_INDEX]: Os.pageNo,
                 [KG_HTTP_HEADER.KG_PAGE_SIZE]: Os.pageSize,
                 [KG_HTTP_HEADER.KG_QUERY_OBJECT]: "{}",
-                [KG_HTTP_HEADER.KG_QUERY_OPERATOR]: Nl,
+                [KG_HTTP_HEADER.KG_QUERY_OPERATOR_OBJECT]: Nl,
                 [KG_HTTP_HEADER.KG_QUERY_ORDER_BY_SQL]: Qs,
                 [KG_HTTP_HEADER.KG_QUERY_WHERE_OBJECT]: Il,
                 [KG_HTTP_HEADER.KG_QUERY_WHERE_SQL]: Ks
-              }
+              },
+              method: (us = (qi = oe.kgButton.searchButton.value) == null ? void 0 : qi.cmd_method) != null ? us : "GET",
+              params: Os,
+              url: pa.value
             }, {
               isReturnNativeResponse: !0,
               successMessageMode: "none"
@@ -108023,7 +108023,7 @@ const getProps$d = () => ({
             [KG_HTTP_HEADER.KG_PAGE_INDEX]: da.pageNo,
             [KG_HTTP_HEADER.KG_PAGE_SIZE]: da.pageSize,
             [KG_HTTP_HEADER.KG_QUERY_OBJECT]: "{}",
-            [KG_HTTP_HEADER.KG_QUERY_OPERATOR]: ha,
+            [KG_HTTP_HEADER.KG_QUERY_OPERATOR_OBJECT]: ha,
             [KG_HTTP_HEADER.KG_QUERY_ORDER_BY_SQL]: ga,
             [KG_HTTP_HEADER.KG_QUERY_WHERE_OBJECT]: Ea,
             [KG_HTTP_HEADER.KG_QUERY_WHERE_SQL]: pa
@@ -110555,7 +110555,7 @@ function kgSetupHttpClient(e) {
       if ((ue == null ? void 0 : ue.mock) !== void 0)
         return new Promise((Aa) => Aa(ue == null ? void 0 : ue.mock));
       ie.headers || (ie.headers = {});
-      const st = KG_HTTP_HEADER.KG_FORM_ID, ea = KG_HTTP_HEADER.KG_IS_DYNAMIC_QUERY, ta = KG_HTTP_HEADER.KG_QUERY_WHERE_SQL, na = KG_HTTP_HEADER.KG_QUERY_WHERE_OBJECT, oa = KG_HTTP_HEADER.KG_QUERY_ORDER_BY_SQL, la = KG_HTTP_HEADER.KG_QUERY_OBJECT, ca = KG_HTTP_HEADER.KG_QUERY_OPERATOR;
+      const st = KG_HTTP_HEADER.KG_FORM_ID, ea = KG_HTTP_HEADER.KG_IS_DYNAMIC_QUERY, ta = KG_HTTP_HEADER.KG_QUERY_WHERE_SQL, na = KG_HTTP_HEADER.KG_QUERY_WHERE_OBJECT, oa = KG_HTTP_HEADER.KG_QUERY_ORDER_BY_SQL, la = KG_HTTP_HEADER.KG_QUERY_OBJECT, ca = KG_HTTP_HEADER.KG_QUERY_OPERATOR_OBJECT;
       if (ue != null && ue.dynamicQueryOperatorModel) {
         if (!(ue != null && ue.dayjs))
           throw new Error("\u53C2\u6570 options.dynamicQueryOperators \u4E0D\u4E3A\u7A7A, \u6240\u4EE5\u53C2\u6570 options.dayjs \u4E5F\u4E0D\u80FD\u4E3A\u7A7A.");
@@ -110578,7 +110578,7 @@ function kgSetupHttpClient(e) {
           [ta]: Ra
         };
       }
-      if (ie.headers[ta] && (ie.headers[ta] = encodeURIComponent(decodeURIComponent(String(ie.headers[ta])))), ie.headers[oa] && (ie.headers[oa] = encodeURIComponent(decodeURIComponent(String(ie.headers[oa])))), ie.headers[st] && (ie.headers[st] = encodeURIComponent(decodeURIComponent(String(ie.headers[st])))), ((ga = oe.option.value.KgWarehouse) == null ? void 0 : ga.on) !== !1) {
+      if (ie.headers[la] && (ie.headers[la] = encodeURIComponent(decodeURIComponent(String(ie.headers[la])))), ie.headers[ca] && (ie.headers[ca] = encodeURIComponent(decodeURIComponent(String(ie.headers[ca])))), ie.headers[oa] && (ie.headers[oa] = encodeURIComponent(decodeURIComponent(String(ie.headers[oa])))), ie.headers[na] && (ie.headers[na] = encodeURIComponent(decodeURIComponent(String(ie.headers[na])))), ie.headers[ta] && (ie.headers[ta] = encodeURIComponent(decodeURIComponent(String(ie.headers[ta])))), ie.headers[st] && (ie.headers[st] = encodeURIComponent(decodeURIComponent(String(ie.headers[st])))), ((ga = oe.option.value.KgWarehouse) == null ? void 0 : ga.on) !== !1) {
         const Aa = (Ea = (ha = useKgWarehouse().warehouse.value) == null ? void 0 : ha.whId) != null ? Ea : "";
         ie.headers[KG_HTTP_HEADER.KG_WAREHOUSE] = encodeURIComponent(Aa);
       }

package/dist/src/const/const.vm.d.ts

@@ -559,7 +559,7 @@ export declare const KG_HTTP_HEADER: {
      * <p>高级查询时, 每个查询字段的操作符.</p>
      * <p>是一个 JSON 字符串, 由后端进行解析. 其中的 key 表示查询字段的名称, 其中的 value 表示查询字段的操作符.</p>
      */
-    KG_QUERY_OPERATOR: string;
+    KG_QUERY_OPERATOR_OBJECT: string;
     /** 查询语句中的 ORDER BY 片段. */
     KG_QUERY_ORDER_BY_SQL: string;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kengic/vue",
-    "version": "0.28.2-beta.14",
+    "version": "0.28.2-beta.16",
     "scripts": {
         "build": "npm run use-node && rimraf dist && vue-tsc && vite build",
         "build:dev": "npm run use-node && rimraf dist && vue-tsc && vite build --mode development",