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

package/api/WMS/Controllers/CommonController/GetLatestApkVersion.ts

@@ -1,21 +1,21 @@
-// noinspection ES6UnusedImports
-
-import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
-import * as DEF from '../../../def';
-import { keys } from '../../models';
-
-/** 请求参数. */
-export class GetLatestApkVersionQuery {}
-
-/**
- * 获取 APK 最新的版本号.
- *
- * @param config 请求配置.
- * @param option 请求选项.
- */
-export function GetLatestApkVersion(config?: IRequestConfig<GetLatestApkVersionQuery, {}>, option?: IRequestOptions): Promise<string> {
-    return httpClient().request({ method: GetLatestApkVersion.method, url: GetLatestApkVersion.url, ...(config ?? {}) }, option);
-}
-
-GetLatestApkVersion.method = 'GET' as const;
-GetLatestApkVersion.url = '/sys/common/getLatestApkVersion';
+// noinspection ES6UnusedImports
+
+import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
+import * as DEF from '../../../def';
+import { keys } from '../../models';
+
+/** 请求参数. */
+export class GetLatestApkVersionQuery {}
+
+/**
+ * 获取 APK 最新的版本号.
+ *
+ * @param config 请求配置.
+ * @param option 请求选项.
+ */
+export function GetLatestApkVersion(config?: IRequestConfig<GetLatestApkVersionQuery, {}>, option?: IRequestOptions): Promise<string> {
+    return httpClient().request({ method: GetLatestApkVersion.method, url: GetLatestApkVersion.url, ...(config ?? {}) }, option);
+}
+
+GetLatestApkVersion.method = 'GET' as const;
+GetLatestApkVersion.url = '/sys/common/getLatestApkVersion';

package/api/WMS/Controllers/CommonController/index.ts

@@ -1 +1 @@
-export { GetLatestApkVersion, GetLatestApkVersionQuery } from './GetLatestApkVersion';
+export { GetLatestApkVersion, GetLatestApkVersionQuery } from './GetLatestApkVersion';

package/api/WMS/Controllers/LoginController/GetUserInfo.ts

@@ -1,21 +1,21 @@
-// noinspection ES6UnusedImports
-
-import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
-import * as DEF from '../../../def';
-import { keys } from '../../models';
-
-/** 请求参数. */
-export class GetUserInfoQuery {}
-
-/**
- * 获取用户信息.
- *
- * @param config 请求配置.
- * @param option 请求选项.
- */
-export function GetUserInfo(config?: IRequestConfig<GetUserInfoQuery, {}>, option?: IRequestOptions): Promise<Record<any, any>> {
-    return httpClient().request({ method: GetUserInfo.method, url: GetUserInfo.url, ...(config ?? {}) }, option);
-}
-
-GetUserInfo.method = 'GET' as const;
-GetUserInfo.url = '/sys/getUserInfo';
+// noinspection ES6UnusedImports
+
+import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
+import * as DEF from '../../../def';
+import { keys } from '../../models';
+
+/** 请求参数. */
+export class GetUserInfoQuery {}
+
+/**
+ * 获取用户信息.
+ *
+ * @param config 请求配置.
+ * @param option 请求选项.
+ */
+export function GetUserInfo(config?: IRequestConfig<GetUserInfoQuery, {}>, option?: IRequestOptions): Promise<Record<any, any>> {
+    return httpClient().request({ method: GetUserInfo.method, url: GetUserInfo.url, ...(config ?? {}) }, option);
+}
+
+GetUserInfo.method = 'GET' as const;
+GetUserInfo.url = '/sys/getUserInfo';

package/api/WMS/Controllers/LoginController/Logout.ts

@@ -1,21 +1,21 @@
-// noinspection ES6UnusedImports
-
-import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
-import * as DEF from '../../../def';
-import { keys } from '../../models';
-
-/** 请求参数. */
-export class LogoutQuery {}
-
-/**
- * 退出登录.
- *
- * @param config 请求配置.
- * @param option 请求选项.
- */
-export function Logout(config?: IRequestConfig<LogoutQuery, {}>, option?: IRequestOptions): Promise<Record<any, any>> {
-    return httpClient().request({ method: Logout.method, url: Logout.url, ...(config ?? {}) }, option);
-}
-
-Logout.method = 'GET' as const;
-Logout.url = '/sys/logout';
+// noinspection ES6UnusedImports
+
+import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
+import * as DEF from '../../../def';
+import { keys } from '../../models';
+
+/** 请求参数. */
+export class LogoutQuery {}
+
+/**
+ * 退出登录.
+ *
+ * @param config 请求配置.
+ * @param option 请求选项.
+ */
+export function Logout(config?: IRequestConfig<LogoutQuery, {}>, option?: IRequestOptions): Promise<Record<any, any>> {
+    return httpClient().request({ method: Logout.method, url: Logout.url, ...(config ?? {}) }, option);
+}
+
+Logout.method = 'GET' as const;
+Logout.url = '/sys/logout';

