@kengic/uni 0.7.14-beta.2 → 0.7.14-beta.4

package/component/KgLocaleSelector/KgLocaleSelector.vue

@@ -0,0 +1,100 @@
+<template>
+    <UniPopup ref="popupRef$" :type="'bottom'" class="kg-locale-selector">
+        <UniCard :isFull="true" :title="'选择语言'">
+            <view>
+                <view class="body">
+                    <view v-for="item in KG.LOCALE_DATA_LIST" :key="item.code" class="item">{{ item.text }}</view>
+                    <UniDataCheckbox v-model="currentLocale$" :localdata="localeDataList$" />
+                </view>
+                <view class="buttons">
+                    <button class="btn btn-cancel" @tap.stop="onCancel()">取消</button>
+                    <button :type="'primary' as any" class="btn btn-ok" @tap.stop="onOk">确认</button>
+                </view>
+            </view>
+        </UniCard>
+    </UniPopup>
+</template>
+
+<!--语言选择-->
+<script lang="ts" setup>
+    import { UniDataCheckbox, UniPopup } from '../../uni-ui';
+    import { ref } from 'vue';
+    import { KG } from '../../model';
+
+    const emit = defineEmits(['ok']);
+
+    //region DATA
+    //----------------------------------------------------------------------------------------------------
+    const popupRef$ = ref<any>(null);
+
+    /**
+     * 当前选择的语言.
+     */
+    const currentLocale$ = ref<string>('');
+
+    /**
+     * 语言数据列表.
+     */
+    const localeDataList$ = ref<Array<{ text: string; value: string }>>([]);
+    //----------------------------------------------------------------------------------------------------
+    //endregion
+
+    //region FUNCTION
+    //----------------------------------------------------------------------------------------------------
+    /**
+     * 语言选择--取消.
+     */
+    function onCancel() {
+        popupRef$.value?.close();
+    }
+
+    /**
+     * 语言选择--确定.
+     */
+    function onOk() {
+        console.log('currentLocale$', currentLocale$.value);
+        popupRef$.value?.close();
+    }
+
+    /**
+     * 打开弹窗.
+     */
+    function open() {
+        popupRef$.value?.open();
+    }
+    //----------------------------------------------------------------------------------------------------
+    //endregion
+
+    defineExpose({ open });
+</script>
+
+<style>
+    .kg-locale-selector :deep(.uni-card) {
+        margin: 0 2px 1px 1px !important;
+        box-shadow: none !important;
+        border-radius: 3px !important;
+        border-left-width: 1px !important;
+        padding: 0px !important;
+    }
+
+    .kg-locale-selector :deep(.uni-card) .uni-card__header {
+    }
+
+    .kg-locale-selector :deep(.uni-card) .uni-card__content {
+        padding: 0px !important;
+    }
+
+    .kg-locale-selector :deep(.uni-card) .buttons {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .kg-locale-selector :deep(.uni-card) .buttons uni-button {
+        flex: 1;
+    }
+
+    .kg-locale-selector :deep(.uni-card) .buttons uni-button + uni-button {
+        margin-left: 1px;
+    }
+</style>

package/component/KgLocaleSelector/index.ts

@@ -0,0 +1 @@
+export { default as KgLocaleSelector } from './KgLocaleSelector.vue';

package/component/KgNavBar/KgNavBar.vue

@@ -17,7 +17,7 @@
     import { computed, ref } from 'vue';
     import { UniIcons, UniNavBar } from '../../uni-ui';
     import { KgUtil } from '../../util';
-    import { KgUpdatePopup } from '../KgUpdatePopup';
+    import { KgUpdatePopup } from '../KgUpdateNotice';
 
     /**
      * 顶部标题栏.

package/component/{KgUpdatePopup/KgUpdatePopup.vue → KgUpdateNotice/KgUpdateNotice.vue}

@@ -18,10 +18,11 @@
     </view>
 </template>
 
+<!--升级提示-->
 <script lang="ts" name="KgUpdatePopup" setup>
     import { computed, onMounted, onUnmounted, PropType, ref } from 'vue';
     import { UniPopup, UniPopupDialog } from '../../uni-ui';
-    import { useAppStore } from '../../store/app.store';
+    import { useAppStore } from '../../config/app.store';
     import { KgUtil } from '../../util';
 
     /**

package/component/KgUpdateNotice/index.ts

@@ -0,0 +1,6 @@
+import { default as KgUpdateNotice } from './KgUpdateNotice.vue';
+
+/** @deprecated 已废弃, 请使用 {@link KgUpdateNotice} */
+const KgUpdatePopup = KgUpdateNotice;
+
+export { KgUpdateNotice, KgUpdatePopup };

package/component/{KgWarehouse/KgWarehouse.vue → KgWarehouseSelector/KgWarehouseSelector.vue}

@@ -1,18 +1,19 @@
 <template>
     <UniPopup ref="popupRef" :type="'dialog'">
         <UniPopupDialog :before-close="true" title="选择仓库" @confirm="onOk">
-            <UniDataCheckbox v-model="currentWhId" :localdata="warehouseDatas" />
+            <UniDataCheckbox v-model="currentWhId$" :localdata="warehouseDataList$" />
         </UniPopupDialog>
     </UniPopup>
 </template>
 
+<!--仓库选择-->
 <script lang="ts" setup>
     import { UniDataCheckbox, UniPopup, UniPopupDialog } from '../../uni-ui';
     import { API } from '../../api';
     import { computed, ref } from 'vue';
     import { SysUserWarehouseDTO, WarehouseDTO } from '../../api/WMS/models';
     import { useKgWarehouse } from './index.hooks';
-    import { useAppStore } from '../../store/app.store';
+    import { useAppStore } from '../../config/app.store';
     import { KgUtil } from '../../util';
 
     const emit = defineEmits(['ok']);
@@ -21,18 +22,30 @@
     const kgWarehouse = useKgWarehouse();
 
     const popupRef = ref<any>(null);
-    /** 当前选择的仓库编号. */
-    const currentWhId = ref<string>('');
-    /** 仓库列表. */
-    const warehouses = ref<Array<WarehouseDTO>>([]);
-    /** 选项列表. */
-    const warehouseDatas = ref<Array<{ text: string; value: string }>>([]);
-    /** 用户仓库列表. */
+
+    /**
+     * 当前选择的仓库编号.
+     */
+    const currentWhId$ = ref<string>('');
+
+    /**
+     * 仓库列表.
+     **/
+    const warehouseList$ = ref<Array<WarehouseDTO>>([]);
+
+    /**
+     * 选项列表.
+     */
+    const warehouseDataList$ = ref<Array<{ text: string; value: string }>>([]);
+
+    /**
+     * 用户仓库列表.
+     */
     const userWarehouses = computed<Array<SysUserWarehouseDTO> | undefined>(() => appStore.getUserWarehouses);
 
     /** 确定. */
     function onOk() {
-        kgWarehouse.store.setWarehouse(warehouses.value.find((i) => i.whId === currentWhId.value));
+        kgWarehouse.store.setWarehouse(warehouseList$.value.find((i) => i.whId === currentWhId$.value));
         popupRef.value?.close();
         emit('ok');
     }
@@ -47,7 +60,7 @@
     async function requestWarehouses(): Promise<void> {
         try {
             const { records } = await API.WMS.WarehouseController.ListVO({ params: { pageNo: 1, pageSize: 999 } });
-            warehouses.value = (records ?? []).filter((i) => {
+            warehouseList$.value = (records ?? []).filter((i) => {
                 // 管理员拥有所有仓库
                 if (KgUtil.isAdminUser()) {
                     return true;
@@ -56,20 +69,20 @@
                 return userWarehouses.value?.find((j) => j.wh_id === i.whId);
             });
 
-            warehouseDatas.value = warehouses.value.map((i: WarehouseDTO) => ({
+            warehouseDataList$.value = warehouseList$.value.map((i: WarehouseDTO) => ({
                 text: `${i.whDsc ?? ' '} - ${i.whId ?? ' '}`,
                 value: i.whId ?? '',
             }));
 
-            const currentWarehouse = warehouses.value.find((i) => i.whId === kgWarehouse.warehouse.value?.whId) ?? null;
+            const currentWarehouse = warehouseList$.value.find((i) => i.whId === kgWarehouse.warehouse.value?.whId) ?? null;
             // 如果当前仓库不为空, 且有效(存在于当前仓库列表中), 则继续使用
             if (currentWarehouse) {
-                currentWhId.value = currentWarehouse.whId ?? '';
+                currentWhId$.value = currentWarehouse.whId ?? '';
             }
             // 否则, 清空当前仓库, 并默认选中第一个仓库
             else {
                 kgWarehouse.store.setWarehouse(null);
-                currentWhId.value = warehouses.value[0]?.whId ?? '';
+                currentWhId$.value = warehouseList$.value[0]?.whId ?? '';
             }
         } catch (e) {
             console.error(e);

package/component/{KgWarehouse → KgWarehouseSelector}/index.hooks.ts

@@ -1,7 +1,7 @@
 import { computed, ComputedRef } from 'vue';
 import { IKgWarehouseStore, useKgWarehouseStore } from './index.store';
 import { WarehouseDTO } from '../../api/WMS/models';
-import { useAppStore } from '../../store/app.store';
+import { useAppStore } from '../../config/app.store';
 
 export type IUseKgWarehouse = {
     store: IKgWarehouseStore;
@@ -35,7 +35,6 @@ export function useKgWarehouse(): IUseKgWarehouse {
         return store.getWarehouse;
     });
 
-
     return {
         store,
         warehouse,

package/component/KgWarehouseSelector/index.ts

@@ -0,0 +1,9 @@
+import { default as KgWarehouseSelector } from './KgWarehouseSelector.vue';
+
+/** @deprecated 已废弃, 请使用 {@link KgWarehouseSelector} */
+const KgWarehouse = KgWarehouseSelector;
+
+export { KgWarehouseSelector, KgWarehouse };
+
+export * from './index.hooks';
+export * from './index.store';

package/component/{KgStation/KgStation.vue → KgWorkStationSelector/KgWorkStationSelector.vue}

@@ -27,6 +27,7 @@
     </UniPopup>
 </template>
 
+<!--工作站过工作区选择-->
 <script lang="ts" setup>
     import { UniDataSelect, UniEasyinput, UniPopup, UniPopupDialog } from '../../uni-ui';
     import { computed, nextTick, ref, watch } from 'vue';
@@ -64,9 +65,7 @@
     /**
      * 工作站下拉列表.
      */
-    const stationDatas = computed<Array<{ text: string; value: string }>>(() =>
-        stations.value.map((i) => ({ text: i.devcodDsc ?? 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 ?? '' })));
 
     /**
      * 工作区下拉列表.

package/component/{KgStation → KgWorkStationSelector}/index.hooks.ts

@@ -1,6 +1,6 @@
 import { computed, ComputedRef } from 'vue';
 import { IKgStationStore, useKgStationStore } from './index.store';
-import { useKgWarehouse } from '../KgWarehouse';
+import { useKgWarehouse } from '../KgWarehouseSelector';
 import { WorkstationAreaDTO, WorkstationDTO } from '../../api/WMS/models';
 
 export type IUseKgStation = {

package/component/KgWorkStationSelector/index.ts

@@ -0,0 +1,9 @@
+import { default as KgWorkStationSelector } from './KgWorkStationSelector.vue';
+
+/** @deprecated 已废弃, 请使用 {@link KgWorkStationSelector} */
+const KgStation = KgWorkStationSelector;
+
+export { KgWorkStationSelector, KgStation };
+
+export * from './index.hooks';
+export * from './index.store';

package/component/index.ts

@@ -1,5 +1,6 @@
+export * from './KgLocaleSelector';
 export * from './KgNavBar';
-export * from './KgStation';
 export * from './KgTabBar';
-export * from './KgUpdatePopup';
-export * from './KgWarehouse';
+export * from './KgUpdateNotice';
+export * from './KgWarehouseSelector';
+export * from './KgWorkStationSelector';

package/{store → config}/app.store.ts

@@ -25,6 +25,7 @@ interface IAppState {
     userWarehouses: Array<SysUserWarehouseDTO> | undefined;
 }
 
+// TODO LT 移到 config.store.ts 中去
 export const useAppStore = defineStore('app', {
     actions: {
         /**

package/config/index.ts

@@ -14,5 +14,7 @@ const setup = kgConfig;
 //----------------------------------------------------------------------------------------------------
 //endregion
 
-export * from './config.hooks';
 export { kgConfig, setup };
+
+export * from './config.hooks';
+export * from './config.store';

package/index.ts

@@ -3,6 +3,5 @@ export * from './component';
 export * from './config';
 export * from './model';
 export * from './service';
-export * from './store/app.store';
 export * from './uni-ui';
 export * from './util';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kengic/uni",
-    "version": "0.7.14-beta.2",
+    "version": "0.7.14-beta.4",
     "scripts": {
         "postinstall": "node bin/postinstall.mjs"
     },

package/page/KgPageMy.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="my">
         <UniList class="uni-list--setting">
-            <UniListItem link title="语言" :right-text="localeRightText$$" @click="$LocalePopup$open" />
+            <UniListItem link title="语言" :right-text="localeRightText$$" @click="openKgLocaleSelector" />
             <UniListItem link title="仓库" :right-text="warehouseRightText$$" @click="openKgWarehouse" />
             <UniListItem link title="工作站 - 工作区" :right-text="stationRightText$$" @click="openKgStation" />
             <UniListItem link title="后端服务地址" :right-text="apiUrl" />
@@ -15,35 +15,21 @@
         </UniList>
     </view>
 
-    <UniPopup ref="localePopupRef$" :type="'bottom'" class="my--uni-popup--locale">
-        <UniCard :isFull="true" :title="'语言'">
-            <view>
-                <view class="body">
-                    <view v-for="item in KG.LOCALE_DATA_LIST" :key="item.code" class="item">{{ item.text }}</view>
-                </view>
-                <view class="buttons">
-                    <button class="btn btn-cancel" @tap.stop="$LocalePopup$cancel()">取消</button>
-                    <button :type="'primary' as any" class="btn btn-ok" @tap.stop="$LocalePopup$ok">确认</button>
-                </view>
-            </view>
-        </UniCard>
-    </UniPopup>
-
-    <KgWarehouse ref="kgWarehouseRef$"></KgWarehouse>
-    <KgStation ref="kgStationRef$"></KgStation>
+    <KgLocaleSelector ref="kgLocaleSelectorRef$" />
+    <KgWarehouseSelector ref="kgWarehouseRef$" />
+    <KgWorkStationSelector ref="kgStationRef$" />
     <!--#ifdef APP-PLUS-->
-    <KgUpdatePopup />
+    <KgUpdateNotice />
     <!--#endif-->
     <KgTabBar />
 </template>
 
 <script setup lang="ts">
     import { computed, ref } from 'vue';
-    import { useAppStore } from '../store/app.store';
-    import { KgStation, KgTabBar, KgUpdatePopup, KgWarehouse, useKgStation, useKgWarehouse } from '../component';
-    import { UniCard, UniList, UniListItem, UniPopup } from '../uni-ui';
+    import { useAppStore } from '../config/app.store';
+    import { KgTabBar, KgUpdateNotice, KgWarehouseSelector, KgWorkStationSelector, useKgStation, useKgWarehouse } from '../component';
+    import { UniList, UniListItem } from '../uni-ui';
     import { KgUtil } from '../util';
-    import { KG } from '../model';
 
     const appStore = useAppStore();
     const kgWarehouse = useKgWarehouse();
@@ -53,7 +39,7 @@
     // ----------------------------------------------------------------------------------------------------
     const kgWarehouseRef$ = ref<any>(null);
     const kgStationRef$ = ref<any>(null);
-    const localePopupRef$ = ref<any>(null);
+    const kgLocaleSelectorRef$ = ref<any>(null);
 
     /**
      * 语言的右侧文本.
@@ -98,35 +84,21 @@
     }
 
     /**
-     * 语言选择弹窗--打开.
+     * 打开「语言选择」.
      */
-    function $LocalePopup$open() {
-        localePopupRef$.value?.open();
+    function openKgLocaleSelector() {
+        kgLocaleSelectorRef$.value?.open();
     }
 
     /**
-     * 语言选择弹窗--取消.
-     */
-    function $LocalePopup$cancel() {
-        localePopupRef$.value?.close();
-    }
-
-    /**
-     * 语言选择弹窗--确定.
-     */
-    function $LocalePopup$ok() {
-        localePopupRef$.value?.close();
-    }
-
-    /**
-     * 打开仓库选择弹窗.
+     * 打开「仓库选择」.
      */
     function openKgWarehouse() {
         kgWarehouseRef$.value?.open();
     }
 
     /**
-     * 打开工作站选择弹窗.
+     * 打开「工作站工作区选择」.
      */
     function openKgStation() {
         kgStationRef$.value?.open();
@@ -176,33 +148,4 @@
     .my :deep .uni-list-item__content-title {
         font-size: 13px;
     }
-
-    .my--uni-popup--locale :deep(.uni-card) {
-        margin: 0 2px 1px 1px !important;
-        box-shadow: none !important;
-        border-radius: 3px !important;
-        border-left-width: 1px !important;
-        padding: 0px !important;
-    }
-
-    .my--uni-popup--locale :deep(.uni-card) .uni-card__header {
-    }
-
-    .my--uni-popup--locale :deep(.uni-card) .uni-card__content {
-        padding: 0px !important;
-    }
-
-    .my--uni-popup--locale :deep(.uni-card) .buttons {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
-
-    .my--uni-popup--locale :deep(.uni-card) .buttons uni-button {
-        flex: 1;
-    }
-
-    .my--uni-popup--locale :deep(.uni-card) .buttons uni-button + uni-button {
-        margin-left: 1px;
-    }
 </style>

package/service/http-client.ts

@@ -1,7 +1,7 @@
-import { useAppStore } from '../store/app.store';
+import { useAppStore } from '../config/app.store';
 import { KgUtil } from '../util';
-import { useKgWarehouse } from '../component/KgWarehouse/index.hooks';
-import { useKgStation } from '../component/KgStation';
+import { useKgWarehouse } from '../component/KgWarehouseSelector/index.hooks';
+import { useKgStation } from '../component/KgWorkStationSelector';
 import { isNil } from 'lodash-es';
 import dayjs from 'dayjs';
 import { KG } from '../model';
@@ -305,8 +305,6 @@ const _httpClient: IHttpClient = {
                             break;
 
                         case 401:
-                            // store.dispatch('logout');
-
                             reject(response);
                             break;
 

package/util/kg.util.ts

@@ -2,7 +2,7 @@ import { cloneDeep, isArray, isNil, isObjectLike, reduce } from 'lodash-es';
 import { toRaw, unref } from 'vue';
 import { API } from '../api';
 import { useKgStation, useKgWarehouse } from '../component';
-import { useAppStore } from '../store/app.store';
+import { useAppStore } from '../config/app.store';
 import dayjs, { Dayjs } from 'dayjs';
 import { KG } from '../model';
 

package/component/KgStation/index.ts

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

package/component/KgUpdatePopup/index.ts

@@ -1 +0,0 @@
-export { default as KgUpdatePopup } from './KgUpdatePopup.vue';

package/component/KgWarehouse/index.ts

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