@kengic/uni 0.6.3-beta.4 → 0.6.3-beta.41

package/{dist/service → service}/http-client.ts

@@ -2,19 +2,26 @@ import { useAppStore } from '../store/app.store';
 import { Kg } from '../util';
 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';
 
 /*
  * 对请求做统一的拦截.
  */
 uni.addInterceptor('request', {
     invoke(args) {
-        uni.showLoading({});
+        if (args?.isShowLoading !== false) {
+            uni.showLoading({ mask: true });
+        }
 
         const appStore = useAppStore();
 
         args.header['Authorization'] = appStore.getToken;
-        // TODO 支持其他语言
-        args.header['Accept-Language'] = 'zh_CN'.replace('_', '-');
+        // TODO LT 支持其他语言
+        if (!args.header['Accept-Language']) {
+            args.header['Accept-Language'] = appStore.getLocale?.replace('_', '-');
+        }
         args.header['X-Access-Token'] = appStore.getToken;
 
         if (!args.url?.startsWith('http')) {
@@ -29,7 +36,7 @@ uni.addInterceptor('request', {
             args.data = keys.map((i) => args.data[i]);
         }
 
-        args.data = Kg.parseParams(args.data);
+        args.data = Kg.parseParams(null, args.data);
     },
     success(args) {
         uni.hideLoading();
@@ -56,6 +63,8 @@ type IHttpClient = {
 
 /** 请求配置. */
 type IRequestOptions = Omit<UniApp.RequestOptions, 'url'> & {
+    $dayjs?: typeof dayjs;
+
     /**
      * 不放入 WHERE SQL 中的参数.
      */
@@ -68,9 +77,27 @@ type IRequestOptions = Omit<UniApp.RequestOptions, 'url'> & {
      */
     dynamicQueryOperatorModel?: Record<string, KG_DYNAMIC_QUERY_OPERATOR>;
 
-    /** 是否不显示错误消息提示. */
+    /**
+     * 是否显示加载提示.
+     *
+     * @default true
+     */
+    isShowLoading?: boolean;
+
+    /**
+     * 是否不显示错误消息提示.
+     *
+     * @default false
+     */
     isSuppressError?: boolean;
 
+    /**
+     * 是否不显示成功消息提示.
+     *
+     * @default false
+     */
+    isSuppressSuccess?: boolean;
+
     /** 是否处理请求结果. */
     isTransformResponse?: boolean;
 
@@ -100,6 +127,13 @@ function handleSuccess<T = any>(
     reject: (reason?: any) => void,
     options?: IRequestOptions,
 ) {
+    // 显示后端成功消息
+    if (!options?.isSuppressSuccess) {
+        if ((response.data as any).message) {
+            uni.showToast({ duration: 1000 * 3, icon: 'none', title: (response.data as any).message });
+        }
+    }
+
     if (options?.isTransformResponse === false) {
         resolve(response.data as any);
     } else {
@@ -129,7 +163,7 @@ function handleError<T = any>(
     if (!isSuppressError) {
         // @ts-ignore
         const message = (response.data as any)?.message || response?.errMsg || '请求出错';
-        uni.showToast({ title: message, icon: 'none', duration: 3000 });
+        uni.showToast({ duration: 3000, icon: 'none', title: message });
     }
 
     reject(response);
@@ -160,14 +194,15 @@ const _httpClient: IHttpClient = {
             if (['POST', 'PUT', 'DELETE'].includes(method) && params) {
                 try {
                     const queryString = Object.keys(params)
-                        // @ts-ignore
-                        .map((i) => i + '=' + options.params[i])
+                        // 值为 null/undefined 的参数, 不需要放到 query 参数中去,
+                        .filter((i) => !isNil(params[i]))
+                        .map((i) => i + '=' + params[i])
                         .join('&');
                     if (queryString) {
                         _url += '?' + queryString;
                     }
                 } catch (e) {
-                    console.log(e);
+                    console.error(e);
                 }
             }
 
@@ -177,61 +212,66 @@ const _httpClient: IHttpClient = {
                 header = {};
             }
 
-            const KG_IS_DYNAMIC_QUERY = KG_HTTP_HEADERS.KG_IS_DYNAMIC_QUERY;
-            const KG_QUERY_WHERE_SQL = KG_HTTP_HEADERS.KG_QUERY_WHERE_SQL;
-            const KG_QUERY_ORDER_BY_SQL = KG_HTTP_HEADERS.KG_QUERY_ORDER_BY_SQL;
-            const KG_QUERY_OFFSET_SQL = KG_HTTP_HEADERS.KG_QUERY_OFFSET_SQL;
-            const KG_QUERY_SQL = KG_HTTP_HEADERS.KG_QUERY_SQL;
-            const KG_QUERY_OPERATOR = KG_HTTP_HEADERS.KG_QUERY_OPERATOR;
-
             // 启用高级查询
             if (options?.dynamicQueryOperatorModel) {
                 let params: any = {};
 
-                if (config.method === 'GET') {
-                    params = config.params;
-                } else if (config.method === 'POST' && !config.data && config.params) {
-                    params = config.params;
-                } else if (config.method === 'POST' && config.data) {
-                    params = config.data;
+                switch (config.method) {
+                    case 'GET': {
+                        if (config.params) {
+                            params = config.params;
+                            break;
+                        }
+
+                        if (config.data && !config.params) {
+                            params = config.data;
+                            break;
+                        }
+
+                        break;
+                    }
+
+                    case 'POST': {
+                        if (config.data) {
+                            params = config.data;
+                            break;
+                        }
+
+                        if (!config.data && config.params) {
+                            params = config.params;
+                            break;
+                        }
+
+                        break;
+                    }
                 }
 
                 const { sql, whereSql, orderBySql, offsetSql, operatorJSON } = Kg.getQueryHeaders({
+                    $dayjs: options?.$dayjs,
                     dynamicQueryExcludeProperties: options?.dynamicQueryExcludeProperties,
                     dynamicQueryOperatorModel: options?.dynamicQueryOperatorModel,
-                    params: params,
+                    params: Kg.parseParams(options?.$dayjs, params),
                 });
 
                 header = {
                     ...(header ?? {}),
-                    [KG_IS_DYNAMIC_QUERY]: true,
-                    [KG_QUERY_OFFSET_SQL]: offsetSql,
-                    [KG_QUERY_OPERATOR]: operatorJSON,
-                    [KG_QUERY_ORDER_BY_SQL]: orderBySql,
-                    [KG_QUERY_SQL]: sql,
-                    [KG_QUERY_WHERE_SQL]: whereSql,
+                    [KG_HTTP_HEADERS.KG_IS_DYNAMIC_QUERY]: true,
+                    [KG_HTTP_HEADERS.KG_QUERY_OFFSET_SQL]: offsetSql,
+                    [KG_HTTP_HEADERS.KG_QUERY_OPERATOR]: operatorJSON,
+                    [KG_HTTP_HEADERS.KG_QUERY_ORDER_BY_SQL]: orderBySql,
+                    [KG_HTTP_HEADERS.KG_QUERY_SQL]: sql,
+                    [KG_HTTP_HEADERS.KG_QUERY_WHERE_SQL]: whereSql,
                 };
             }
 
-            if (header[KG_QUERY_WHERE_SQL]) {
-                header[KG_QUERY_WHERE_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG_QUERY_WHERE_SQL])));
-            }
-
-            if (header[KG_QUERY_ORDER_BY_SQL]) {
-                header[KG_QUERY_ORDER_BY_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG_QUERY_ORDER_BY_SQL])));
-            }
-
-            if (header[KG_QUERY_OFFSET_SQL]) {
-                header[KG_QUERY_OFFSET_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG_QUERY_OFFSET_SQL])));
-            }
-
-            if (header[KG_QUERY_SQL]) {
-                header[KG_QUERY_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG_QUERY_SQL])));
-            }
+            header[KG_HTTP_HEADERS.KG_QUERY_WHERE_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG_HTTP_HEADERS.KG_QUERY_WHERE_SQL] ?? '')));
+            header[KG_HTTP_HEADERS.KG_QUERY_ORDER_BY_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG_HTTP_HEADERS.KG_QUERY_ORDER_BY_SQL] ?? '')));
+            header[KG_HTTP_HEADERS.KG_QUERY_OFFSET_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG_HTTP_HEADERS.KG_QUERY_OFFSET_SQL] ?? '')));
+            header[KG_HTTP_HEADERS.KG_QUERY_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG_HTTP_HEADERS.KG_QUERY_SQL] ?? '')));
 
