@kengic/uni 0.7.14-beta.6 → 0.7.14-beta.7

package/component/KgLocaleSelector/KgLocaleSelector.vue

@@ -44,14 +44,14 @@
     //region FUNCTION
     //----------------------------------------------------------------------------------------------------
     /**
-     * 语言选择--取消.
+     * 取消.
      */
     function onCancel() {
         popupRef$.value?.close();
     }
 
     /**
-     * 语言选择--确定.
+     * 确定.
      */
     function onOk() {
         kg.setLocale(currentLocale$.value);
@@ -62,6 +62,8 @@
      * 打开弹窗.
      */
     function open() {
+        // 每次打开弹窗之前, 将当前选中语言重置为应用当前语言,
+        currentLocale$.value = kg.locale;
         popupRef$.value?.open();
     }
     //----------------------------------------------------------------------------------------------------

package/component/KgNavBar/KgNavBar.vue

@@ -9,19 +9,16 @@
     </UniNavBar>
 
     <!--#ifdef APP-PLUS-->
-    <KgUpdatePopup v-if="isCustomNavigationBar" />
+    <KgUpdateNotice v-if="isCustomNavigationBar" />
     <!--#endif-->
 </template>
 
+<!--页面顶部标题-->
 <script lang="ts" name="KgNavBar" setup>
     import { computed, ref } from 'vue';
     import { UniIcons, UniNavBar } from '../../uni-ui';
     import { KgUtil } from '../../util';
-    import { KgUpdatePopup } from '../KgUpdateNotice';
-
-    /**
-     * 顶部标题栏.
-     */
+    import { KgUpdateNotice } from '../KgUpdateNotice';
 
     //region DATA
     // ----------------------------------------------------------------------------------------------------

package/component/KgTabBar/KgTabBar.vue

@@ -1,5 +1,5 @@
 <template>
-    <view :id="id" ref="ref01" class="kg-tab-bar">
+    <view :id="ID" ref="ref01" class="kg-tab-bar">
         <view :class="{ active: page?.route === 'pages/home/index' }" class="item" @tap.stop="goto('pages/home/index')">
             <UniIcons :type="'home'" size="24"></UniIcons>
             <text class="text">首页</text>
@@ -12,27 +12,24 @@
     </view>
 </template>
 
+<!--页面底部标签导航-->
 <script lang="ts" name="KgTabBar" setup>
     import { onMounted, ref } from 'vue';
     import { UniIcons } from '../../uni-ui';
     import { KgUtil } from '../../util';
     import { v4 as uuid } from 'uuid';
 
-    /**
-     * 底部标签栏.
-     */
-
-    const id = `kgtabbar${uuid().replace(/-/g, '')}`;
+    const ID = `KgTabBar${uuid().replace(/-/g, '')}`;
 
     const ref01 = ref<any>(null);
 
     onMounted(() => {
         /* #ifdef H5 */
-        ref01.value?.$el?.previousElementSibling?.classList?.add('kg-tab-bar-sibling');
+        ref01.value?.$el?.previousElementSibling?.classList?.add('kg-tab-bar--sibling');
         /* #endif */
 
         /* #ifdef APP-PLUS */
-        KgUtil.eval(`document.querySelector('#${id}').previousElementSibling.classList.add('kg-tab-bar-sibling');`);
+        KgUtil.eval(`document.querySelector('#${ID}').previousElementSibling.classList.add('kg-tab-bar--sibling');`);
         /* #endif */
     });
 
@@ -47,7 +44,7 @@
     }
 </script>
 
