@zfqh/uniapp 0.2.11 → 0.2.15

package/lib/utils/update.js

@@ -1,376 +1,170 @@
-import color from '../configs/color';
-import update from '../configs/update';
-import ver from '../configs/ver';
 import app from '../configs/app';
-import { SYSTEM_INFO } from './consts';
-// 防止弹窗多次弹出
-let visibleModal = false;
-function showModal(options) {
-    uni.showModal({
-        title: '更新提示',
-        content: options?.content || '检测到新版本，下载并重启应用？',
-        confirmColor: color.primary,
-        showCancel: options?.showCancel,
-        fail() {
-            visibleModal = false;
-        },
-        success(res) {
-            if (res.confirm) {
-                options?.confirm && options.confirm();
-            }
-            else {
-                visibleModal = false;
-            }
-        },
-    });
-}
+import env from '../configs/env';
+import ver from '../configs/ver';
+import { SYSTEM_INFO, IS_WEBVIEW_ENV, TYPES } from './consts';
+import { postMessage } from './index';
+import { getLastVersion } from '../apis/core';
+const { platform, brand } = SYSTEM_INFO;
+let _installMessageHandler = null;
 // #ifdef APP
-function appFileDownload(url, restart = true) {
-    let downloaded = false;
-    const showWaiting = plus.nativeUI.showWaiting('下载中...');
-    const downloadTask = uni.downloadFile({
-        url,
-        success(downloadResult) {
-            if (downloadResult.statusCode === 200) {
-                showWaiting.setTitle('安装中...');
-                setTimeout(() => {
-                    plus.runtime.install(downloadResult.tempFilePath, {
-                        force: true,
-                    }, () => {
-                        plus.nativeUI.closeWaiting();
-                        if (restart) {
-                            visibleModal = false;
-                            uni.showModal({
-                                title: '提示',
-                                content: '应用更新完成',
-                                showCancel: false,
-                                confirmText: '重启应用',
-                                confirmColor: color.primary,
-                                success() {
-                                    plus.runtime.restart();
-                                },
-                            });
-                        }
-                    });
-                }, 500);
-            }
-            else {
-                visibleModal = false;
-                plus.nativeUI.alert('更新失败');
-                plus.nativeUI.closeWaiting();
-            }
-        },
-        fail() {
-            visibleModal = false;
-            plus.nativeUI.closeWaiting();
-        },
-    });
-    downloadTask.onProgressUpdate(({ progress }) => {
-        if (!downloaded) {
-            showWaiting.setTitle('下载中...' + progress + '%');
-            if (progress === 100) {
-                downloaded = true;
-            }
+function appGetProperty(appid) {
+    return new Promise((resolve) => {
+        if (appid === app.appId) {
+            plus.runtime.getProperty(String(plus.runtime.appid), (res) => resolve(res));
         }
-    });
-}
-function checkAppUpdate(immediate = false) {
-    return new Promise((resolve, reject) => {
-        plus.runtime.getProperty(plus.runtime.appid, async ({ versionCode, version: versionName }) => {
-            try {
-                const { platform, appName, appId, appVersion: appVersionName, appVersionCode } = SYSTEM_INFO;
-                const params = {
-                    appId: app.appId || appId,
-                    appName: app.name || appName,
-                    versionCode: Number(ver.code || versionCode),
-                    versionName: ver.name || versionName,
-                    appVersionCode: Number(appVersionCode),
-                    appVersionName,
-                    platform,
-                };
-                const data = await update.request(params);
-                if (data) {
-                    let url = '';
-                    if (data.hot_update == 1) {
-                        url = data.wgt_url;
-                    }
-                    else {
-                        if (platform === 'android') {
-                            url = data.apk_url;
-                        }
-                        else if (platform === 'ios') {
-                            url = data.ipa_url;
+        else {
+            plus.io.resolveLocalFileSystemURL(`_doc/${appid}/manifest.json`, (entry) => {
+                entry.file((file) => {
+                    const reader = new plus.io.FileReader();
+                    reader.onloadend = (e) => {
+                        try {
+                            resolve(JSON.parse(e.target.result));
                         }
-                    }
-                    if (url) {
-                        resolve();
-                        if (!visibleModal) {
-                            visibleModal = true;
-                            if (data.hot_update == 1) {
-                                // 热更新
-                                if (immediate) {
-                                    appFileDownload(url);
-                                }
-                                else {
-                                    showModal({
-                                        showCancel: !data.force_update,
-                                        confirm() {
-                                            appFileDownload(url);
-                                        },
-                                    });
-                                }
-                            }
-                            else {
-                                // 整包更新
-                                if (params.platform == 'android') {
-                                    if (immediate) {
-                                        if (data.external_install) {
-                                            plus.runtime.openURL(url);
-                                        }
-                                        else {
-                                            appFileDownload(url, false);
-                                        }
-                                    }
-                                    else {
-                                        showModal({
-                                            showCancel: !data.force_update,
-                                            confirm() {
-                                                if (data.external_install) {
-                                                    plus.runtime.openURL(url);
-                                                }
-                                                else {
-                                                    appFileDownload(url, false);
-                                                }
-                                            },
-                                        });
-                                    }
-                                }
-                                else if (params.platform == 'ios') {
-                                    showModal({
-                                        content: '检测到新版本，前往应用市场更新？',
-                                        confirm() {
-                                            plus.runtime.openURL(url);
-                                        },
-                                    });
-                                }
-                            }
+                        catch {
+                            resolve({});
                         }
-                    }
-                    else {
-                        reject();
-                    }
-                }
-                else {
-                    reject();
-                }
-            }
-            catch (e) {
-                reject(e);
-            }
-        });
+                    };
+                    reader.readAsText(file);
+                }, () => resolve({}));
+            }, () => resolve({}));
+        }
     });
 }
 // #endif
 // #ifdef H5
-function fileDownload(url, restart = true) {
-    const ipcRenderer = window['electron'].ipcRenderer;
-    ipcRenderer.send('update', url);
-    function updateDownload() {
-        uni.showLoading({
-            title: '下载中...',
-            mask: true,
-        });
-    }
-    function uploadProgress(e, progress) {
-        uni.showLoading({
-            title: `下载中...${progress}%`,
-            mask: true,
+function h5GetProperty(appid) {
+    return new Promise((resolve) => {
+        if (appid === app.appId) {
+            resolve({ version: ver.name, versionCode: ver.code });
+        }
+        else if (window.electron) {
+            window.electron.webUtils.getProperty(appid, (manifest) => resolve(manifest || {}));
+        }
+    });
+}
+// #endif
+export async function checkVersion(appid) {
+    try {
+        let version = 0;
+        let packageName = appid;
+        let data = null;
+        // #ifdef APP
+        data = await appGetProperty(appid);
+        version = data.versionCode || 0;
+        // #endif
+        // #ifdef H5
+        data = await h5GetProperty(appid);
+        version = data.versionCode || 0;
+        // #endif
+        let type = 1;
+        // #ifdef H5
+        if (IS_WEBVIEW_ENV) {
+            type = 3;
+        }
+        // #endif
+        const res = await getLastVersion({
+            version,
+            packageName,
+            type,
+            platform: { android: 1, ios: 2, windows: 4 }[platform],
         });
-    }
-    function updateSuccess() {
-        if (restart) {
-            uni.showModal({
-                title: '提示',
-                content: '应用更新完成',
-                showCancel: false,
-                confirmText: '重启应用',
-                confirmColor: color.primary,
-                success() {
-                    ipcRenderer.send('relaunch');
-                },
-            });
+        const lastVer = { ...res?.data };
+        // #ifdef APP
+        if (uni.$store.state.dict && platform === 'android' && appid === app.appId && env.key === 'prod') {
+            await uni.$store.dispatch('getDictInfo', { name: 'group_relation', cache: true });
+            if (uni.$store.state.dict.info.group_relation?.values?.includes(brand)) {
+                lastVer.hotUpdateUrl = '';
+            }
         }
+        // #endif
+        if (lastVer.status > 2 && Number(lastVer.version) > Number(version)) {
+            return lastVer;
+        }
+        return null;
     }
-    function updateFail() {
-        setTimeout(() => {
-            uni.showToast({
-                title: '更新失败',
-                icon: 'error',
-                duration: 2000,
-            });
-        }, 300);
-    }
-    function updateComplete() {
-        visibleModal = false;
-        uni.hideLoading();
-        ipcRenderer.removeListener('update-download', updateDownload);
-        ipcRenderer.removeListener('update-progress', uploadProgress);
-        ipcRenderer.removeListener('update-success', updateSuccess);
-        ipcRenderer.removeListener('update-fail', updateFail);
+    catch {
+        return null;
     }
-    ipcRenderer.on('update-download', updateDownload);
-    ipcRenderer.on('update-progress', uploadProgress);
-    ipcRenderer.on('update-success', updateSuccess);
-    ipcRenderer.on('update-fail', updateFail);
-    ipcRenderer.once('update-complete', updateComplete);
 }
-async function checkUpdate(immediate = false) {
-    return new Promise((resolve, reject) => {
-        const { platform, appName, appId, appVersion: versionName, appVersionCode: versionCode } = SYSTEM_INFO;
-        const params = {
-            appId: app.appId || appId,
-            appName: app.name || appName,
-            versionCode: Number(ver.code || versionCode),
-            versionName: ver.name || versionName,
-            appVersionCode: Number(window['versionCode'] || versionCode),
-            appVersionName: window['versionName'] || versionName,
-            platform: window['platform'] || platform,
-        };
-        update
-            .request(params)
-            .then((data) => {
-            if (data) {
-                let url = '';
-                if (data.hot_update == 1) {
-                    url = data.zip_url;
-                }
-                else {
-                    if (params.platform === 'windows') {
-                        url = data.exe_url;
-                    }
-                    else if (params.platform === 'macos') {
-                        url = data.dmg_url;
-                    }
-                }
-                if (url) {
-                    resolve();
-                    if (!visibleModal) {
-                        visibleModal = true;
-                        if (data.hot_update == 1) {
-                            // 热更新
-                            if (immediate) {
-                                fileDownload(url);
-                            }
-                            else {
-                                showModal({
-                                    showCancel: !data.force_update,
-                                    confirm() {
-                                        fileDownload(url);
-                                    },
-                                });
-                            }
-                        }
-                        else {
-                            // 整包更新
-                            if (immediate) {
-                                fileDownload(url, false);
-                            }
-                            else {
-                                showModal({
-                                    showCancel: !data.force_update,
-                                    confirm() {
-                                        fileDownload(url, false);
-                                    },
-                                });
-                            }
-                        }
-                    }
-                }
-                else {
-                    reject();
-                }
+// #ifdef APP
+function appInstall({ appid, url, progress, success, fail }) {
+    const downloadTask = uni.downloadFile({
+        url,
+        success(res) {
+            if (res.statusCode !== 200)
+                return fail?.({ message: 'download failed' });
+            progress?.(100);
+            if (appid === app.appId) {
+                plus.runtime.install(res.tempFilePath, { force: true }, success, fail);
             }
             else {
-                reject();
+                plus.io.resolveLocalFileSystemURL('_doc/', (docDir) => {
+                    plus.zip.decompress(res.tempFilePath, docDir.fullPath, success, () => {
+                        plus.zip.decompress(res.tempFilePath, docDir.fullPath, success, fail);
+                    });
+                }, (e) => fail?.({ message: e?.message || String(e) }));
             }
-        })
-            .catch((e) => {
-            reject(e);
-        });
+        },
+        fail: (e) => fail?.({ message: e?.errMsg || String(e) }),
     });
+    downloadTask.onProgressUpdate(({ progress: p }) => progress?.(p));
 }
 // #endif
-// #ifdef MP
-function mpDownload(updateManager) {
-    uni.showLoading({ title: '更新中...' });
-    updateManager.onUpdateReady(() => {
-        uni.hideLoading();
-        setTimeout(() => {
-            visibleModal = false;
-            updateManager.applyUpdate();
-        }, 300);
-    });
-    updateManager.onUpdateFailed(() => {
-        visibleModal = false;
-        uni.hideLoading();
-        uni.showModal({
-            title: '更新失败',
-            content: `请您删除当前小程序，并搜索“${app.name || SYSTEM_INFO.appName}”重新打开应用`,
-            confirmColor: color.primary,
+// #ifdef H5
+function h5Install(options) {
+    if (IS_WEBVIEW_ENV) {
+        postMessage({
+            type: TYPES.MESSAGE.APP_INSTALL,
+            payload: {
+                appid: options.appid,
+                url: options.url,
+            },
         });
-    });
-}
-function checkMpUpdate(immediate = false) {
-    return new Promise((resolve, reject) => {
-        if (uni.canIUse('getUpdateManager')) {
-            const updateManager = uni.getUpdateManager();
-            updateManager.onCheckForUpdate((e) => {
-                if (e.hasUpdate) {
-                    visibleModal = true;
-                    resolve();
-                    if (immediate) {
-                        mpDownload(updateManager);
-                    }
-                    else {
-                        showModal({
-                            confirm() {
-                                mpDownload(updateManager);
-                            },
-                        });
-                    }
+        if (_installMessageHandler) {
+            uni.$off(TYPES.MESSAGE.WEBVIEW_MESSAGE, _installMessageHandler);
+            _installMessageHandler = null;
+        }
+        _installMessageHandler = (e) => {
+            if (e?.type === TYPES.MESSAGE.APP_INSTALL) {
+                if (e.payload?.progress != null) {
+                    options.progress?.(e.payload.progress);
+                }
+                else if (e.payload?.success) {
+                    options.success?.();
                 }
                 else {
-                    reject();
+                    options.fail?.({ message: e.payload.message });
                 }
-            });
-        }
-        else {
-            reject();
-        }
-    });
+            }
+        };
+        uni.$on(TYPES.MESSAGE.WEBVIEW_MESSAGE, _installMessageHandler);
+    }
+    else if (window.electron) {
+        window.electron.webUtils.updateApp(options);
+    }
 }
 // #endif
-/**
- * 检测更新
- * @param immediate 是否立即更新，不显示确认框
- */
-function check(immediate = false) {
-    let res = Promise.resolve();
-    if (!visibleModal) {
-        // #ifdef H5
-        if (typeof window['electron'] === 'object') {
-            res = checkUpdate(immediate);
-        }
-        // #endif
-        // #ifdef APP
-        res = checkAppUpdate(immediate);
-        // #endif
-        // #ifdef MP
-        res = checkMpUpdate(immediate);
-        // #endif
+export function installUpdate(options) {
+    // #ifdef H5
+    h5Install(options);
+    // #endif
+    // #ifdef APP
+    appInstall(options);
+    // #endif
+}
+export function restartApp() {
+    // #ifdef H5
+    if (IS_WEBVIEW_ENV) {
+        postMessage({
+            type: TYPES.MESSAGE.APP_RESTART,
+            payload: {},
+        });
+    }
+    else if (window.electron) {
+        window.electron.ipcRenderer.send('relaunch');
     }
-    return res;
+    // #endif
+    // #ifdef APP
+    plus.runtime.restart();
+    // #endif
 }
-export default {
-    check,
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zfqh/uniapp",
-  "version": "0.2.11",
+  "version": "0.2.15",
   "description": "uniapp公共模块",
   "author": "yinjiazeng@163.com",
   "license": "MIT",
@@ -46,5 +46,5 @@
     "@types/qs": "^6.9.16",
     "@types/url-parse": "^1.4.11"
   },
-  "gitHead": "4f9aae7510f83a5cd4b63d74f91993e12351e04f"
+  "gitHead": "49c58020e7c2ea6f4f8c27ca0800de784a3df2d3"
 }

package/docs/api/configs/update.md

@@ -1,25 +0,0 @@
-# update
-
-更新配置。发布路径：`@zfqh/uniapp/lib/configs/update`
-
-| 字段 | 类型 | 默认值 | 说明 |
-| --- | --- | --- | --- |
-| `request(data)` | `function` | `Promise<null>` | 获取最新版本信息；返回 hot_update、force_update、wgt_url/apk_url/ipa_url/zip_url 等字段。 |
-
-## 基本使用
-
-App.vue 全局 mixin 会在合适时机调用更新检查；业务项目只需要配置获取最新版本的请求函数。
-
-```ts
-import { defineConfig } from '@zfqh/uniapp';
-import { POST } from '@zfqh/uniapp/lib/apis';
-
-defineConfig({
-  update: {
-    async request(data) {
-      const { data: version } = await POST('/app-api/system/app/version/get-last-version', data);
-      return version;
-    },
-  },
-});
-```

package/docs/components/g-env.md

@@ -1,75 +0,0 @@
-# g-env 环境显示
-
-::: tip 组件名
-`g-env`
-
-发布路径：`@zfqh/uniapp/lib/components/g-env/g-env.vue`
-:::
-
-环境切换入口，主要给 H5/Electron 调试环境使用，用于查看和切换当前 env。
-
-## 平台兼容性
-
-| App（vue） | App（nvue） | H5 | 小程序 | Vue 2 | Vue 3 |
-| --- | --- | --- | --- | --- | --- |
-| √ | 依赖源码条件编译 | √ | √ | - | √ |
-
-## 使用前提
-
-- 已安装并注册 `@zfqh/uniapp` 插件。
-- 已按 [项目接入](./usage) 配置 easycom，或手动从构建产物导入组件。
-- 尺寸类属性通常支持数字或带单位字符串；数字值会在组件内部通过 `uni.$uv.addUnit` 转成样式单位。
-- 样式类属性中，`customStyle`、`xxxStyle` 接收对象，`customClass`、`xxxClass` 接收 class 字符串。
-
-## 基本使用
-
-```vue
-<template>
-  <view class="user-version">
-    当前环境
-    <g-env :env="env" prefix="（" suffix="）" />
-  </view>
-</template>
-
-<script setup>
-import { config } from '@zfqh/uniapp';
-
-const env = config.env;
-</script>
-```
-
-## API
-
-### 环境显示 Props
-
-| 属性 | 类型 | 默认值 | 必填 | 说明 |
-| --- | --- | --- | --- | --- |
-| `env` | `Object` | `() => ({})` | 否 | 组件公开属性 env，用于控制该组件对应的渲染、交互或业务参数。 |
-| `data` | `Array` | `() => [ { name: '开发环境', key: 'dev', }, { name: '测试环境', key: 'sit', }, { name: '演示环境', key: 'uat', }, { name: '预生产环境', key: 'pre', }, ]` | 否 | 组件渲染或业务计算使用的数据源。 |
-| `prefix` | `String` | `''` | 否 | 组件公开属性 prefix，用于控制该组件对应的渲染、交互或业务参数。 |
-| `suffix` | `String` | `''` | 否 | 组件公开属性 suffix，用于控制该组件对应的渲染、交互或业务参数。 |
-| `switchable` | `Boolean` | `true` | 否 | 组件公开属性 switchable，用于控制该组件对应的渲染、交互或业务参数。 |
-
-### 环境显示 Events
-
-无显式组件事件。
-
-### 环境显示 Slots
-
-| 插槽 | 说明 |
-| --- | --- |
-| `default` | 默认内容区域。 |
-
-### 环境显示 Methods
-
-| 方法 | 说明 |
-| --- | --- |
-| `open()` | 打开组件或弹层；部分组件支持传入选项覆盖当前展示内容。 |
-| `select(e)` | 处理选中/取消选中逻辑并触发 change。 |
-
-### 环境显示 Internal State
-
-| 类型 | 名称 | 说明 |
-| --- | --- | --- |
-| computed | `show` | 内部计算属性，用于把 props、平台信息或样式配置转换为模板可用值。 |
-| computed | `list` | 内部计算属性，用于把 props、平台信息或样式配置转换为模板可用值。 |