-            // 仓库编号
-            const warehouseId = useKgWarehouse().warehouse.value?.whId ?? '';
-            header[KG_HTTP_HEADERS.KG_WAREHOUSE] = encodeURIComponent(warehouseId);
+            header[KG_HTTP_HEADERS.KG_WAREHOUSE] = encodeURIComponent(useKgWarehouse().warehouse.value?.whId ?? '');
+            header[KG_HTTP_HEADERS.KG_WORK_STATION] = encodeURIComponent(useKgStation().station.value?.devcod ?? '');
+            header[KG_HTTP_HEADERS.KG_WORK_AREA] = encodeURIComponent(useKgStation().station.value?.hmewrkare ?? '');
 
             uni.request({
                 ...(options ?? {}),
@@ -239,31 +279,37 @@ const _httpClient: IHttpClient = {
                 url: _url,
                 header: header,
                 data: { ...(params ?? {}), ...(data ?? {}) },
+                // 超时时间, 单位毫秒, 默认 60 秒,
+                timeout: 1000 * 60 * 60,
                 success(response) {
                     switch (response.statusCode) {
                         case 200:
                             if (typeof response.data === 'string') {
                                 // 接口返回的数据是 HTML, 退出登录
                                 if (response.data.startsWith('<!DOCTYPE')) {
-                                    // store.dispatch('logout');
                                 }
                             } else if (response.data instanceof ArrayBuffer) {
+                                // 文件
                             } else {
-                                // 处理自定义的错误码
-                                switch (response.data.code) {
-                                    case 0:
-                                    case 200:
-                                        handleSuccess<T>(response as any, resolve, reject, options);
-                                        break;
-
-                                    case 405:
-                                        response.data.message = `${response.data.code}: ${response.data.message}`;
-                                        handleError<T>(response, resolve, reject, options?.isSuppressError ?? false);
-                                        break;
-
-                                    case 500:
-                                        handleError<T>(response, resolve, reject, options?.isSuppressError ?? false);
-                                        break;
+                                if (response.data.success === false) {
+                                    handleError<T>(response, resolve, reject, options?.isSuppressError ?? false);
+                                } else {
+                                    // 处理自定义的错误码
+                                    switch (response.data.code) {
+                                        case 0:
+                                        case 200:
+                                            handleSuccess<T>(response as any, resolve, reject, options);
+                                            break;
+
+                                        case 405:
+                                            response.data.message = `${response.data.code}: ${response.data.message}`;
+                                            handleError<T>(response, resolve, reject, options?.isSuppressError ?? false);
+                                            break;
+
+                                        case 500:
+                                            handleError<T>(response, resolve, reject, options?.isSuppressError ?? false);
+                                            break;
+                                    }
                                 }
                             }
                             break;

package/{dist/store → store}/app.store.ts

@@ -10,6 +10,9 @@ interface IAppState {
     /** 是否取消本次升级. 取消之后, 使用应用期间不会再提示升级, 直到下次重新打开应用才会提示升级. */
     isUpdateCancel: boolean;
 
+    /** 当前语言. */
+    locale: string;
+
     /** 登录令牌. */
     token: string;
 
@@ -73,6 +76,10 @@ export const useAppStore = defineStore('app', {
             this.isUpdateCancel = value;
         },
 
+        setLocale(value: string) {
+            this.locale = value;
+        },
+
         setToken(token: string) {
             uni.setStorageSync(STORAGE_KEYS.TOKEN, token);
             this.token = token;
@@ -94,6 +101,10 @@ export const useAppStore = defineStore('app', {
             return state.isUpdateCancel;
         },
 
+        getLocale(state) {
+            return state.locale ?? 'zh_CN';
+        },
+
         /** 登录令牌. */
         getToken(state) {
             return state.token;
@@ -111,6 +122,7 @@ export const useAppStore = defineStore('app', {
     state: (): IAppState => ({
         apiUrl: uni.getStorageSync(STORAGE_KEYS.API_URL) ?? '',
         isUpdateCancel: false,
+        locale: 'zh_CN',
         token: uni.getStorageSync(STORAGE_KEYS.TOKEN) ?? '',
         user: uni.getStorageSync(STORAGE_KEYS.USER) ?? {},
         userWarehouses: undefined,

package/{dist/uni → uni}/uni-ui/uni-data-select/uni-data-select.vue

@@ -7,7 +7,7 @@
                     <view v-if="current" class="uni-select__input-text">{{ textShow }}</view>
                     <view v-else class="uni-select__input-text uni-select__input-placeholder">{{ typePlaceholder }} </view>
                     <view v-if="current && clear && !disabled" @click.stop="clearVal">
-                        <uni-icons type="clear" color="#c0c4cc" size="14" />
+                        <uni-icons type="clear" color="#c0c4cc" size="16" />
                     </view>
                     <view v-else style="display: flex; align-items: center; justify-content: center">
                         <view :class="showSelector ? 'ant-design--caret-up-filled' : 'ant-design--caret-down-filled'" />
@@ -140,7 +140,7 @@
             textShow() {
                 // 长文本显示
                 let text = this.current;
-                if (text.length > 10) {
+                if (text.length > 999) {
                     return text.slice(0, 25) + '...';
                 }
                 return text;
@@ -148,9 +148,9 @@
             getOffsetByPlacement() {
                 switch (this.placement) {
                     case 'top':
-                        return 'bottom:calc(100% + 2px);box-shadow: 0 -3px 6px -4px rgba(0, 0, 0, 0.12), 0 -6px 16px 0 rgba(0, 0, 0, 0.08), 0 -9px 28px 8px rgba(0, 0, 0, 0.05);';
+                        return 'bottom:calc(100% + 1px);box-shadow: 0 -3px 6px -4px rgba(0, 0, 0, 0.12), 0 -6px 16px 0 rgba(0, 0, 0, 0.08), 0 -9px 28px 8px rgba(0, 0, 0, 0.05);';
                     case 'bottom':
-                        return 'top:calc(100% + 2px);box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);';
+                        return 'top:calc(100% + 1px);box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);';
                 }
             },
         },
@@ -399,6 +399,7 @@
         flex: 1;
         flex-direction: row;
         align-items: center;
+        overflow: hidden;
     }
 
     .uni-select__input {