-<style lang="scss" scoped>
+<style>
     .kg-tab-bar {
         display: flex;
         align-items: center;
@@ -59,7 +56,6 @@
         bottom: 0px;
         left: 0px;
         right: 0px;
-        box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
     }
 
     .kg-tab-bar .item {
@@ -81,5 +77,7 @@
 
     .kg-tab-bar .item .text {
         font-size: 12px;
+        line-height: 1;
     }
+
 </style>

package/component/KgUpdateNotice/KgUpdateNotice.vue

@@ -19,10 +19,10 @@
 </template>
 
 <!--升级提示-->
-<script lang="ts" name="KgUpdatePopup" setup>
+<script lang="ts" name="KgUpdateNotice" setup>
     import { computed, onMounted, onUnmounted, PropType, ref } from 'vue';
     import { UniPopup, UniPopupDialog } from '../../uni-ui';
-    import { useAppStore } from '../../config/app.store';
+    import { useAppStore } from '../../config';
     import { KgUtil } from '../../util';
 
     /**
@@ -140,7 +140,7 @@
 
         unsubscribe.value = appStore.$onAction(async ({ name, args }) => {
             switch (name) {
-                case 'openKgUpdatePopup':
+                case 'openKgUpdateNotice':
                     version.value = args[0];
                     popupRef$.value?.open();
                     break;

package/config/app.store.ts

@@ -10,9 +10,6 @@ interface IAppState {
     /** 是否取消本次升级. 取消之后, 使用应用期间不会再提示升级, 直到下次重新打开应用才会提示升级. */
     isUpdateCancel: boolean;
 
-    /** 当前语言. */
-    locale: string;
-
     /** 登录令牌. */
     token: string;
 
@@ -58,7 +55,7 @@ export const useAppStore = defineStore('app', {
          * 打开更新弹窗.
          * @param version 最新版本.
          */
-        openKgUpdatePopup(version: string) {},
+        openKgUpdateNotice(version: string) {},
 
         /**
          * 查询用户仓库.
@@ -77,10 +74,6 @@ export const useAppStore = defineStore('app', {
             this.isUpdateCancel = value;
         },
 
-        setLocale(value: string) {
-            this.locale = value;
-        },
-
         setToken(token: string) {
             uni.setStorageSync(KG.STORAGE_KEY__TOKEN, token);
             this.token = token;
@@ -102,10 +95,6 @@ export const useAppStore = defineStore('app', {
             return state.isUpdateCancel;
         },
 
-        getLocale(state) {
-            return state.locale ?? 'zh_CN';
-        },
-
         /** 登录令牌. */
         getToken(state) {
             return state.token;
@@ -123,7 +112,6 @@ export const useAppStore = defineStore('app', {
     state: (): IAppState => ({
         apiUrl: uni.getStorageSync(KG.STORAGE_KEY__API_URL) ?? '',
         isUpdateCancel: false,
-        locale: 'zh_CN',
         token: uni.getStorageSync(KG.STORAGE_KEY__TOKEN) ?? '',
         user: uni.getStorageSync(KG.STORAGE_KEY__USER) ?? {},
         userWarehouses: undefined,

package/config/config.store.ts

@@ -22,6 +22,11 @@ export interface IUseKgStoreGetters {
      * 当前语言.
      */
     locale: string;
+
+    /**
+     * 当前语言名称.
+     */
+    localeText: string;
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -109,18 +114,22 @@ export const useKgStore: KgStoreDefinition<IUseKgStoreGetters, IUseKgStoreAction
         // 如果本地存储有值, 表示用户上次已通过语言选择弹窗选择了某个语言, 但是又重新启动了应用,
         const storeLocale = uni.getStorageSync(KG.STORAGE_KEY__LOCALE);
         if (storeLocale) {
-            locale$.value = storeLocale;
-            return locale$.value;
+            return storeLocale;
         }
 
         if (defaultLocale$.value) {
-            setLocale(defaultLocale$.value);
-            return locale$.value;
+            return defaultLocale$.value;
         }
 
         return KG.LOCALE.ZH_CN;
     });
 
+    const localeText$$ = computed<string>(() => {
+        // TODO LT
+        return '|' + uni.getLocale() + '|' + locale$.value + '|' + uni.getStorageSync(KG.STORAGE_KEY__LOCALE) + '|';
+        // return KG.LOCALE_DATA_LIST.find((i) => i.code === locale$$.value)?.text ?? '';
+    });
+
     //----------------------------------------------------------------------------------------------------
     //endregion
 
@@ -150,7 +159,7 @@ export const useKgStore: KgStoreDefinition<IUseKgStoreGetters, IUseKgStoreAction
     }
 
     function setDefaultLocale(value?: string | null): void {
-        locale$.value = value ?? KG.LOCALE.ZH_CN;
+        defaultLocale$.value = value ?? KG.LOCALE.ZH_CN;
     }
 
     function setDescriptionList(param: { codeName: string | null | undefined; descriptions: Array<DescriptionDTO> }): void {
@@ -180,7 +189,17 @@ export const useKgStore: KgStoreDefinition<IUseKgStoreGetters, IUseKgStoreAction
 
         locale$.value = value;
         uni.setStorageSync(KG.STORAGE_KEY__LOCALE, value);
-        uni.setLocale(value);
+        uni.setLocale(
+            (() => {
+                switch (value) {
+                    case 'zh_CN': {
+                        return 'zh-Hans';
+                    }
+                }
+
+                return value.replace('_', '-');
+            })(),
+        );
     }
 
     function t(key: string | null | undefined, param?: Record<string, any> | null | undefined, defaultValue?: string | null | undefined): string {
@@ -225,6 +244,7 @@ export const useKgStore: KgStoreDefinition<IUseKgStoreGetters, IUseKgStoreAction
         getDescription: getDescription$$,
         locale: locale$$,
         locale$: locale$,
+        localeText: localeText$$,
         requestVarConfigDescriptionList: requestVarConfigDescriptionList,
         setDefaultLocale: setDefaultLocale,
         setDescriptionList: setDescriptionList,

package/config/index.ts

@@ -24,6 +24,7 @@ function kgConfig(param?: IKgConfigParameter): void {
     const kg = useKg();
 
     kg.setDefaultLocale(param?.$i18n$DefaultLocale);
+    kg.setLocale(kg.locale);
 }
 
 /** @deprecated 已废弃, 请使用 {@link kgConfig()} */

package/index.css

@@ -6,7 +6,7 @@ uni-button:after {
     border-radius: 6px !important;
 }
 
-.kg-tab-bar-sibling {
+.kg-tab-bar--sibling {
     padding-bottom: 50px !important;
 }
 
@@ -30,7 +30,16 @@ uni-button:after {
     background-color: rgba(17, 17, 17, 0.9);
 }
 
+:deep(.uni-datetime-picker--btn) {
+    letter-spacing: 0px !important;
+}
+
+:deep(.uni-calendar__button-text) {
+    letter-spacing: 0px !important;
+}
+
 /* region H5 */
+/* ---------------------------------------------------------------------------------------------------- */
 /* #ifdef H5 */
 
 .uni-nav-bar-text {
@@ -50,8 +59,10 @@ uni-button:after {
 
 /* #endif */
 /* endregion */
+/* ---------------------------------------------------------------------------------------------------- */
 
 /* region APP-PLUS */
+/* ---------------------------------------------------------------------------------------------------- */
 /* #ifdef APP-PLUS */
 
 .uni-nav-bar-text {
@@ -71,3 +82,4 @@ uni-button:after {
 
 /* #endif */
 /* endregion */
+/* ---------------------------------------------------------------------------------------------------- */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kengic/uni",
-    "version": "0.7.14-beta.6",
+    "version": "0.7.14-beta.7",
     "scripts": {
         "postinstall": "node bin/postinstall.mjs"
     },
@@ -43,6 +43,7 @@
         "uuid": "13.0.0",
         "vite": "4.3.9",
         "vue": "3.2.47",
+        "vue-i18n": "9.1.9",
         "vue-tsc": "1.8.27"
     },
     "main": "./index.ts",

package/page/KgPageMy.vue

@@ -1,10 +1,10 @@
 <template>
     <view class="my">
         <UniList class="uni-list--setting">
-            <UniListItem link title="语言" :right-text="localeRightText$$" @click="openKgLocaleSelector" />
+            <UniListItem link title="语言" :right-text="kg.localeText" @click="openKgLocaleSelector" />
             <UniListItem link title="仓库" :right-text="warehouseRightText$$" @click="openKgWarehouse" />
             <UniListItem link title="工作站 - 工作区" :right-text="stationRightText$$" @click="openKgStation" />
-            <UniListItem link title="后端服务地址" :right-text="apiUrl" />
+            <UniListItem link title="后端地址" :right-text="apiUrl" />
 
             <!--#ifdef APP-PLUS-->
             <UniListItem link title="当前版本" :right-text="currentVersion" @click="checkForUpdate" />
@@ -26,11 +26,13 @@
 
 <script setup lang="ts">
     import { computed, ref } from 'vue';
-    import { useAppStore } from '../config';
+    import { useAppStore, useKg } from '../config';
     import { KgLocaleSelector, KgTabBar, KgUpdateNotice, KgWarehouseSelector, KgWorkStationSelector, useKgStation, useKgWarehouse } from '../component';
     import { UniList, UniListItem } from '../uni-ui';
     import { KgUtil } from '../util';
 
+    const kg = useKg();
+
     const appStore = useAppStore();
     const kgWarehouse = useKgWarehouse();
     const kgStation = useKgStation();
@@ -41,11 +43,6 @@
     const kgStationRef$ = ref<any>(null);
     const kgLocaleSelectorRef$ = ref<any>(null);
 
-    /**
-     * 语言的右侧文本.
-     */
-    const localeRightText$$ = computed<string>(() => 'TODO');
-
     /**
      * 仓库的右侧文本.
      */

package/service/http-client.ts

@@ -5,6 +5,7 @@ import { useKgStation } from '../component/KgWorkStationSelector';
 import { isNil } from 'lodash-es';
 import dayjs from 'dayjs';
 import { KG } from '../model';
+import { useKg } from '../config';
 
 /*
  * 对请求做统一的拦截.
@@ -15,12 +16,13 @@ uni.addInterceptor('request', {
             uni.showLoading({ mask: true });
         }
 
+        const kg = useKg();
         const appStore = useAppStore();
 
         args.header['Authorization'] = appStore.getToken;
         // TODO LT 支持其他语言
         if (!args.header['Accept-Language']) {
-            args.header['Accept-Language'] = appStore.getLocale?.replace('_', '-');
+            args.header['Accept-Language'] = kg.locale?.replace('_', '-');
         }
         args.header['X-Access-Token'] = appStore.getToken;
 

package/util/kg.util.ts

@@ -145,13 +145,13 @@ class KgUtil {
 
             // 有新版本
             if (_major > major || (_major == major && _minor > minor) || (_major == major && _minor == minor && _patch > patch)) {
-                appStore.openKgUpdatePopup(newVersion);
+                appStore.openKgUpdateNotice(newVersion);
                 return true;
             }
             // 无新版本
             else {
                 if (isShowToast) {
-                    uni.showToast({ title: '已是最新版本.', icon: 'none' });
+                    uni.showToast({ title: '已是最新版本', icon: 'none' });
                 }
                 return false;
             }
@@ -298,7 +298,7 @@ class KgUtil {
 
                     // object
                     case isObjectLike(value): {
-                        throw new Error('不支持的参数类型.');
+                        throw new Error('不支持的参数类型');
                     }
 
                     // string
@@ -464,12 +464,12 @@ class KgUtil {
         if (!isNil(_params.pageNo)) {
             const pageIndex = Number.parseInt(_params.pageNo);
             if (Number.isNaN(pageIndex) || pageIndex <= 0) {
-                throw new Error('参数 pageNo 非法.');
+                throw new Error('参数 pageNo 非法');
             }
 
             const pageSize = Number.parseInt(_params.pageSize);
             if (Number.isNaN(pageSize) || pageSize <= 0) {
-                throw new Error('参数 pageSize 非法.');
+                throw new Error('参数 pageSize 非法');
             }
 
             offsetSql = ` OFFSET ${(pageIndex - 1) * pageSize} ROWS FETCH NEXT ${pageSize} ROWS ONLY`;