@kengic/uni 0.6.2 → 0.6.3-beta.1

package/dist/component/KgStation/index.hooks.ts

@@ -0,0 +1,61 @@
+import { computed, ComputedRef } from 'vue';
+import { IKgStationStore, useKgStationStore, WorkstationDTO, WorkstationAreaDTO } from './index.store';
+import { useKgWarehouse } from '../KgWarehouse';
+
+export type IUseKgStation = {
+    /**
+     * 当前工作区.
+     */
+    area: ComputedRef<WorkstationAreaDTO | null>;
+
+    /**
+     * 当前工作站.
+     */
+    station: ComputedRef<WorkstationDTO | null>;
+
+    /**
+     * 所有工作站.
+     */
+    stations: ComputedRef<IKgStationStore['getStations']>;
+
+    store: IKgStationStore;
+};
+
+export function useKgStation(): IUseKgStation {
+    const store = useKgStationStore();
+
+    const kgWarehouse = useKgWarehouse();
+
+    const station = computed<WorkstationDTO | null>(() => {
+        if (!store.getStation) {
+            return null;
+        }
+
+        //region 如果当前工作站(可能来自浏览器的缓存)不在工作站列表中(比如数据库中的工作站有变更), 或者当前工作站不属于当前仓库,  则返回 null, 表示需要重新选择工作站,
+        // ----------------------------------------------------------------------------------------------------
+
+        // 当前工作站编号
+        const currentDevcod = store.getStation?.devcod;
+
+        // 如果 store.getStations 为 undefined, 表示「所有工作站」尚未完成查询,
+        if (store.getStations !== undefined && !store.getStations?.find((i) => i.devcod === currentDevcod)) {
+            return null;
+        }
+
+        if (store.getStation.whId !== kgWarehouse.warehouse.value?.whId) {
+            return null;
+        }
+
+        // ----------------------------------------------------------------------------------------------------
+        //endregion
+
+        return store.getStation;
+    });
+
+    return {
+        area: computed(() => station.value?.workstationAreas?.find((i) => i.wrkare === station.value?.hmewrkare) ?? null),
+        station: station,
+        stations: computed(() => store.getStations),
+        store: store,
+    };
+}

package/dist/component/KgStation/index.store.ts

@@ -0,0 +1,111 @@
+import { defineStore, StoreDefinition } from 'pinia';
+import { toRaw, unref } from 'vue';
+
+const LOCAL_STORAGE_KEY = 'KgStation.station';
+
+export type WorkstationDTO = {
+    id?: string;
+    whId?: string;
+    devcod?: string;
+    devcodDsc?: string;
+    hmewrkare?: string;
+    workstationAreas?: Array<WorkstationAreaDTO>;
+};
+
+export type WorkstationAreaDTO = {
+    id?: string;
+    whId?: string;
+    wrkare?: string;
+    wrkareDsc?: string;
+};
+export interface IKgStationState {
+    /**
+     * 当前工作站.
+     */
+    station: WorkstationDTO | null;
+
+    /**
+     * 所有工作站.
+     */
+    stations: Array<WorkstationDTO> | undefined;
+}
+
+export interface IKgStationGetters {
+    getStation: WorkstationDTO | null;
+
+    getStations: Array<WorkstationDTO> | undefined;
+}
+
+export interface IKgStationActions {
+    /**
+     * 查询所有工作站.
+     */
+    requestStations(): Promise<void>;
+
+    setStation(station?: WorkstationDTO | null): void;
+}
+
+export type IUseKgStationStore = StoreDefinition<'KgStation', IKgStationState, IKgStationGetters, IKgStationActions>;
+
+export type IKgStationStore = ReturnType<IUseKgStationStore>;
+
+export const useKgStationStore = defineStore('KgStation', {
+    actions: {
+        async requestStations(): Promise<void> {
+            // 已经有值, 说明已经查询过了, 不做操作,
+            if (this.stations) {
+                return;
+            }
+
+            // TODO 调用接口获取所有工作站
+            this.stations = [
+                {
+                    whId: 'WMD1',
+                    devcod: 'AAA',
+                    devcodDsc: 'AAA',
+                    hmewrkare: 'A111',
+                    workstationAreas: [
+                        { wrkare: 'A111', wrkareDsc: 'A111' },
+                        { wrkare: 'A222', wrkareDsc: 'A222' },
+                    ],
+                },
+                {
+                    whId: 'WMD1',
+                    devcod: 'BBB',
+                    devcodDsc: 'BBB',
+                    hmewrkare: 'B222',
+                    workstationAreas: [
+                        { wrkare: 'B111', wrkareDsc: 'B111' },
+                        { wrkare: 'B222', wrkareDsc: 'B222' },
+                    ],
+                },
+            ];
+        },
+
+        setStation(station?: WorkstationDTO | null): void {
+            // 未选择工作站
+            if (!station) {
+                this.station = null;
+                uni.setStorageSync(LOCAL_STORAGE_KEY, null);
+            }
+            // 有选择工作站
+            else {
+                this.station = toRaw(unref(station));
+                uni.setStorageSync(LOCAL_STORAGE_KEY, this.station);
+            }
+        },
+    },
+    getters: {
+        getStation(): WorkstationDTO | null {
+            return this.station ?? null;
+        },
+
+        getStations(): Array<WorkstationDTO> | undefined {
+            return this.stations;
+        },
+    },
+    state: (): IKgStationState => ({
+        station: uni.getStorageSync(LOCAL_STORAGE_KEY) || null,
+        stations: undefined,
+    }),
+});

