@kengic/uni 0.7.15 → 0.7.16

package/bin/bin.mjs

@@ -4,15 +4,6 @@ import { bump } from './bump.mjs';
 
 const program = new Command();
 
-/**
- * 打印日志.
- *
- * @param message 日志消息.
- */
-function log(message) {
-    console.log(`[${new Date(Date.now() + 1000 * 60 * 60 * 8).toISOString().substring(0, 23).replace('T', ' ')}] [@kengic/uni] COPY-DIST-TO-ANDROID | ${message}`);
-}
-
 async function bin() {
     try {
         program
@@ -20,6 +11,15 @@ async function bin() {
             .description('COPY DIST TO ANDROID')
             .option('--appid <appid>', 'APPID', '')
             .action(async (args) => {
+                /**
+                 * 打印日志.
+                 *
+                 * @param message 日志消息.
+                 */
+                function log(message) {
+                    console.log(`[${new Date(Date.now() + 1000 * 60 * 60 * 8).toISOString().substring(0, 23).replace('T', ' ')}] [@kengic/uni] COPY-DIST-TO-ANDROID | ${message}`);
+                }
+
                 try {
                     log(`命令参数 | ${JSON.stringify(args)}`);
                     log(`当前目录 | ${process.cwd()}`);

package/component/KgApiUil/KgApiUil.vue

@@ -3,7 +3,7 @@
         <UniCard :isFull="true" class="popupCard" :title="kg.t('pda.KgApiUil.Title', {}, '配置后端服务地址')">
             <view>
                 <view class="body">
-                    <UniEasyinput v-model="apiUrl$" :clearSize="24" :disabled="isRequestDoing$" :focus="true" placeholder="http://127.0.0.1:8080/" trim></UniEasyinput>
+                    <UniEasyinput v-model="apiUrl$" :clearSize="24" :disabled="isRequestDoing$" :focus="true" :trim="true" placeholder="http://127.0.0.1:8080/" />
                 </view>
                 <view class="buttons">
                     <button :disabled="isRequestDoing$" :type="'default' as any" class="btn btn-cancel" @tap.stop="onCancel()">{{ kg.t('kg.cancel02', {}, '取消') }}</button>
@@ -53,29 +53,36 @@
         try {
             appStore.setApiUrl(apiUrl$.value!);
 
-            await kg.requestVarConfigDescriptionList();
-
             uni.showToast({ icon: 'none', title: kg.t('pda.KgApiUil.SuccessMessage', {}, '配置成功') });
 
-            uni.showModal({
-                title: kg.t('kg.tip02', {}, '提示'),
-                content: kg.t('pda.KgApiUil.RelaunchContent', {}, '翻译加载成功, 需要重启应用.'),
-                confirmText: kg.t('pda.KgApiUil.RelaunchOkText', {}, '立即重启'),
-                showCancel: false,
-                success: function (result) {
-                    if (result.confirm) {
-                        kg.setLocale(kg.locale);
-
-                        /* #ifdef H5 */
-                        window.location.reload();
-                        /* #endif */
-
-                        /* #ifdef APP-PLUS */
-                        popupRef$.value?.close();
-                        /* #endif */
-                    }
-                },
-            });
+            // 启用国际化,
+            if (kg.$i18n$IsOn) {
+                await kg.requestVarConfigDescriptionList();
+
+                uni.showModal({
+                    title: kg.t('kg.tip02', {}, '提示'),
+                    content: kg.t('pda.KgApiUil.RelaunchContent', {}, '翻译加载成功, 需要重启应用.'),
+                    confirmText: kg.t('pda.KgApiUil.RelaunchOkText', {}, '立即重启'),
+                    showCancel: false,
+                    success: function (result) {
+                        if (result.confirm) {
+                            kg.setLocale(kg.locale);
+
+                            /* #ifdef H5 */
+                            window.location.reload();
+                            /* #endif */
+
+                            /* #ifdef APP-PLUS */
+                            popupRef$.value?.close();
+                            /* #endif */
+                        }
+                    },
+                });
+            }
+            // 禁用国际化,
+            else {
+                popupRef$.value?.close();
+            }
         } finally {
             isRequestDoing$.value = false;
         }

package/component/KgNavBar/KgNavBar.vue

@@ -36,7 +36,7 @@
      * 回到首页.
      */
     function gotoHomePage() {
-        uni.redirectTo({ url: `/${kg.homePagePath}` });
+        uni.redirectTo({ url: `/${kg.$PagePath$Home}` });
     }
 
     //endregion

package/component/KgTabBar/KgTabBar.vue

@@ -1,6 +1,6 @@
 <template>
     <view :id='ID' ref='ref01' class='kg-tab-bar'>
-        <view :class="{ active: page?.route === kg.homePagePath }" class="item" @tap.stop="goto(kg.homePagePath)">
+        <view :class="{ active: page?.route === kg.$PagePath$Home }" class="item" @tap.stop="goto(kg.$PagePath$Home)">
             <UniIcons :type="'home'" size="24"></UniIcons>
             <text class="text">{{ kg.t('pda.KgTabBar.Home', {}, '首页') }}</text>
         </view>

package/config/config.store.ts

@@ -10,19 +10,29 @@ import { useKg } from './config.hooks';
 //----------------------------------------------------------------------------------------------------
 interface IUseKgStoreGetters {
     /**
-     * 默认语言.
+     * 页面路径--首页. 默认为 'pages/home/index'.
      */
-    defaultLocale: string;
+    $PagePath$Home: string;
 
     /**
-     * 根据 codeName 和 codeValue 获取当前语言下的某个描述.
+     * 页面路径--登录. 默认为 'pages/login/Login'.
      */
-    getDescription: (param: { codeName: string | null | undefined; codeValue: string | null | undefined }) => DescriptionDTO | null;
+    $PagePath$Login: string;
+
+    /**
+     * 国际化--默认语言. 默认为简体中文(zh_CN).
+     */
+    $i18n$DefaultLocale: string;
 
     /**
-     * 首页路径. 默认为 'pages/home/index'.
+     * 国际化--是否启用功能. 默认为 true.
      */
-    homePagePath: string;
+    $i18n$IsOn: boolean;
+
+    /**
+     * 根据 codeName 和 codeValue 获取当前语言下的某个描述.
+     */
+    getDescription: (param: { codeName: string | null | undefined; codeValue: string | null | undefined }) => DescriptionDTO | null;
 
     /**
      * 是否正在请求翻译数据.
@@ -38,11 +48,6 @@ interface IUseKgStoreGetters {
      * 当前语言名称.
      */
     localeText: string;
-
-    /**
-     * 登录页面路径. 默认为 'pages/login/Login'.
-     */
-    loginPagePath: string;
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -57,40 +62,47 @@ interface IUseKgStoreActions {
     requestVarConfigDescriptionList(): Promise<void>;
 
     /**
-     * 设置默认语言.
+     * 页面路径--设置首页页面路径.
      *
-     * @param value 默认语言.
+     * @param value 首页页面路径.
      */
-    setDefaultLocale(value?: string | null): void;
+    set$PagePath$Home(value?: string | null): void;
 
     /**
-     * 设置某组描述的数据.
+     * 页面路径--设置登录页面路径.
      *
-     * @param param.codeName 描述组名.
-     * @param param.descriptionList 描述数据列表.
+     * @param value 登录页面路径.
      */
-    setDescriptionList(param: { codeName: string | null | undefined; descriptionList: Array<DescriptionDTO> }): void;
+    set$PagePath$Login(value?: string | null): void;
 
     /**
-     * 设置首页路径.
+     * 国际化--设置默认语言.
      *
-     * @param value 首页路径.
+     * @param value 默认语言.
      */
-    setHomePagePath(value?: string | null): void;
+    set$i18n$DefaultLocale(value?: string | null): void;
 
     /**
-     * 设置当前语言.
+     * 国际化--设置是否启用功能.
      *
-     * @param value 当前语言.
+     * @param value 是否启用功能.
      */
-    setLocale(value?: string | null): void;
+    set$i18n$IsOn(value?: boolean | null): void;
 
     /**
-     * 设置登录页面路径.
+     * 设置某组描述的数据.
      *
-     * @param value 登录页面路径.
+     * @param param.codeName 描述组名.
+     * @param param.descriptionList 描述数据列表.
+     */
+    setDescriptionList(param: { codeName: string | null | undefined; descriptionList: Array<DescriptionDTO> }): void;
+
+    /**
+     * 设置当前语言.
+     *
+     * @param value 当前语言.
      */
-    setLoginPagePath(value?: string | null): void;
+    setLocale(value?: string | null): void;
 
     /**
      * 翻译.
@@ -115,9 +127,10 @@ const useKgStore: KgStoreDefinition<IUseKgStoreGetters, IUseKgStoreActions> = de
     //region STATE
     //----------------------------------------------------------------------------------------------------
     const descriptionRecord$ = ref<Record<string, Record<string, DescriptionDTO>>>({});
-    const defaultLocale$ = ref<string>(KG.LOCALE.ZH_CN);
-    const homePagePath$ = ref<string>('pages/home/index');
-    const loginPagePath$ = ref<string>('pages/login/Login');
+    const $i18n$DefaultLocale$ = ref<string>(KG.LOCALE.ZH_CN);
+    const $i18n$IsOn$ = ref<boolean>(true);
+    const $PagePath$Home$ = ref<string>('pages/home/index');
+    const $PagePath$Login$ = ref<string>('pages/login/Login');
     const isRequestVarConfigDescriptionListDoing$ = ref<boolean>(false);
     const locale$ = ref<string>('');
     //----------------------------------------------------------------------------------------------------
@@ -134,9 +147,10 @@ const useKgStore: KgStoreDefinition<IUseKgStoreGetters, IUseKgStoreActions> = de
         return descriptionRecord$.value[codeName]?.[codeValue] ?? null;
     });
 
-    const defaultLocale$$ = computed<string>(() => defaultLocale$.value);
-    const homePagePath$$ = computed<string>(() => homePagePath$.value);
-    const loginPagePath$$ = computed<string>(() => loginPagePath$.value);
+    const $i18n$DefaultLocale$$ = computed<string>(() => $i18n$DefaultLocale$.value);
+    const $i18n$IsOn$$ = computed<boolean>(() => $i18n$IsOn$.value);
+    const $PagePath$Home$$ = computed<string>(() => $PagePath$Home$.value);
+    const $PagePath$Login$$ = computed<string>(() => $PagePath$Login$.value);
     const isRequestVarConfigDescriptionListDoing$$ = computed<boolean>(() => isRequestVarConfigDescriptionListDoing$.value);
 
     const locale$$ = computed<string>(() => {
@@ -151,8 +165,8 @@ const useKgStore: KgStoreDefinition<IUseKgStoreGetters, IUseKgStoreActions> = de
             return storeLocale;
         }
 
-        if (defaultLocale$.value) {
-            return defaultLocale$.value;
+        if ($i18n$DefaultLocale$.value) {
+            return $i18n$DefaultLocale$.value;
         }
 
         return KG.LOCALE.ZH_CN;
@@ -215,8 +229,12 @@ const useKgStore: KgStoreDefinition<IUseKgStoreGetters, IUseKgStoreActions> = de
         }
     }
 
-    function setDefaultLocale(value?: string | null): void {
-        defaultLocale$.value = value ?? KG.LOCALE.ZH_CN;
+    function set$i18n$DefaultLocale(value?: string | null): void {
+        $i18n$DefaultLocale$.value = value ?? KG.LOCALE.ZH_CN;
+    }
+
+    function set$i18n$IsOn(value?: boolean | null): void {
+        $i18n$IsOn$.value = value ?? true;
     }
 
     function setDescriptionList(param: { codeName: string | null | undefined; descriptionList: Array<DescriptionDTO> }): void {
@@ -237,12 +255,12 @@ const useKgStore: KgStoreDefinition<IUseKgStoreGetters, IUseKgStoreActions> = de
         }
     }
 
-    function setHomePagePath(value?: string | null) {
-        homePagePath$.value = value ?? 'pages/home/index';
+    function set$PagePath$Home(value?: string | null) {
+        $PagePath$Home$.value = value ?? 'pages/home/index';
     }
 
-    function setLoginPagePath(value?: string | null) {
-        loginPagePath$.value = value ?? 'pages/login/Login';
+    function set$PagePath$Login(value?: string | null) {
+        $PagePath$Login$.value = value ?? 'pages/login/Login';
     }
 
     function setLocale(value?: string | null): void {
@@ -301,25 +319,28 @@ const useKgStore: KgStoreDefinition<IUseKgStoreGetters, IUseKgStoreActions> = de
     //endregion
 
     return {
-        defaultLocale: defaultLocale$$,
-        defaultLocale$: defaultLocale$,
+        $PagePath$Home: $PagePath$Home$$,
+        $PagePath$Home$: $PagePath$Home$,
+        $PagePath$Login: $PagePath$Login$$,
+        $PagePath$Login$: $PagePath$Login$,
+        $i18n$DefaultLocale: $i18n$DefaultLocale$$,
+        $i18n$DefaultLocale$: $i18n$DefaultLocale$,
+        $i18n$IsOn: $i18n$IsOn$$,
+        $i18n$IsOn$: $i18n$IsOn$,
         descriptionRecord$: descriptionRecord$,
         getDescription: getDescription$$,
-        homePagePath: homePagePath$$,
-        homePagePath$: homePagePath$,
         isRequestVarConfigDescriptionListDoing: isRequestVarConfigDescriptionListDoing$$,
         isRequestVarConfigDescriptionListDoing$: isRequestVarConfigDescriptionListDoing$,
         locale: locale$$,
         locale$: locale$,
         localeText: localeText$$,
-        loginPagePath: loginPagePath$$,
-        loginPagePath$: loginPagePath$,
         requestVarConfigDescriptionList: requestVarConfigDescriptionList,
-        setDefaultLocale: setDefaultLocale,
+        set$PagePath$Home: set$PagePath$Home,
+        set$PagePath$Login: set$PagePath$Login,
+        set$i18n$DefaultLocale: set$i18n$DefaultLocale,
+        set$i18n$IsOn: set$i18n$IsOn,
         setDescriptionList: setDescriptionList,
-        setHomePagePath: setHomePagePath,
         setLocale: setLocale,
-        setLoginPagePath: setLoginPagePath,
         t: t,
     };
 });

package/config/index.ts

@@ -7,34 +7,34 @@ import { KgUtil } from '../util';
 //----------------------------------------------------------------------------------------------------
 type IKgConfigParameter = {
     /**
-     * 可选择的语言列表. 默认为所有语言.
+     * 页面路径--首页. 默认为 'pages/home/index'.
      */
-    $i18n$AvailableLocaleList?: Array<IKgLocale>;
+    $PagePath$Home?: string;
 
     /**
-     * 默认语言. 默认为简体中文(zh_CN).
+     * 页面路径--登录. 默认为 'pages/login/Login'.
      */
-    $i18n$DefaultLocale?: IKgLocale;
+    $PagePath$Login?: string;
 
     /**
-     * 应用实例.
+     * 国际化--可选择的语言列表. 默认为所有语言.
      */
-    app: App;
+    $i18n$AvailableLocaleList?: Array<IKgLocale>;
 
     /**
-     * 首页路径. 默认为 'pages/home/index'.
+     * 国际化--默认语言. 默认为简体中文(zh_CN).
      */
-    homePagePath?: string;
+    $i18n$DefaultLocale?: IKgLocale;
 
     /**
-     * 是否请求翻译数据. 默认为 true.
+     * 国际化--是否启用功能. 默认为 true.
      */
-    isRequestDescriptionList?: boolean;
+    $i18n$IsOn?: boolean;
 
     /**
-     * 登录页面路径. 默认为 'pages/login/Login'.
+     * 应用实例.
      */
-    loginPagePath?: string;
+    app: App;
 };
 
 /**
@@ -45,18 +45,18 @@ type IKgConfigParameter = {
 async function kgConfig(param?: IKgConfigParameter): Promise<void> {
     const kg = useKg();
 
-    kg.setDefaultLocale(param?.$i18n$DefaultLocale);
+    kg.set$i18n$DefaultLocale(param?.$i18n$DefaultLocale);
+    kg.set$i18n$IsOn(param?.$i18n$IsOn);
     kg.setLocale(kg.locale);
-    kg.setHomePagePath(param?.homePagePath);
-    kg.setLoginPagePath(param?.loginPagePath);
+    kg.set$PagePath$Home(param?.$PagePath$Home);
+    kg.set$PagePath$Login(param?.$PagePath$Login);
 
     //region 请求翻译数据,
     //----------------------------------------------------------------------------------------------------
-    if (param?.isRequestDescriptionList !== false) {
+    if (param?.$i18n$IsOn !== false) {
         try {
             await kg.requestVarConfigDescriptionList();
-        } catch (e) {
-        }
+        } catch (e) {}
     }
     //----------------------------------------------------------------------------------------------------
     //endregion

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kengic/uni",
-    "version": "0.7.15",
+    "version": "0.7.16",
     "scripts": {
         "postinstall": "node bin/postinstall.mjs"
     },

package/page/KgPageIndex.vue

@@ -15,8 +15,15 @@
     watch(
         () => kg.isRequestVarConfigDescriptionListDoing,
         (isRequestVarConfigDescriptionListDoing) => {
-            if (!isRequestVarConfigDescriptionListDoing) {
-                uni.reLaunch({ url: `/${kg.homePagePath}` });
+            // 启用国际化,
+            if (kg.$i18n$IsOn) {
+                if (!isRequestVarConfigDescriptionListDoing) {
+                    uni.reLaunch({ url: `/${kg.$PagePath$Home}` });
+                }
+            }
+            // 禁用国际化,
+            else {
+                uni.reLaunch({ url: `/${kg.$PagePath$Home}` });
             }
         },
         { immediate: true },

package/page/KgPageMy.vue

@@ -1,7 +1,9 @@
 <template>
     <view class="my">
         <UniList class="uni-list--setting">
-            <UniListItem :right-text="kg.localeText" :title="kg.t('pda.KgPageMy.Language', {}, '语言')" link @click="openKgLocale" />
+            <template v-if="kg.$i18n$IsOn">
+                <UniListItem :right-text="kg.localeText" :title="kg.t('pda.KgPageMy.Language', {}, '语言')" link @click="openKgLocale" />
+            </template>
             <UniListItem :right-text="warehouseRightText$$" :title="kg.t('pda.KgPageMy.Warehouse', {}, '仓库')" link @click="openKgWarehouse" />
             <UniListItem :right-text="stationRightText$$" :title="kg.t('pda.KgPageMy.WorkStation', {}, '工作站 - 工作区')" link @click="openKgWorkStation" />
             <UniListItem :right-text="apiUrl" :title="kg.t('pda.KgPageMy.ApiUrl', {}, '后端地址')" link @click="openKgApiUil" />
@@ -87,6 +89,10 @@
      * 打开「语言选择」.
      */
     function openKgLocale() {
+        if (!kg.$i18n$IsOn) {
+            return;
+        }
+
         kgLocaleRef$.value?.open();
     }
 

package/service/http-client.ts

@@ -206,7 +206,8 @@ const _httpClient: IHttpClient = {
                 header = {};
             }
 
-            // 启用高级查询
+            //region 启用高级查询
+            //----------------------------------------------------------------------------------------------------
             if (options?.dynamicQueryOperatorModel) {
                 let params: any = {};
 
@@ -257,15 +258,20 @@ const _httpClient: IHttpClient = {
                     [KG.HTTP_HEADER__KG_QUERY_WHERE_SQL]: whereSql,
                 };
             }
+            //----------------------------------------------------------------------------------------------------
+            //endregion
 
-            header[KG.HTTP_HEADER__KG_QUERY_WHERE_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG.HTTP_HEADER__KG_QUERY_WHERE_SQL] ?? '')));
-            header[KG.HTTP_HEADER__KG_QUERY_ORDER_BY_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG.HTTP_HEADER__KG_QUERY_ORDER_BY_SQL] ?? '')));
-            header[KG.HTTP_HEADER__KG_QUERY_OFFSET_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG.HTTP_HEADER__KG_QUERY_OFFSET_SQL] ?? '')));
-            header[KG.HTTP_HEADER__KG_QUERY_SQL] = encodeURIComponent(decodeURIComponent(String(header[KG.HTTP_HEADER__KG_QUERY_SQL] ?? '')));
+            // 仓库编号,
+            header[KG.HTTP_HEADER__KG_WAREHOUSE] = useKgWarehouse().warehouse.value?.whId ?? '';
 
-            header[KG.HTTP_HEADER__KG_WAREHOUSE] = encodeURIComponent(useKgWarehouse().warehouse.value?.whId ?? '');
-            header[KG.HTTP_HEADER__KG_WORK_STATION] = encodeURIComponent(useKgStation().station.value?.devcod ?? '');
-            header[KG.HTTP_HEADER__KG_WORK_AREA] = encodeURIComponent(useKgStation().station.value?.hmewrkare ?? '');
+            // 工作站工作区,
+            header[KG.HTTP_HEADER__KG_WORK_STATION] = useKgStation().station.value?.devcod ?? '';
+            header[KG.HTTP_HEADER__KG_WORK_AREA] = useKgStation().station.value?.hmewrkare ?? '';
+
+            // 编码解码防止乱码,
+            Object.keys(header).forEach((key) => {
+                header[key] = encodeURIComponent(decodeURIComponent(String(header[key] ?? '')));
+            });
 
             uni.request({
                 ...(options ?? {}),