package/api/WMS/Controllers/LoginController/index.ts

@@ -1,2 +1,2 @@
-export { GetUserInfo, GetUserInfoQuery } from './GetUserInfo';
-export { Logout, LogoutQuery } from './Logout';
+export { GetUserInfo, GetUserInfoQuery } from './GetUserInfo';
+export { Logout, LogoutQuery } from './Logout';

package/api/WMS/Controllers/WorkstationController/List.ts

@@ -1,45 +1,45 @@
-// noinspection ES6UnusedImports
-
-import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
-import * as DEF from '../../../def';
-import { keys } from '../../models';
-
-/** 请求参数. */
-export class ListQuery {
-    /** 排序字段. */
-    public column?: string | null;
-    /** 排序方式. */
-    public order?: 'asc' | 'desc' | null;
-    /** 当前页数. */
-    public pageNo?: number | null;
-    /** 每页条数. */
-    public pageSize?: number | null;
-
-    public constructor(obj?: ListQuery) {
-        keys(obj ?? {}).forEach((key: PropertyKey) => {
-            switch (key) {
-                case 'column':
-                case 'order':
-                case 'pageNo':
-                case 'pageSize':
-                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
-                    break;
-                default:
-                    break;
-            }
-        });
-    }
-}
-
-/**
- * 工作站-分页列表查询.
- *
- * @param config 请求配置.
- * @param option 请求选项.
- */
-export function List(config?: IRequestConfig<ListQuery, {}>, option?: IRequestOptions): Promise<DEF.WMS.IPage<DEF.WMS.WorkstationDTO>> {
-    return httpClient().request({ method: List.method, url: List.url, ...(config ?? {}) }, option);
-}
-
-List.method = 'GET' as const;
-List.url = '/workstation/workstation/list';
+// noinspection ES6UnusedImports
+
+import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
+import * as DEF from '../../../def';
+import { keys } from '../../models';
+
+/** 请求参数. */
+export class ListQuery {
+    /** 排序字段. */
+    public column?: string | null;
+    /** 排序方式. */
+    public order?: 'asc' | 'desc' | null;
+    /** 当前页数. */
+    public pageNo?: number | null;
+    /** 每页条数. */
+    public pageSize?: number | null;
+
+    public constructor(obj?: ListQuery) {
+        keys(obj ?? {}).forEach((key: PropertyKey) => {
+            switch (key) {
+                case 'column':
+                case 'order':
+                case 'pageNo':
+                case 'pageSize':
+                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+}
+
+/**
+ * 工作站-分页列表查询.
+ *
+ * @param config 请求配置.
+ * @param option 请求选项.
+ */
+export function List(config?: IRequestConfig<ListQuery, {}>, option?: IRequestOptions): Promise<DEF.WMS.IPage<DEF.WMS.WorkstationDTO>> {
+    return httpClient().request({ method: List.method, url: List.url, ...(config ?? {}) }, option);
+}
+
+List.method = 'GET' as const;
+List.url = '/workstation/workstation/list';

package/api/WMS/Controllers/WorkstationController/index.ts

@@ -1 +1 @@
-export { List, ListQuery } from './List';
+export { List, ListQuery } from './List';

package/api/WMS/index.ts

@@ -1,2 +1,2 @@
-export * as WMSAPI from './Controllers';
-export * as WMSDEF from './models';
+export * as WMSAPI from './Controllers';
+export * as WMSDEF from './models';

package/api/api.ts

@@ -1 +1 @@
-export { WMSAPI as WMS } from './WMS';
+export { WMSAPI as WMS } from './WMS';

package/api/def.ts

@@ -1 +1 @@
-export { WMSDEF as WMS } from './WMS';
+export { WMSDEF as WMS } from './WMS';

package/api/index.ts

@@ -1,2 +1,2 @@
-export * as API from './api';
-export * as DEF from './def';
+export * as API from './api';
+export * as DEF from './def';

package/component/KgLocaleSelector/KgLocaleSelector.vue

@@ -0,0 +1,110 @@
+<template>
+    <UniPopup ref="popupRef$" :type="'bottom'" class="kg-locale-selector">
+        <UniCard :isFull="true" :title="'选择语言'">
+            <view>
+                <view class="body">
+                    <UniDataCheckbox :localdata="localeDataList$$" :modelValue="kg.locale" @update:modelValue="kg.setLocale($event)" />
+                </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 { UniCard, UniDataCheckbox, UniPopup } from '../../uni-ui';
+    import { computed, ref } from 'vue';
+    import { KG } from '../../model';
+    import { useKg } from '../../config';
+
+    const kg = useKg();
+
+    //region DATA
+    //----------------------------------------------------------------------------------------------------
+    const popupRef$ = ref<any>(null);
+
+    /**
+     * 语言数据列表.
+     */
+    const localeDataList$$ = computed<Array<{ text: string; value: string }>>(() => {
+        return KG.LOCALE_DATA_LIST.map((i) => ({ text: i.text, value: i.code }));
+    });
+    //----------------------------------------------------------------------------------------------------
+    //endregion
+
+    //region FUNCTION
+    //----------------------------------------------------------------------------------------------------
+    /**
+     * 语言选择--取消.
+     */
+    function onCancel() {
+        popupRef$.value?.close();
+    }
+
+    /**
+     * 语言选择--确定.
+     */
+    function onOk() {
+        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) .body {
+        border-bottom: 1px solid #eeeeee;
+        margin-bottom: 1px;
+    }
+
+    .kg-locale-selector :deep(.uni-card) .body .uni-data-checklist .checklist-group {
+        flex-direction: column;
+    }
+
+    .kg-locale-selector :deep(.uni-card) .body .uni-data-checklist .checklist-group .checklist-box {
+        margin: 0;
+        padding: 12px;
+    }
+
+    .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}

@@ -1,6 +1,6 @@
 <template>
     <view :class="getClass">
-        <UniPopup ref="popupRef" type="dialog">
+        <UniPopup ref="popupRef$" type="dialog">
             <UniPopupDialog
                 :beforeClose="true"
                 :cancelText="downloadTask ? '取消升级' : '以后再说'"
@@ -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';
 
     /**
@@ -39,7 +40,7 @@
 
     //region DATA
     // ----------------------------------------------------------------------------------------------------
-    const popupRef = ref<any>(null);
+    const popupRef$ = ref<any>(null);
     /** 下载任务. */
     const downloadTask = ref<UniNamespace.DownloadTask | null>(null);
     /** 下载进度. [0, 100] 之间的某个数值, 表示百分比的分子. */
@@ -117,7 +118,7 @@
 
         clearInterval(downloadProgressTimer.value);
 
-        popupRef.value?.close();
+        popupRef$.value?.close();
     }
 
     /**
@@ -130,7 +131,7 @@
 
         clearInterval(downloadProgressTimer.value);
 
-        popupRef.value?.close();
+        popupRef$.value?.close();
     }
     //endregion
 
@@ -141,7 +142,7 @@
             switch (name) {
                 case 'openKgUpdatePopup':
                     version.value = args[0];
-                    popupRef.value?.open();
+                    popupRef$.value?.open();
                     break;
             }
         });

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'">
+    <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']);
@@ -20,26 +21,38 @@
     const appStore = useAppStore();
     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 popupRef$ = ref<any>(null);
+
+    /**
+     * 当前选择的仓库编号.
+     */
+    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));
-        popupRef.value?.close();
+        kgWarehouse.store.setWarehouse(warehouseList$.value.find((i) => i.whId === currentWhId$.value));
+        popupRef$.value?.close();
         emit('ok');
     }
 
     /** 打开弹窗. */
     function open() {
-        popupRef.value?.open();
+        popupRef$.value?.open();
         requestWarehouses();
     }
 
