@kengic/uni 0.6.3-beta.0 → 0.6.3-beta.2

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-data-select/uni-data-select.vue

@@ -5,9 +5,9 @@
             <view class="uni-select" :class="{ 'uni-select--disabled': disabled }">
                 <view class="uni-select__input-box" @click="toggleSelector">
                     <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-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="24" />
+                        <uni-icons type="clear" color="#c0c4cc" size="14" />
                     </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'" />
@@ -21,7 +21,7 @@
                             <text>{{ emptyTips }}</text>
                         </view>
                         <view v-else class="uni-select__selector-item" v-for="(item, index) in mixinDatacomResData" :key="index" @click="change(item)">
-                            <text :class="{ 'uni-select__selector__disabled': item.disable }">{{ formatItemName(item) }}</text>
+                            <text :class="{ 'uni-select__selector__disabled': item.disable }">{{ formatItemName(item) }} </text>
                         </view>
                     </scroll-view>
                 </view>
@@ -43,8 +43,8 @@
      * @property {String} placeholder 输入框的提示文字
      * @property {Boolean} disabled 是否禁用
      * @property {String} placement 弹出位置
-     * 	@value top   		顶部弹出
-     * 	@value bottom		底部弹出（default)
+     *    @value top   		顶部弹出
+     *    @value bottom		底部弹出（default)
      * @event {Function} change  选中发生变化触发
      */
 
@@ -349,7 +349,7 @@
     }
 
     .uni-label-text {
-        font-size: 14px;
+        font-size: 13px;
         font-weight: bold;
         color: $uni-base-color;
         margin: auto 0;
@@ -357,12 +357,12 @@
     }
 
     .uni-select {
-        font-size: 14px;
+        font-size: 13px;
         border: 1px solid $uni-border-3;
         box-sizing: border-box;
         border-radius: 3px;
         padding: 0 5px;
-        padding-left: 10px;
+        padding-left: 6px;
         position: relative;
         /* #ifndef APP-NVUE */
         display: flex;
@@ -391,6 +391,7 @@
 
     .uni-select__input-box {
         height: 26px;
+        line-height: 26px;
         position: relative;
         /* #ifndef APP-NVUE */
         display: flex;
@@ -402,13 +403,13 @@
 
     .uni-select__input {
         flex: 1;
-        font-size: 14px;
+        font-size: 13px;
         height: 22px;
         line-height: 22px;
     }
 
     .uni-select__input-plac {
-        font-size: 14px;
+        font-size: 13px;
         color: $uni-secondary-color;
     }
 
@@ -460,10 +461,10 @@
         cursor: pointer;
         /* #endif */
         line-height: 25px;
-        font-size: 14px;
+        font-size: 13px;
         text-align: center;
         /* border-bottom: solid 1px $uni-border-3; */
-        padding: 0px 10px;
+        padding: 0px 5px;
         margin-bottom: 1px;
         border-radius: 2px;
     }
@@ -547,7 +548,7 @@
 
     .uni-select__input-placeholder {
         color: $uni-base-color;
-        font-size: 14px;
+        font-size: 13px;
     }
 
     .uni-select--mask {
@@ -576,4 +577,8 @@
         background-size: 100% 100%;
         background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1024 1024'%3E%3Cpath fill='%2300000040' d='M858.9 689L530.5 308.2c-9.4-10.9-27.5-10.9-37 0L165.1 689c-12.2 14.2-1.2 35 18.5 35h656.8c19.7 0 30.7-20.8 18.5-35'/%3E%3C/svg%3E");
     }
+
+    .uni-icons.uniui-clear {
+        margin-right: -1px;
+    }
 </style>