@kengic/uni 0.6.3-beta.3 → 0.6.3-beta.30

package/dist/component/KgStation/KgStation.vue

@@ -3,7 +3,17 @@
         <UniPopupDialog :before-close="true" title="选择工作站" @close="onClose" @confirm="onOk">
             <div class="row">
                 <div class="label">工作站:</div>
-                <div class="value">
+                <div class="value devcod">
+                    <UniEasyinput
+                        v-model="devcodInputValue"
+                        :focus="isFocusMap.devcodInputValue"
+                        :placeholder="currentDevcodDsc"
+                        :placeholder-style="devcodPlaceholderStyle"
+                        trim
+                        @blur="onDevcodInputValueBlur"
+                        @focus="onDevcodInputValueFocus"
+                        @confirm="findDevmstByInputValue"
+                    />
                     <UniDataSelect :localdata="stationDatas" v-model="currentDevcod" :clear="true" />
                 </div>
             </div>
@@ -18,8 +28,8 @@
 </template>
 
 <script lang="ts" setup>
-    import { UniDataSelect, UniPopup, UniPopupDialog } from '../../uni';
-    import { computed, ref, watch } from 'vue';
+    import { UniDataSelect, UniEasyinput, UniPopup, UniPopupDialog } from '../../uni';
+    import { computed, nextTick, ref, watch } from 'vue';
     import { useKgStation } from './index.hooks';
     import { WorkstationDTO } from '../../api/WMS/models';
     import { API } from '../../api';
@@ -41,24 +51,46 @@
     /** 所有工作站. */
     const stations = ref<Array<WorkstationDTO>>([]);
 
+    /**
+     * 工作站的输入框输入的值, 当输入框失去焦点或者回车时, 会根据这个值去匹配工作站编号, 如果匹配成功, 则选中该匹配的工作站, 否则清空该值并提升工作站不存在.
+     */
+    const devcodInputValue = ref('');
+
+    /**
+     * 工作站的输入框的占位符字符的样式.
+     */
+    const devcodPlaceholderStyle = ref('color: #3ee');
+
     /**
      * 工作站下拉列表.
      */
-    const stationDatas = computed<Array<{ value: string; text: string }>>(() => stations.value.map((i) => ({ text: i.devcod ?? '', value: i.devcod ?? '' })));
+    const stationDatas = computed<Array<{ text: string; value: string }>>(() =>
+        stations.value.map((i) => ({ text: i.devcodDsc ?? i.devcod ?? '', value: i.devcod ?? '' })),
+    );
 
     /**
      * 工作区下拉列表.
      */