@@ -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}

@@ -1,5 +1,5 @@
 <template>
-    <UniPopup ref="popupRef" :type="'dialog'">
+    <UniPopup ref="popupRef$" :type="'dialog'">
         <UniPopupDialog :before-close="true" title="选择工作站" @close="onClose" @confirm="onOk">
             <div class="row">
                 <div class="label">工作站:</div>
@@ -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';
@@ -40,7 +41,7 @@
 
     //region DATA
     // ----------------------------------------------------------------------------------------------------
-    const popupRef = ref<any>(null);
+    const popupRef$ = ref<any>(null);
 
     /** 当前选择的工作站编号. */
     const currentDevcod = ref<string>('');
@@ -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 ?? '' })));
 
     /**
      * 工作区下拉列表.
@@ -168,7 +167,7 @@
      * 取消.
      */
     function onClose() {
-        popupRef.value?.close();
+        popupRef$.value?.close();
     }
 
     /**
@@ -183,13 +182,13 @@
             kgStation.store.setStation(null);
         }
 
-        popupRef.value?.close();
+        popupRef$.value?.close();
         emit('ok');
     }
 
     /** 打开弹窗. */
     function open() {
-        popupRef.value?.open();
+        popupRef$.value?.open();
 
         currentDevcod.value = kgStation.station.value?.devcod ?? '';
         currentHmewrkare.value = kgStation.station.value?.hmewrkare ?? '';

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';