package/dist/component/KgStation/index.ts

@@ -0,0 +1,4 @@
+export { default as KgStation } from './KgStation.vue';
+
+export * from './index.hooks';
+export * from './index.store';

package/dist/component/KgTabBar/KgTabBar.vue

@@ -5,7 +5,7 @@
             <text class="text">首页</text>
         </view>
 
-        <view :class="{ active: page?.route === 'pages/my/index' }" class="item" @tap.stop="goto('pages/my/index')">
+        <view :class="{ active: page?.route === 'pages/my/My' }" class="item" @tap.stop="goto('pages/my/My')">
             <UniIcons :type="'person'" size="24"></UniIcons>
             <text class="text">我的</text>
         </view>
@@ -39,7 +39,7 @@
     const page = Kg.getCurrentPage();
 
     function goto(path: string) {
-        if (path != 'pages/my/index') {
+        if (path != 'pages/my/My') {
             uni.redirectTo({ url: '/' + path });
         } else {
             uni.navigateTo({ url: '/' + path });

package/dist/component/KgWarehouse/KgWarehouse.vue

@@ -1,7 +1,7 @@
 <template>
     <UniPopup ref="popupRef" :type="'dialog'">
         <UniPopupDialog :before-close="true" title="选择仓库" @confirm="onOk">
-            <UniDataCheckbox v-model="whID" :localdata="datas" />
+            <UniDataCheckbox v-model="currentWhId" :localdata="warehouseDatas" />
         </UniPopupDialog>
     </UniPopup>
 </template>
@@ -9,25 +9,30 @@
 <script lang="ts" setup>
     import { UniDataCheckbox, UniPopup, UniPopupDialog } from '../../uni';
     import { API } from '../../api';
-    import { ref } from 'vue';
-    import { WhDTO } from '../../api/WMS/models';
+    import { computed, ref } from 'vue';
+    import { SysUserWarehouseDTO, WhDTO } from '../../api/WMS/models';
     import { useKgWarehouse } from './index.hooks';
+    import { useAppStore } from '../../store/app.store';
+    import { Kg } from '../../util';
 
     const emit = defineEmits(['ok']);
 
+    const appStore = useAppStore();
     const kgWarehouse = useKgWarehouse();
 
     const popupRef = ref<any>(null);
     /** 当前选择的仓库编号. */
-    const whID = ref<string>('');
+    const currentWhId = ref<string>('');
     /** 仓库列表. */
-    let warehouses: Array<WhDTO> = [];
+    const warehouses = ref<Array<WhDTO>>([]);
     /** 选项列表. */
-    const datas = ref<Array<{ value: string; text: string }>>([]);
+    const warehouseDatas = ref<Array<{ text: string; value: string }>>([]);
+    /** 用户仓库列表. */
+    const userWarehouses = computed<Array<SysUserWarehouseDTO>>(() => appStore.getUserWarehouses);
 
     /** 确定. */
     function onOk() {
-        kgWarehouse.store.setWarehouse(warehouses.find((i) => i.whId === whID.value));
+        kgWarehouse.store.setWarehouse(warehouses.value.find((i) => i.whId === currentWhId.value));
         popupRef.value?.close();
         emit('ok');
     }
@@ -35,30 +40,36 @@
     /** 打开弹窗. */
     function open() {
         popupRef.value?.open();
-        read();
+        requestWarehouses();
     }
 
     /** 查询仓库列表. */
-    async function read(): Promise<void> {
+    async function requestWarehouses(): Promise<void> {
         try {
             const { records } = await API.WMS.WhController.ListVO({ params: { pageNo: 1, pageSize: 999 } });
-            warehouses = records ?? [];
-            datas.value = warehouses.map((i: WhDTO) => ({
-                value: i.whId ?? '',
+            warehouses.value = (records ?? []).filter((i) => {
+                // 管理员拥有所有仓库
+                if (Kg.isAdminUser()) {
+                    return true;
+                }
+
+                return userWarehouses.value?.find((j) => j.wh_id === i.whId);
+            });
+
+            warehouseDatas.value = warehouses.value.map((i: WhDTO) => ({
                 text: `${i.whDsc ?? ' '} - ${i.whId ?? ' '}`,
+                value: i.whId ?? '',
             }));
 
-            const currentWarehouse = warehouses.find((i) => kgWarehouse.warehouse.value?.whId === i.whId);
+            const currentWarehouse = warehouses.value.find((i) => i.whId === kgWarehouse.warehouse.value?.whId) ?? null;
             // 如果当前仓库不为空, 且有效(存在于当前仓库列表中), 则继续使用
             if (currentWarehouse) {
-                whID.value = currentWarehouse.whId ?? '';
+                currentWhId.value = currentWarehouse.whId ?? '';
             }
             // 否则, 清空当前仓库, 并默认选中第一个仓库
             else {
                 kgWarehouse.store.setWarehouse(null);
-                if (warehouses.length > 0) {
-                    whID.value = warehouses[0].whId ?? '';
-                }
+                currentWhId.value = warehouses.value[0]?.whId ?? '';
             }
         } catch (e) {
             console.error(e);
@@ -68,20 +79,26 @@
     defineExpose({ open });
 </script>
 
-<style scoped lang="scss">
-    :deep {
-        .uni-dialog-button-group > .uni-dialog-button:first-child {
-            display: none;
-        }
+<style scoped>
+    :deep(.uni-popup-dialog) {
+        font-size: 13px;
+    }
 
-        .uni-dialog-button-group > .uni-dialog-button:last-child {
-            border-left-width: 0px !important;
-        }
+    :deep(.uni-popup-dialog) .uni-dialog-content {
+        padding: 0 6px;
+    }
 
-        .uni-label-pointer {
-            width: 100%;
-            margin: 0 !important;
-            padding: 12px 0 !important;
-        }
+    :deep(.uni-popup-dialog) .uni-dialog-button-group > .uni-dialog-button:first-child {
+        display: none;
+    }
+
+    :deep(.uni-popup-dialog) .uni-dialog-button-group > .uni-dialog-button:last-child {
+        border-left-width: 0px !important;
+    }
+
+    :deep(.uni-popup-dialog) .uni-label-pointer {
+        width: 100%;
+        margin: 0 !important;
+        padding: 6px 0 !important;
     }
 </style>

package/dist/component/KgWarehouse/index.hooks.ts

@@ -1,6 +1,7 @@
 import { computed, ComputedRef } from 'vue';
 import { IKgWarehouseStore, useKgWarehouseStore } from './index.store';
 import { WhDTO } from '../../api/WMS/models';
+import { useAppStore } from '../../store/app.store';
 
 export type IUseKgWarehouse = {
     store: IKgWarehouseStore;
@@ -10,8 +11,30 @@ export type IUseKgWarehouse = {
 
 export function useKgWarehouse(): IUseKgWarehouse {
     const store = useKgWarehouseStore();
+    const appStore = useAppStore();
+
+    const warehouse = computed<WhDTO | null>(() => {
+        if (!store.getWarehouse) {
+            return null;
+        }
+
+        //region 如果当前仓库(可能来自浏览器的缓存)不在仓库列表中, 比如切换登录用户, 或者用户可访问的仓库发生变更, 则返回 null, 表示需要重新选择仓库
+        // ----------------------------------------------------------------------------------------------------
+
+        // 当前仓库编号
+        const currentWarehouseID = store.getWarehouse?.whId;
+
+        // 如果 userWarehouses 为 undefined, 表示 userWarehouses 数据尚未完成初始化,
+        if (appStore.getUserWarehouses !== undefined && !appStore.getUserWarehouses?.find((i) => i.wh_id === currentWarehouseID)) {
+            return null;
+        }
+
+        // ----------------------------------------------------------------------------------------------------
+        //endregion
+
+        return store.getWarehouse;
+    });
 
-    const warehouse = computed(() => store.getWarehouse);
 
     return {
         store,

package/dist/component/KgWarehouse/index.store.ts

@@ -23,14 +23,6 @@ export type IUseKgWarehouseStore = StoreDefinition<
 export type IKgWarehouseStore = ReturnType<IUseKgWarehouseStore>;
 
 export const useKgWarehouseStore = defineStore('KgWarehouse', {
-    state: (): IKgWarehouseState => ({
-        warehouse: null,
-    }),
-    getters: {
-        getWarehouse(): WhDTO | null {
-            return this.warehouse || uni.getStorageSync(LOCAL_STORAGE_KEY) || null;
-        },
-    },
     actions: {
         setWarehouse(warehouse?: WhDTO | null): void {
             if (!warehouse) {
@@ -43,4 +35,12 @@ export const useKgWarehouseStore = defineStore('KgWarehouse', {
             uni.setStorageSync(LOCAL_STORAGE_KEY, this.warehouse);
         },
     },
+    getters: {
+        getWarehouse(): WhDTO | null {
+            return this.warehouse || null;
+        },
+    },
+    state: (): IKgWarehouseState => ({
+        warehouse: uni.getStorageSync(LOCAL_STORAGE_KEY),
+    }),
 });

package/dist/component/index.ts

@@ -1,4 +1,5 @@
 export * from './KgNavBar';
+export * from './KgStation';
 export * from './KgTabBar';
 export * from './KgUpdatePopup';
 export * from './KgWarehouse';

package/dist/service/http-client.ts

@@ -11,8 +11,12 @@ uni.addInterceptor('request', {
         uni.showLoading({});
 
         const appStore = useAppStore();
+
         args.header['Authorization'] = appStore.getToken;
+        // TODO 支持其他语言
+        args.header['Accept-Language'] = 'zh_CN'.replace('_', '-');
         args.header['X-Access-Token'] = appStore.getToken;
+
         if (!args.url?.startsWith('http')) {
             args.url = appStore.getApiUrl + args.url;
         }

package/dist/store/app.store.ts

@@ -1,72 +1,32 @@
 import { defineStore } from 'pinia';
 import { STORAGE_KEYS } from '../const';
-import { SysUser } from '../api/WMS/models';
+import { SysUser, SysUserWarehouseDTO } from '../api/WMS/models';
 import { API } from '../api';
 
 interface IAppState {
     /** 后端接口地址. */
     apiUrl: string;
 
+    /** 是否取消本次升级. 取消之后, 使用应用期间不会再提示升级, 直到下次重新打开应用才会提示升级. */
+    isUpdateCancel: boolean;
+
     /** 登录令牌. */
     token: string;
 
     /** 当前登录用户. */
     user: SysUser | null;
 
-    /** 是否取消本次升级. 取消之后, 使用应用期间不会再提示升级, 直到下次重新打开应用才会提示升级. */
-    isUpdateCancel: boolean;
+    /**
+     * 用户仓库.
+     */
+    userWarehouses: Array<SysUserWarehouseDTO> | undefined;
 }
 
 export const useAppStore = defineStore('app', {
-    state: (): IAppState => ({
-        apiUrl: '',
-        token: '',
-        user: {},
-        isUpdateCancel: false,
-    }),
-    getters: {
-        /** 后端接口地址. */
-        getApiUrl(state) {
-            return state.apiUrl || uni.getStorageSync(STORAGE_KEYS.API_URL);
-        },
-
-        /** 登录令牌. */
-        getToken(state) {
-            return state.token || uni.getStorageSync(STORAGE_KEYS.TOKEN);
-        },
-
-        /** 当前登录用户. */
-        getUser(state) {
-            return state.user || uni.getStorageSync(STORAGE_KEYS.USER);
-        },
-
-        /** 是否取消本次升级. */
-        getIsUpdateCancel(state) {
-            return state.isUpdateCancel;
-        },
-    },
     actions: {
-        setApiUrl(apiUrl: string) {
-            uni.setStorageSync(STORAGE_KEYS.API_URL, apiUrl);
-            this.apiUrl = apiUrl;
-        },
-
-        setToken(token: string) {
-            uni.setStorageSync(STORAGE_KEYS.TOKEN, token);
-            this.token = token;
-        },
-
-        setUser(user: SysUser | null) {
-            uni.setStorageSync(STORAGE_KEYS.USER, user);
-            this.user = user;
-        },
-
-        setIsUpdateCancel(value: boolean) {
-            this.isUpdateCancel = value;
-        },
-
         /**
          * 退出登录.
+         *
          * @param param.isRequest 是否请求后端退出登录接口, 默认为 true.
          */
         async logout(param: { isRequest?: boolean } = {}) {
@@ -95,5 +55,64 @@ export const useAppStore = defineStore('app', {
          * @param version 最新版本.
          */
         openKgUpdatePopup(version: string) {},
+
+        /**
+         * 查询用户仓库.
+         */
+        async requestUserWarehouses() {
+            const { userWarehouses } = await API.WMS.LoginController.GetUserInfo();
+            this.userWarehouses = userWarehouses ?? [];
+        },
+
+        setApiUrl(apiUrl: string) {
+            uni.setStorageSync(STORAGE_KEYS.API_URL, apiUrl);
+            this.apiUrl = apiUrl;
+        },
+
+        setIsUpdateCancel(value: boolean) {
+            this.isUpdateCancel = value;
+        },
+
+        setToken(token: string) {
+            uni.setStorageSync(STORAGE_KEYS.TOKEN, token);
+            this.token = token;
+        },
+
+        setUser(user: SysUser | null) {
+            uni.setStorageSync(STORAGE_KEYS.USER, user);
+            this.user = user;
+        },
     },
+    getters: {
+        /** 后端接口地址. */
+        getApiUrl(state) {
+            return state.apiUrl;
+        },
+
+        /** 是否取消本次升级. */
+        getIsUpdateCancel(state) {
+            return state.isUpdateCancel;
+        },
+
+        /** 登录令牌. */
+        getToken(state) {
+            return state.token;
+        },
+
+        /** 当前登录用户. */
+        getUser(state) {
+            return state.user;
+        },
+
+        getUserWarehouses(): Array<SysUserWarehouseDTO> | undefined {
+            return this.userWarehouses;
+        },
+    },
+    state: (): IAppState => ({
+        apiUrl: uni.getStorageSync(STORAGE_KEYS.API_URL) ?? '',
+        isUpdateCancel: false,
+        token: uni.getStorageSync(STORAGE_KEYS.TOKEN) ?? '',
+        user: uni.getStorageSync(STORAGE_KEYS.USER) ?? {},
+        userWarehouses: undefined,
+    }),
 });

package/dist/uni/uni-ui/uni-card/uni-card.vue

@@ -134,7 +134,7 @@
     $uni-base-color: #6a6a6a !default;
     $uni-secondary-color: #909399 !default;
     $uni-spacing-sm: 8px !default;
-    $uni-border-color: $uni-border-3;
+    $uni-border-color: #e5e5e5;
     $uni-shadow: $uni-shadow-base;
     $uni-card-title: 15px;
     $uni-cart-title-color: $uni-main-color;
@@ -147,7 +147,14 @@
         margin: $uni-card-spacing;
         border-radius: 4px;
         overflow: hidden;
-        font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+        font-family:
+            Helvetica Neue,
+            Helvetica,
+            PingFang SC,
+            Hiragino Sans GB,
+            Microsoft YaHei,
+            SimSun,
+            sans-serif;
         background-color: #fff;
         flex: 1;
 
@@ -174,6 +181,7 @@
             align-items: center;
             padding: $uni-card-spacing;
             overflow: hidden;
+            background: #fafafa;
 
             .uni-card__header-box {
                 /* #ifndef APP-NVUE */