@kengic/uni 0.6.3-beta.23 → 0.6.3-beta.24

package/dist/api/WMS/Controllers/CommonController/GetLatestApkVersion.ts

@@ -1,21 +1,21 @@
-// noinspection ES6UnusedImports
-
-import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
-import * as DEF from '../../../def';
-import { keys } from '../../models';
-
-/** 请求参数. */
-export class GetLatestApkVersionQuery {}
-
-/**
- * 获取 APK 最新的版本号.
- *
- * @param config 请求配置.
- * @param option 请求选项.
- */
-export function GetLatestApkVersion(config?: IRequestConfig<GetLatestApkVersionQuery, {}>, option?: IRequestOptions): Promise<string> {
-    return httpClient().request({ method: GetLatestApkVersion.method, url: GetLatestApkVersion.url, ...(config ?? {}) }, option);
-}
-
-GetLatestApkVersion.method = 'GET' as const;
-GetLatestApkVersion.url = '/sys/common/getLatestApkVersion';
+// noinspection ES6UnusedImports
+
+import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
+import * as DEF from '../../../def';
+import { keys } from '../../models';
+
+/** 请求参数. */
+export class GetLatestApkVersionQuery {}
+
+/**
+ * 获取 APK 最新的版本号.
+ *
+ * @param config 请求配置.
+ * @param option 请求选项.
+ */
+export function GetLatestApkVersion(config?: IRequestConfig<GetLatestApkVersionQuery, {}>, option?: IRequestOptions): Promise<string> {
+    return httpClient().request({ method: GetLatestApkVersion.method, url: GetLatestApkVersion.url, ...(config ?? {}) }, option);
+}
+
+GetLatestApkVersion.method = 'GET' as const;
+GetLatestApkVersion.url = '/sys/common/getLatestApkVersion';

package/dist/api/WMS/Controllers/LoginController/GetUserInfo.ts

@@ -1,21 +1,21 @@
-// noinspection ES6UnusedImports
-
-import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
-import * as DEF from '../../../def';
-import { keys } from '../../models';
-
-/** 请求参数. */
-export class GetUserInfoQuery {}
-
-/**
- * 获取用户信息.
- *
- * @param config 请求配置.
- * @param option 请求选项.
- */
-export function GetUserInfo(config?: IRequestConfig<GetUserInfoQuery, {}>, option?: IRequestOptions): Promise<Record<any, any>> {
-    return httpClient().request({ method: GetUserInfo.method, url: GetUserInfo.url, ...(config ?? {}) }, option);
-}
-
-GetUserInfo.method = 'GET' as const;
-GetUserInfo.url = '/sys/getUserInfo';
+// noinspection ES6UnusedImports
+
+import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
+import * as DEF from '../../../def';
+import { keys } from '../../models';
+
+/** 请求参数. */
+export class GetUserInfoQuery {}
+
+/**
+ * 获取用户信息.
+ *
+ * @param config 请求配置.
+ * @param option 请求选项.
+ */
+export function GetUserInfo(config?: IRequestConfig<GetUserInfoQuery, {}>, option?: IRequestOptions): Promise<Record<any, any>> {
+    return httpClient().request({ method: GetUserInfo.method, url: GetUserInfo.url, ...(config ?? {}) }, option);
+}
+
+GetUserInfo.method = 'GET' as const;
+GetUserInfo.url = '/sys/getUserInfo';

package/dist/api/WMS/Controllers/LoginController/Logout.ts

@@ -1,21 +1,21 @@
-// noinspection ES6UnusedImports
-
-import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
-import * as DEF from '../../../def';
-import { keys } from '../../models';
-
-/** 请求参数. */
-export class LogoutQuery {}
-
-/**
- * 退出登录.
- *
- * @param config 请求配置.
- * @param option 请求选项.
- */
-export function Logout(config?: IRequestConfig<LogoutQuery, {}>, option?: IRequestOptions): Promise<Record<any, any>> {
-    return httpClient().request({ method: Logout.method, url: Logout.url, ...(config ?? {}) }, option);
-}
-
-Logout.method = 'GET' as const;
-Logout.url = '/sys/logout';
+// noinspection ES6UnusedImports
+
+import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
+import * as DEF from '../../../def';
+import { keys } from '../../models';
+
+/** 请求参数. */
+export class LogoutQuery {}
+
+/**
+ * 退出登录.
+ *
+ * @param config 请求配置.
+ * @param option 请求选项.
+ */
+export function Logout(config?: IRequestConfig<LogoutQuery, {}>, option?: IRequestOptions): Promise<Record<any, any>> {
+    return httpClient().request({ method: Logout.method, url: Logout.url, ...(config ?? {}) }, option);
+}
+
+Logout.method = 'GET' as const;
+Logout.url = '/sys/logout';

package/dist/api/WMS/Controllers/LoginController/index.ts

@@ -1,2 +1,2 @@
-export { GetUserInfo, GetUserInfoQuery } from './GetUserInfo';
-export { Logout, LogoutQuery } from './Logout';
+export { GetUserInfo, GetUserInfoQuery } from './GetUserInfo';
+export { Logout, LogoutQuery } from './Logout';

package/dist/api/WMS/Controllers/WorkstationController/index.ts

@@ -1 +1 @@
-export { List, ListQuery } from './List';
+export { List, ListQuery } from './List';

package/dist/api/WMS/Controllers/index.ts

@@ -1,4 +1,4 @@
-export * as CommonController from './CommonController';
-export * as LoginController from './LoginController';
-export * as WhController from './WhController';
-export * as WorkstationController from './WorkstationController';
+export * as CommonController from './CommonController';
+export * as LoginController from './LoginController';
+export * as WhController from './WhController';
+export * as WorkstationController from './WorkstationController';