-    const areaDatas = computed<Array<{ value: string; text: string }>>(
+    const areaDatas = computed<Array<{ text: string; value: string }>>(
         () =>
             stations.value
                 .find((i) => i.devcod === currentDevcod.value)
-                ?.workstationAreas?.map((i) => ({
+                ?.workstationAndAreaRelationshipDTOList?.map((i) => ({
                     text: i.wrkareDsc ?? i.wrkare ?? '',
                     value: i.wrkare ?? '',
                 })) ?? [],
     );
 
+    /**
+     * 当前选择的工作站编号的描述.
+     */
+    const currentDevcodDsc = computed(() => stationDatas.value.find((i) => i.value === currentDevcod.value)?.text ?? '');
+
+    /**
+     * <p>是否聚焦.</p>
+     * <p>每个 key 对应一个输入框, 每个 value 表示该输入框当前是否聚焦.</p>
+     */
+    const isFocusMap = ref({ devcodInputValue: true });
     // ----------------------------------------------------------------------------------------------------
     //endregion
 
@@ -69,12 +101,10 @@
         if (!value) {
             currentHmewrkare.value = '';
         } else {
-            console.log('11', value, currentDevcod.value);
             // 当「当前选择的工作站编号」变更时, 选择它的默认的工作区,
             const currentStation = stations.value.find((i) => i.devcod === currentDevcod.value);
             if (currentStation) {
                 currentHmewrkare.value = currentStation.hmewrkare ?? '';
-                console.log('22', currentHmewrkare.value);
             }
         }
     });
@@ -83,6 +113,57 @@
 
     //region FUNCTION
     // ----------------------------------------------------------------------------------------------------
+    /**
+     * 设置聚焦.
+     *
+     * @param key 要聚焦哪个输入框.
+     */
+    function setFocus(key: string) {
+        // 错误的输入框,
+        if (!key || !(key in isFocusMap.value)) {
+            return;
+        }
+
+        Object.keys(isFocusMap.value).forEach((key) => (isFocusMap.value[key] = false));
+        nextTick().then(() => (isFocusMap.value[key] = true));
+    }
+
+    /**
+     * 工作站的输入框失去焦点.
+     */
+    async function onDevcodInputValueBlur() {
+        devcodPlaceholderStyle.value = 'color: #333';
+
+        await nextTick();
+        await findDevmstByInputValue();
+    }
+
+    /**
+     * 工作站的输入框聚焦.
+     */
+    function onDevcodInputValueFocus() {
+        devcodPlaceholderStyle.value = 'color: #999';
+    }
+
+    /**
+     * 根据输入的值(作为工作站编号), 查找工作站.
+     */
+    async function findDevmstByInputValue() {
+        if (!devcodInputValue.value) {
+            return;
+        }
+
+        const station = stations.value.find((i) => i.devcod === devcodInputValue.value);
+        if (station) {
+            currentDevcod.value = devcodInputValue.value;
+            devcodInputValue.value = '';
+        } else {
+            devcodInputValue.value = '';
+            await uni.showToast({ icon: 'none', title: '工作站不存在' });
+            setFocus('devcodInputValue');
+        }
+    }
+
     /**
      * 取消.
      */
@@ -121,7 +202,15 @@
      */
     async function requestStations(): Promise<void> {
         try {
-            stations.value = (await API.WMS.WorkstationController.List({ params: { pageNo: 1, pageSize: 999 } }))?.records ?? [];
+            stations.value =
+                (
+                    await API.WMS.WorkstationController.List({
+                        params: {
+                            pageNo: 1,
+                            pageSize: 999,
+                        },
+                    })
+                )?.records ?? [];
         } catch (e) {
             console.error(e);
         }
@@ -133,7 +222,12 @@
 </script>
 
 <style scoped>
+    :deep(.uni-popup__wrapper) {
+        width: calc(100% - 8px);
+    }
+
     :deep(.uni-popup-dialog) {
+        width: 100%;
         font-size: 13px;
     }
 
@@ -173,4 +267,21 @@
         flex: 1;
         min-width: 0;
     }
+
+    :deep(.uni-popup-dialog) .uni-dialog-content > .row > .value.devcod {
+        position: relative;
+    }
+
+    :deep(.uni-popup-dialog) .uni-dialog-content > .row > .value.devcod > .uni-easyinput {
+        color: rgb(51, 51, 51);
+        position: absolute;
+        left: 0;
+        top: 0;
+        z-index: 2;
+        width: calc(100% - 26px);
+    }
+
+    :deep(.uni-popup-dialog) .uni-dialog-content > .row > .value.devcod > .uni-easyinput > .uni-easyinput__content {
+        border-radius: 3px 0 0 3px;
+    }
 </style>

package/dist/const/index.vm.ts

@@ -66,4 +66,14 @@ export enum KG_HTTP_HEADERS {
      * 仓库编号.
      */
     KG_WAREHOUSE = 'Kg-Warehouse',
+
+    /**
+     * 工作站.
+     */
+    KG_WORK_STATION = 'Kg-Work-Station',
+
+    /**
+     * 工作区.
+     */
+    KG_WORK_AREA = 'Kg-Work-Area',
 }

package/dist/index.css

@@ -2,13 +2,32 @@ uni-button {
     border-radius: 3px !important;
 }
 
+uni-button:after {
+    border-radius: 6px !important;
+}
+
 .kg-tab-bar-sibling {
     padding-bottom: 50px !important;
 }
 
-.uni-simple-toast__text {
-    padding: 6.5px 12px 9.5px 12px;
+:deep(uni-toast) {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+:deep(uni-toast) .uni-sample-toast {
+    max-width: calc(100% - 6px);
+    position: relative;
+    top: initial;
+    left: initial;
+    transform: translate(0, 0);
+}
+
+:deep(uni-toast) .uni-sample-toast .uni-simple-toast__text {
+    padding: 7px 8px 9px 8px;
     border-radius: 4px;
+    background-color: rgba(17, 17, 17, 0.9);
 }
 
 /* #ifdef H5 */

package/dist/service/http-client.ts

@@ -2,18 +2,23 @@ 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 支持其他语言
+        // TODO LT 支持其他语言
         args.header['Accept-Language'] = 'zh_CN'.replace('_', '-');
         args.header['X-Access-Token'] = appStore.getToken;
 
@@ -29,7 +34,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 +61,8 @@ type IHttpClient = {
 
 /** 请求配置. */
 type IRequestOptions = Omit<UniApp.RequestOptions, 'url'> & {
+    $dayjs?: typeof dayjs;
+
     /**
      * 不放入 WHERE SQL 中的参数.
      */
@@ -68,9 +75,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 +125,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 +161,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 +192,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 +210,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 +277,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/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 {

package/dist/uni/uni-ui/uni-datetime-picker/uni-datetime-picker.vue

@@ -817,7 +817,7 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: center;
-		border-radius: 4px;
+		border-radius: 3px;
 		background-color: #fff;
 		color: #666;
 		font-size: 14px;
@@ -837,7 +837,7 @@
 
 	.uni-date-x--border {
 		box-sizing: border-box;
-		border-radius: 4px;
+		border-radius: 3px;
 		border: 1px solid #e5e5e5;
 	}
 
@@ -907,7 +907,7 @@
 		z-index: 999;
 		border: 1px solid #EBEEF5;
 		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-		border-radius: 4px;
+		border-radius: 3px;
 	}
 
 	.uni-date-range--x {
@@ -917,7 +917,7 @@
 		z-index: 999;
 		border: 1px solid #EBEEF5;
 		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-		border-radius: 4px;
+		border-radius: 3px;
 	}
 
 	.uni-date-editor--x__disabled {

package/dist/uni/uni-ui/uni-easyinput/common.js

@@ -23,6 +23,7 @@ export const debounce = function (func, wait = 1000, immediate = true) {
         }
     };
 };
+
 /**
  * @desc 函数节流
  * @param func 函数