@kengic/uni 0.4.1 → 0.5.0

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

@@ -1,28 +1,28 @@
-// 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<number> {
-    return httpClient().request(
-        {
-            method: GetLatestApkVersion.method,
-            url: `${option?.mock ? '/mock' : ''}${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: `${option?.mock ? '/mock' : ''}${GetLatestApkVersion.url}`,
+            ...(config ?? {}),
+        },
+        option,
+    );
+}
+
+GetLatestApkVersion.method = 'GET' as const;
+GetLatestApkVersion.url = '/sys/common/getLatestApkVersion';

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

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

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

@@ -1,28 +1,28 @@
-// 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: `${option?.mock ? '/mock' : ''}${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: `${option?.mock ? '/mock' : ''}${Logout.url}`,
+            ...(config ?? {}),
+        },
+        option,
+    );
+}
+
+Logout.method = 'GET' as const;
+Logout.url = '/sys/logout';

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

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

package/dist/api/WMS/Controllers/WhController/ListVO.ts

@@ -1,92 +1,92 @@
-// noinspection ES6UnusedImports
-
-import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
-import * as DEF from '../../../def';
-import { keys } from '../../models';
-
-/** 请求参数. */
-export class ListVOQuery {
-    /** 是否可用 */
-    public activeFlg?: number | null;
-    /** 地址编号 */
-    public adrId?: string | null;
-    /** 地址名 */
-    public adrnam?: string | null;
-    /** 公司代码 */
-    public comCod?: string | null;
-    /** 默认仓库 */
-    public defWhFlg?: number | null;
-    /** 主键. */
-    public id?: string | null;
-    /** 所属地/国编号 */
-    public orgcod?: string | null;
-    /** 永久调整托盘 */
-    public permAdjLod?: string | null;
-    /** 永久调整箱 */
-    public permAdjSub?: string | null;
-    /** 永久创建托盘 */
-    public permCreLod?: string | null;
-    /** 永久创建箱 */
-    public permCreSub?: string | null;
-    /** 仓库名称 */
-    public whDsc?: string | null;
-    /** 仓库编号 */
-    public whId?: string | null;
-    /** 排序字段. */
-    public column?: string | null;
-    /** 排序方式. */
-    public order?: 'asc' | 'desc' | null;
-    /** 当前页数. */
-    public pageNo?: number | null;
-    /** 每页条数. */
-    public pageSize?: number | null;
-
-    public constructor(obj?: ListVOQuery) {
-        keys(obj ?? {}).forEach((key: PropertyKey) => {
-            switch (key) {
-                case 'activeFlg':
-                case 'adrId':
-                case 'adrnam':
-                case 'comCod':
-                case 'defWhFlg':
-                case 'id':
-                case 'orgcod':
-                case 'permAdjLod':
-                case 'permAdjSub':
-                case 'permCreLod':
-                case 'permCreSub':
-                case 'whDsc':
-                case 'whId':
-                case 'column':
-                case 'order':
-                case 'pageNo':
-                case 'pageSize':
-                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
-                    break;
-                default:
-                    break;
-            }
-        });
-    }
-}
-
-/**
- * wh-分页列表查询VO
-wh-分页列表查询VO
- *
- * @param config 请求配置.
- * @param option 请求选项.
- */
-export function ListVO(config?: IRequestConfig<ListVOQuery, {}>, option?: IRequestOptions): Promise<DEF.WMS.IPage<DEF.WMS.WhDTO>> {
-    return httpClient().request(
-        {
-            method: ListVO.method,
-            url: `${option?.mock ? '/mock' : ''}${ListVO.url}`,
-            ...(config ?? {}),
-        },
-        option,
-    );
-}
-
-ListVO.method = 'GET' as const;
-ListVO.url = '/wh/wh/listVO';
+// noinspection ES6UnusedImports
+
+import { httpClient, IRequestConfig, IRequestOptions } from '../../../../service';
+import * as DEF from '../../../def';
+import { keys } from '../../models';
+
+/** 请求参数. */
+export class ListVOQuery {
+    /** 是否可用 */
+    public activeFlg?: number | null;
+    /** 地址编号 */
+    public adrId?: string | null;
+    /** 地址名 */
+    public adrnam?: string | null;
+    /** 公司代码 */
+    public comCod?: string | null;
+    /** 默认仓库 */
+    public defWhFlg?: number | null;
+    /** 主键. */
+    public id?: string | null;
+    /** 所属地/国编号 */
+    public orgcod?: string | null;
+    /** 永久调整托盘 */
+    public permAdjLod?: string | null;
+    /** 永久调整箱 */
+    public permAdjSub?: string | null;
+    /** 永久创建托盘 */
+    public permCreLod?: string | null;
+    /** 永久创建箱 */
+    public permCreSub?: string | null;
+    /** 仓库名称 */
+    public whDsc?: string | null;
+    /** 仓库编号 */
+    public whId?: string | null;
+    /** 排序字段. */
+    public column?: string | null;
+    /** 排序方式. */
+    public order?: 'asc' | 'desc' | null;
+    /** 当前页数. */
+    public pageNo?: number | null;
+    /** 每页条数. */
+    public pageSize?: number | null;
+
+    public constructor(obj?: ListVOQuery) {
+        keys(obj ?? {}).forEach((key: PropertyKey) => {
+            switch (key) {
+                case 'activeFlg':
+                case 'adrId':
+                case 'adrnam':
+                case 'comCod':
+                case 'defWhFlg':
+                case 'id':
+                case 'orgcod':
+                case 'permAdjLod':
+                case 'permAdjSub':
+                case 'permCreLod':
+                case 'permCreSub':
+                case 'whDsc':
+                case 'whId':
+                case 'column':
+                case 'order':
+                case 'pageNo':
+                case 'pageSize':
+                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+}
+
+/**
+ * wh-分页列表查询VO
+wh-分页列表查询VO
+ *
+ * @param config 请求配置.
+ * @param option 请求选项.
+ */
+export function ListVO(config?: IRequestConfig<ListVOQuery, {}>, option?: IRequestOptions): Promise<DEF.WMS.IPage<DEF.WMS.WhDTO>> {
+    return httpClient().request(
+        {
+            method: ListVO.method,
+            url: `${option?.mock ? '/mock' : ''}${ListVO.url}`,
+            ...(config ?? {}),
+        },
+        option,
+    );
+}
+
+ListVO.method = 'GET' as const;
+ListVO.url = '/wh/wh/listVO';

package/dist/api/WMS/Controllers/WhController/index.ts

@@ -1 +1 @@
-export { ListVO, ListVOQuery } from './ListVO';
+export { ListVO, ListVOQuery } from './ListVO';

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

@@ -1,3 +1,3 @@
-export * as CommonController from './CommonController';
-export * as LoginController from './LoginController';
-export * as WhController from './WhController';
+export * as CommonController from './CommonController';
+export * as LoginController from './LoginController';
+export * as WhController from './WhController';

package/dist/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/dist/api/WMS/models.ts

@@ -1,192 +1,192 @@
-export class IPage<T0> {
-    /** Current. */
-    public current?: number | null;
-    /** Pages. */
-    public pages?: number | null;
-    /** Records. */
-    public records?: Array<T0> | null;
-    /** Size. */
-    public size?: number | null;
-    /** Total. */
-    public total?: number | null;
-
-    public constructor(obj?: IPage<T0>) {
-        keys(obj ?? {}).forEach((key: PropertyKey) => {
-            switch (key) {
-                case 'current':
-                case 'pages':
-                case 'records':
-                case 'size':
-                case 'total':
-                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
-                    break;
-                default:
-                    break;
-            }
-        });
-    }
-}
-
-/** 用户. */
-export class SysUser {
-    /** Activiti Sync. */
-    public activitiSync?: number | null;
-    /** 头像. */
-    public avatar?: string | null;
-    /** Birthday. */
-    public birthday?: string | null;
-    /** Client Id. */
-    public clientId?: string | null;
-    /** Create By. */
-    public createBy?: string | null;
-    /** Create Time. */
-    public createTime?: string | null;
-    /** Del Flag. */
-    public delFlag?: number | null;
-    /** Depart Ids. */
-    public departIds?: string | null;
-    /** 邮件. */
-    public email?: string | null;
-    /** Home Path. */
-    public homePath?: string | null;
-    /** Id. */
-    public id?: string | null;
-    /** Org Code. */
-    public orgCode?: string | null;
-    /** Org Code Txt. */
-    public orgCodeTxt?: string | null;
-    /** Password. */
-    public password?: string | null;
-    /** 电话. */
-    public phone?: string | null;
-    /** Post. */
-    public post?: string | null;
-    /** 姓名. */
-    public realname?: string | null;
-    /** Rel Tenant Ids. */
-    public relTenantIds?: string | null;
-    /** Salt. */
-    public salt?: string | null;
-    /** Sex. */
-    public sex?: number | null;
-    /** 状态. */
-    public status?: number | null;
-    /** Telephone. */
-    public telephone?: string | null;
-    /** Update By. */
-    public updateBy?: string | null;
-    /** Update Time. */
-    public updateTime?: string | null;
-    /** User Identity. */
-    public userIdentity?: number | null;
-    /** 账号. */
-    public username?: string | null;
-    /** 工号. */
-    public workNo?: string | null;
-
-    public constructor(obj?: SysUser) {
-        keys(obj ?? {}).forEach((key: PropertyKey) => {
-            switch (key) {
-                case 'activitiSync':
-                case 'avatar':
-                case 'birthday':
-                case 'clientId':
-                case 'createBy':
-                case 'createTime':
-                case 'delFlag':
-                case 'departIds':
-                case 'email':
-                case 'homePath':
-                case 'id':
-                case 'orgCode':
-                case 'orgCodeTxt':
-                case 'password':
-                case 'phone':
-                case 'post':
-                case 'realname':
-                case 'relTenantIds':
-                case 'salt':
-                case 'sex':
-                case 'status':
-                case 'telephone':
-                case 'updateBy':
-                case 'updateTime':
-                case 'userIdentity':
-                case 'username':
-                case 'workNo':
-                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
-                    break;
-                default:
-                    break;
-            }
-        });
-    }
-}
-
-/** 仓库数据传输对象 */
-export class WhDTO {
-    /** 是否可用 */
-    public activeFlg?: number | null;
-    /** 地址编号 */
-    public adrId?: string | null;
-    /** 地址名 */
-    public adrnam?: string | null;
-    /** 公司代码 */
-    public comCod?: string | null;
-    /** 默认仓库 */
-    public defWhFlg?: number | null;
-    /** 主键. */
-    public id?: string | null;
-    /** 所属地/国编号 */
-    public orgcod?: string | null;
-    /** 永久调整托盘 */
-    public permAdjLod?: string | null;
-    /** 永久调整箱 */
-    public permAdjSub?: string | null;
-    /** 永久创建托盘 */
-    public permCreLod?: string | null;
-    /** 永久创建箱 */
-    public permCreSub?: string | null;
-    /** 仓库名称 */
-    public whDsc?: string | null;
-    /** 仓库编号 */
-    public whId?: string | null;
-
-    public constructor(obj?: WhDTO) {
-        keys(obj ?? {}).forEach((key: PropertyKey) => {
-            switch (key) {
-                case 'activeFlg':
-                case 'adrId':
-                case 'adrnam':
-                case 'comCod':
-                case 'defWhFlg':
-                case 'id':
-                case 'orgcod':
-                case 'permAdjLod':
-                case 'permAdjSub':
-                case 'permCreLod':
-                case 'permCreSub':
-                case 'whDsc':
-                case 'whId':
-                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
-                    break;
-                default:
-                    break;
-            }
-        });
-    }
-}
-
-/**
- * 获取对象的属性名数组.
- * @param obj 对象.
- */
-export function keys<C extends object>(obj: C): Array<keyof C> {
-    const type = typeof obj;
-
-    if (!(obj != null && (type === 'object' || type === 'function'))) {
-        return [];
-    }
-
-    return Reflect.ownKeys(obj) as Array<keyof C>;
-}
+export class IPage<T0> {
+    /** Current. */
+    public current?: number | null;
+    /** Pages. */
+    public pages?: number | null;
+    /** Records. */
+    public records?: Array<T0> | null;
+    /** Size. */
+    public size?: number | null;
+    /** Total. */
+    public total?: number | null;
+
+    public constructor(obj?: IPage<T0>) {
+        keys(obj ?? {}).forEach((key: PropertyKey) => {
+            switch (key) {
+                case 'current':
+                case 'pages':
+                case 'records':
+                case 'size':
+                case 'total':
+                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+}
+
+/** 用户. */
+export class SysUser {
+    /** Activiti Sync. */
+    public activitiSync?: number | null;
+    /** 头像. */
+    public avatar?: string | null;
+    /** Birthday. */
+    public birthday?: string | null;
+    /** Client Id. */
+    public clientId?: string | null;
+    /** Create By. */
+    public createBy?: string | null;
+    /** Create Time. */
+    public createTime?: string | null;
+    /** Del Flag. */
+    public delFlag?: number | null;
+    /** Depart Ids. */
+    public departIds?: string | null;
+    /** 邮件. */
+    public email?: string | null;
+    /** Home Path. */
+    public homePath?: string | null;
+    /** Id. */
+    public id?: string | null;
+    /** Org Code. */
+    public orgCode?: string | null;
+    /** Org Code Txt. */
+    public orgCodeTxt?: string | null;
+    /** Password. */
+    public password?: string | null;
+    /** 电话. */
+    public phone?: string | null;
+    /** Post. */
+    public post?: string | null;
+    /** 姓名. */
+    public realname?: string | null;
+    /** Rel Tenant Ids. */
+    public relTenantIds?: string | null;
+    /** Salt. */
+    public salt?: string | null;
+    /** Sex. */
+    public sex?: number | null;
+    /** 状态. */
+    public status?: number | null;
+    /** Telephone. */
+    public telephone?: string | null;
+    /** Update By. */
+    public updateBy?: string | null;
+    /** Update Time. */
+    public updateTime?: string | null;
+    /** User Identity. */
+    public userIdentity?: number | null;
+    /** 账号. */
+    public username?: string | null;
+    /** 工号. */
+    public workNo?: string | null;
+
+    public constructor(obj?: SysUser) {
+        keys(obj ?? {}).forEach((key: PropertyKey) => {
+            switch (key) {
+                case 'activitiSync':
+                case 'avatar':
+                case 'birthday':
+                case 'clientId':
+                case 'createBy':
+                case 'createTime':
+                case 'delFlag':
+                case 'departIds':
+                case 'email':
+                case 'homePath':
+                case 'id':
+                case 'orgCode':
+                case 'orgCodeTxt':
+                case 'password':
+                case 'phone':
+                case 'post':
+                case 'realname':
+                case 'relTenantIds':
+                case 'salt':
+                case 'sex':
+                case 'status':
+                case 'telephone':
+                case 'updateBy':
+                case 'updateTime':
+                case 'userIdentity':
+                case 'username':
+                case 'workNo':
+                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+}
+
+/** 仓库数据传输对象 */
+export class WhDTO {
+    /** 是否可用 */
+    public activeFlg?: number | null;
+    /** 地址编号 */
+    public adrId?: string | null;
+    /** 地址名 */
+    public adrnam?: string | null;
+    /** 公司代码 */
+    public comCod?: string | null;
+    /** 默认仓库 */
+    public defWhFlg?: number | null;
+    /** 主键. */
+    public id?: string | null;
+    /** 所属地/国编号 */
+    public orgcod?: string | null;
+    /** 永久调整托盘 */
+    public permAdjLod?: string | null;
+    /** 永久调整箱 */
+    public permAdjSub?: string | null;
+    /** 永久创建托盘 */
+    public permCreLod?: string | null;
+    /** 永久创建箱 */
+    public permCreSub?: string | null;
+    /** 仓库名称 */
+    public whDsc?: string | null;
+    /** 仓库编号 */
+    public whId?: string | null;
+
+    public constructor(obj?: WhDTO) {
+        keys(obj ?? {}).forEach((key: PropertyKey) => {
+            switch (key) {
+                case 'activeFlg':
+                case 'adrId':
+                case 'adrnam':
+                case 'comCod':
+                case 'defWhFlg':
+                case 'id':
+                case 'orgcod':
+                case 'permAdjLod':
+                case 'permAdjSub':
+                case 'permCreLod':
+                case 'permCreSub':
+                case 'whDsc':
+                case 'whId':
+                    Reflect.set(this, key, Reflect.get(obj ?? {}, key));
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+}
+
+/**
+ * 获取对象的属性名数组.
+ * @param obj 对象.
+ */
+export function keys<C extends object>(obj: C): Array<keyof C> {
+    const type = typeof obj;
+
+    if (!(obj != null && (type === 'object' || type === 'function'))) {
+        return [];
+    }
+
+    return Reflect.ownKeys(obj) as Array<keyof C>;
+}

package/dist/api/api.ts

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

package/dist/api/def.ts

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

package/dist/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/dist/store/app.store.ts

@@ -89,6 +89,6 @@ export const useAppStore = defineStore('app', {
          * 打开更新弹窗.
          * @param version 最新版本.
          */
-        openKgUpdatePopup(version: number) {},
+        openKgUpdatePopup(version: string) {},
     },
 });

package/dist/util/kg.ts

@@ -99,22 +99,32 @@ export class Kg {
         }
 
         // 当前版本
-        const oldVersion: number = Number(plus.runtime.versionCode);
+        const oldVersionSegments: Array<string> = (plus.runtime.version || '').split('.');
+        const major: number = Number(oldVersionSegments[0]);
+        const minor: number = Number(oldVersionSegments[1]);
+        const patch: number = Number(oldVersionSegments[2]);
 
         try {
             const newVersion = await API.WMS.CommonController.GetLatestApkVersion({}, { timeout: 5 * 1000 });
 
+            // 最新版本
+            const newVersionSegments = newVersion.split('.');
+            const _major: number = Number(newVersionSegments[0]);
+            const _minor: number = Number(newVersionSegments[1]);
+            const _patch: number = Number(newVersionSegments[2]);
+
+            // 有新版本
+            if (_major > major || (_major == major && _minor > minor) || (_major == major && _minor == minor && _patch > patch)) {
+                appStore.openKgUpdatePopup(newVersion);
+                return true;
+            }
             // 无新版本
-            if (newVersion === 0 || oldVersion >= newVersion) {
+            else {
                 if (isShowToast) {
                     uni.showToast({ title: '已是最新版本.', icon: 'none' });
                 }
                 return false;
             }
-
-            // 有新版本
-            appStore.openKgUpdatePopup(newVersion);
-            return true;
         } catch (e) {
             // 接口请求失败
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kengic/uni",
-    "version": "0.4.1",
+    "version": "0.5.0",
     "scripts": {
         "build": "npm run switch-node-version && rimraf dist && vue-tsc && vite build",
         "------ -------------------------------------------": "",