@kengic/uni 0.6.3-beta.7 → 0.7.0

package/{dist/util → util}/kg.ts

@@ -4,6 +4,7 @@ import { API } from '../api';
 import { useKgStation, useKgWarehouse } from '../component';
 import { useAppStore } from '../store/app.store';
 import { KG_DYNAMIC_QUERY_OPERATOR } from '../const';
+import dayjs, { Dayjs } from 'dayjs';
 
 /**
  * 通用工具.
@@ -35,9 +36,10 @@ export class Kg {
      *     </li>
      * </ol>
      *
+     * @param $dayjs.
      * @param params 请求参数.
      */
-    public static parseParams(params?: Record<string, any> | null): any {
+    public static parseParams($dayjs: typeof dayjs | null | undefined, params?: Record<string, any> | null): any {
         let _params = toRaw(unref(params))!;
 
         if (!_params || !isObjectLike(_params)) {
@@ -51,8 +53,13 @@ export class Kg {
                 const value = _params[key];
 
                 switch (true) {
+                    case !!$dayjs && isArray(value) && value.length === 2 && $dayjs.isDayjs(value[0]) && $dayjs.isDayjs(value[1]): {
+                        resultParams[key] = value;
+                        break;
+                    }
+
                     case isObjectLike(value):
-                        resultParams[key] = this.parseParams(value);
+                        resultParams[key] = this.parseParams($dayjs, value);
                         break;
 
                     case typeof value === 'string':
@@ -128,7 +135,7 @@ export class Kg {
         const patch: number = Number(oldVersionSegments[2]);
 
         try {
-            const newVersion = await API.WMS.CommonController.GetLatestApkVersion({}, { timeout: 5 * 1000 });
+            const newVersion = await API.WMS.CommonController.GetLatestApkVersion({}, { timeout: 5 * 1000, isSuppressSuccess: true });
 
             // 最新版本
             const newVersionSegments = newVersion.split('.');
@@ -195,11 +202,12 @@ export class Kg {
      * @param param.params 请求参数.
      */
     public static getQueryHeaders(param: {
+        $dayjs?: typeof dayjs;
         dynamicQueryExcludeProperties: Array<string> | null | undefined;
         dynamicQueryOperatorModel: Record<string, any> | null | undefined;
         params: Record<string, any> | null | undefined;
     }) {
-        const { params, dynamicQueryExcludeProperties, dynamicQueryOperatorModel } = param ?? {};
+        const { $dayjs, params, dynamicQueryExcludeProperties, dynamicQueryOperatorModel } = param ?? {};
 
         let _params = cloneDeep(toRaw(unref(params ?? {})));
 
@@ -211,7 +219,8 @@ export class Kg {
         // 特殊字段, 这些特殊字段的值不做处理, 保持原样
         const SPECIAL_FIELD_KEYS = ['pageNo', 'pageSize', 'column', 'order'];
 
-        const _paramsForWhereSql: Record<string, any> = {};
+        const _paramsForQueryWhereSql: Record<string, any> = {};
+
         Object.keys(_params)
             .sort()
             .forEach((key) => {
@@ -235,16 +244,55 @@ export class Kg {
                 let operator: string = dynamicQueryOperatorModel?.[key] ?? KG_DYNAMIC_QUERY_OPERATOR.EQ;
 
                 switch (true) {
+                    //region 日期范围
+                    //----------------------------------------------------------------------------------------------------
+                    case !!$dayjs && isArray(value) && value.length === 2 && $dayjs.isDayjs(value[0]) && $dayjs.isDayjs(value[1]): {
+                        let _stringValue = '';
+
+                        switch (operator) {
+                            case 'BETWEEN':
+                            default: {
+                                const _leftValue = value[0] as Dayjs;
+                                const _rightValue = value[1] as Dayjs;
+
+                                // 左侧日期的字符串
+                                let _leftStringValue = '';
+                                if (_leftValue && _leftValue.isValid()) {
+                                    _leftStringValue = _leftValue.format('YYYY-MM-DD 00:00:00');
+                                }
+
+                                // 右侧日期的字符串
+                                let _rightStringValue = '';
+                                if (_rightValue && _rightValue.isValid()) {
+                                    _rightStringValue = _rightValue.add(1, 'day').format('YYYY-MM-DD 00:00:00');
+                                }
+
+                                if (_leftStringValue) {
+                                    _stringValue += ` AND (${_key} >= '${_leftStringValue}')`;
+                                }
+
+                                if (_rightStringValue) {
+                                    _stringValue += ` AND (${_key} < '${_rightStringValue}')`;
+                                }
+                                break;
+                            }
+                        }
+
+                        _paramsForQueryWhereSql[key] = _stringValue;
+                        break;
+                    }
+                    //endregion
+
                     // array
                     case Array.isArray(value): {
                         if (value.length === 0) {
-                            _paramsForWhereSql[key] = undefined;
+                            _paramsForQueryWhereSql[key] = undefined;
                             break;
                         }
 
                         const _value = value.map((i: any) => `N'${String(i)}'`).join(', ');
 
-                        _paramsForWhereSql[key] = ` AND (${_key} IN (${_value}))`;
+                        _paramsForQueryWhereSql[key] = ` AND (${_key} IN (${_value}))`;
                         break;
                     }
 
@@ -257,7 +305,7 @@ export class Kg {
                     case typeof value === 'string': {
                         // 空白字符
                         if (value.trim() === '') {
-                            _paramsForWhereSql[key] = undefined;
+                            _paramsForQueryWhereSql[key] = undefined;
                             break;
                         }
 
@@ -291,7 +339,7 @@ export class Kg {
                             }
                         }
 
-                        _paramsForWhereSql[key] = _strValue;
+                        _paramsForQueryWhereSql[key] = _strValue;
 
                         break;
                     }
@@ -333,7 +381,7 @@ export class Kg {
                             }
                         }
 
-                        _paramsForWhereSql[key] = _strValue;
+                        _paramsForQueryWhereSql[key] = _strValue;
 
                         break;
                     }
@@ -355,14 +403,14 @@ export class Kg {
                             }
                         }
 
-                        _paramsForWhereSql[key] = _strValue;
+                        _paramsForQueryWhereSql[key] = _strValue;
 
                         break;
                     }
 
                     // null, undefined
                     default: {
-                        _paramsForWhereSql[key] = value;
+                        _paramsForQueryWhereSql[key] = value;
 
                         break;
                     }
@@ -370,7 +418,7 @@ export class Kg {
             });
 
         const whereSqlSegment = reduce(
-            _paramsForWhereSql,
+            _paramsForQueryWhereSql,
             (sql, value) => {
                 if (!value) {
                     return sql;
@@ -383,7 +431,7 @@ export class Kg {
 
         //region WHERE
         // ----------------------------------------------------------------------------------------------------
-        let whereSql = `WHERE (1 = 1)${whereSqlSegment}`;
+        let whereSql = `WHERE (1 = 1)${whereSqlSegment}`.replace('(1 = 1) AND ', '');
         whereSql = encodeURIComponent(whereSql);
         //endregion
 

package/CHANGELOG.md

@@ -1,15 +0,0 @@
-# 0.6.0
-
-1. 优化导入路径
-
-    ```typescript
-    // 旧
-    // --------------------------------------------------
-    import { UniEasyinput } from '@kengic/uni/dist';
-
-    // 新
-    // --------------------------------------------------
-    import { UniEasyinput } from '@kengic/uni';
-    ```
-
----

package/README.md

@@ -1 +0,0 @@
-# @kengic/uni

package/dist/uni/index.ts

@@ -1 +0,0 @@
-export * from './uni-ui';