package/dist/service/http-client.ts

@@ -4,6 +4,7 @@ import { KG_DYNAMIC_QUERY_OPERATOR, KG_HTTP_HEADERS } from '../const';
 import { useKgWarehouse } from '../component/KgWarehouse/index.hooks';
 import { useKgStation } from '../component/KgStation';
 import { isNil } from 'lodash-es';
+import dayjs from 'dayjs';
 
 /*
  * 对请求做统一的拦截.
@@ -11,7 +12,7 @@ import { isNil } from 'lodash-es';
 uni.addInterceptor('request', {
     invoke(args) {
         if (args?.isShowLoading !== false) {
-            uni.showLoading({});
+            uni.showLoading({ mask: true });
         }
 
         const appStore = useAppStore();
@@ -60,6 +61,8 @@ type IHttpClient = {
 
 /** 请求配置. */
 type IRequestOptions = Omit<UniApp.RequestOptions, 'url'> & {
+    $dayjs?: typeof dayjs;
+
     /**
      * 不放入 WHERE SQL 中的参数.
      */
@@ -220,6 +223,7 @@ const _httpClient: IHttpClient = {
                 }
 
                 const { sql, whereSql, orderBySql, offsetSql, operatorJSON } = Kg.getQueryHeaders({
+                    $dayjs: options?.$dayjs,
                     dynamicQueryExcludeProperties: options?.dynamicQueryExcludeProperties,
                     dynamicQueryOperatorModel: options?.dynamicQueryOperatorModel,
                     params: Kg.parseParams(params),

package/dist/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';
 
 /**
  * 通用工具.
@@ -195,11 +196,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 +213,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 +238,87 @@ 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 = _leftValue.format('YYYY-MM-DD HH:mm:ss');
+                                // 右侧日期的字符串
+                                let _rightStringValue = '';
+
+                                switch (true) {
+                                    // 左侧日期为空
+                                    case !_leftStringValue: {
+                                        _rightStringValue = _rightValue.format('YYYY-MM-DD HH:mm:ss');
+                                        break;
+                                    }
+
+                                    // 日期格式为 YYYY-MM-DD HH:mm:ss
+                                    case /\d\d-\d\d-\d\d \d\d:\d\d:\d\d/.test(_leftStringValue): {
+                                        if (_rightValue.isValid()) {
+                                            _rightStringValue = _rightValue.add(1, 'second').format('YYYY-MM-DD HH:mm:ss');
+                                        }
+                                        break;
+                                    }
+
+                                    // 日期格式为 YYYY-MM-DD
+                                    case /\d\d-\d\d-\d\d/.test(_leftStringValue): {
+                                        _leftStringValue = `${_leftStringValue} 00:00:00`;
+                                        if (_rightValue.isValid()) {
+                                            _rightStringValue = _rightValue.add(1, 'day').format('YYYY-MM-DD 00:00:00');
+                                        }
+                                        break;
+                                    }
+
+                                    // 日期格式为 HH:mm:ss
+                                    case /\d\d:\d\d:\d\d/.test(_leftStringValue): {
+                                        _leftStringValue = `1900-01-01 ${_leftStringValue}`;
+                                        if (_rightValue.isValid()) {
+                                            _rightStringValue = _rightValue.add(1, 'second').format('1900-01-01 HH:mm:ss');
+                                        }
+                                        break;
+                                    }
+                                }
+
+                                if (_leftStringValue) {
+                                    _stringValue += `(${_key} >= '${_leftStringValue}')`;
+                                }
+
+                                if (_rightStringValue) {
+                                    if (_stringValue) {
+                                        _stringValue += ' AND ';
+                                    }
+
+                                    _stringValue += `(${_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 +331,7 @@ export class Kg {
                     case typeof value === 'string': {
                         // 空白字符
                         if (value.trim() === '') {
-                            _paramsForWhereSql[key] = undefined;
+                            _paramsForQueryWhereSql[key] = undefined;
                             break;
                         }
 
@@ -291,7 +365,7 @@ export class Kg {
                             }
                         }
 
-                        _paramsForWhereSql[key] = _strValue;
+                        _paramsForQueryWhereSql[key] = _strValue;
 
                         break;
                     }
@@ -333,7 +407,7 @@ export class Kg {
                             }
                         }
 
-                        _paramsForWhereSql[key] = _strValue;
+                        _paramsForQueryWhereSql[key] = _strValue;
 
                         break;
                     }
@@ -355,14 +429,14 @@ export class Kg {
                             }
                         }
 
-                        _paramsForWhereSql[key] = _strValue;
+                        _paramsForQueryWhereSql[key] = _strValue;
 
                         break;
                     }
 
                     // null, undefined
                     default: {
-                        _paramsForWhereSql[key] = value;
+                        _paramsForQueryWhereSql[key] = value;
 
                         break;
                     }
@@ -370,7 +444,7 @@ export class Kg {
             });
 
         const whereSqlSegment = reduce(
-            _paramsForWhereSql,
+            _paramsForQueryWhereSql,
             (sql, value) => {
                 if (!value) {
                     return sql;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kengic/uni",
-    "version": "0.6.3-beta.23",
+    "version": "0.6.3-beta.24",
     "scripts": {
         "build": "npm run use-node && rimraf dist && vue-tsc && vite build",
         "------ -------------------------------------------": "",
@@ -40,6 +40,7 @@
         "@vueuse/shared": "8.9.4",
         "ant-design-vue": "3.2.20",
         "chalk": "4.1.2",
+        "dayjs": "1.11.10",
         "less": "4.1.3",
         "lodash-es": "4.17.21",
         "pinia": "2.0.35",