diff --git a/awesome b/awesome index dec1f1b1..15a7658d 160000 --- a/awesome +++ b/awesome @@ -1 +1 @@ -Subproject commit dec1f1b1aac6f6224fa11fd5a9d7e4c60d25721b +Subproject commit 15a7658df4e273aa106ff2c5e9d89a80aaf22aa9 diff --git a/client/uniapp/README.md b/client/uniapp/README.md index c77cf43b..8b374375 100644 --- a/client/uniapp/README.md +++ b/client/uniapp/README.md @@ -15,6 +15,8 @@ - weixin平台:`pnpm dev:mp-weixin` 然后打开微信开发者工具,导入本地文件夹,选择本项目的`dist/dev/mp-weixin` 文件。 - APP平台:`pnpm dev:app`, 然后打开 `HBuilderX`,导入刚刚生成的`dist/dev/app` 文件夹,选择运行到模拟器(开发时优先使用),或者运行的安卓/ios基座。 +### 改了本地库 +最关键的是`rm -r node_modules/.vite/deps` ## 🔗 发布 - web平台: `pnpm build:h5`,打包后的文件在 `dist/build/h5`,可以放到web服务器,如nginx运行。如果最终不是放在根目录,可以在 `manifest.config.ts` 文件的 `h5.router.base` 属性进行修改。 diff --git a/client/uniapp/package.json b/client/uniapp/package.json index 885eb2ab..f1ec1542 100644 --- a/client/uniapp/package.json +++ b/client/uniapp/package.json @@ -55,7 +55,10 @@ "build:quickapp-webview": "uni build -p quickapp-webview", "build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei", "build:quickapp-webview-union": "uni build -p quickapp-webview-union", - "type-check": "vue-tsc --noEmit" + "type-check": "vue-tsc --noEmit", + "diamond:add": "pnpm add file:..\\..\\thirdparty\\diamond", + "diamond:link": "pnpm link --global diamond", + "clear:cache": "rm -r node_modules/.vite/deps" }, "lint-staged": { "**/*.{html,vue,ts,cjs,json,md}": [ @@ -72,21 +75,21 @@ "bin-wrapper": "npm:bin-wrapper-china" }, "dependencies": { - "@dcloudio/uni-app": "3.0.0-4020820240925001", - "@dcloudio/uni-app-harmony": "3.0.0-4020820240925001", - "@dcloudio/uni-app-plus": "3.0.0-4020820240925001", - "@dcloudio/uni-components": "3.0.0-4020820240925001", - "@dcloudio/uni-h5": "3.0.0-4020820240925001", - "@dcloudio/uni-mp-alipay": "3.0.0-4020820240925001", - "@dcloudio/uni-mp-baidu": "3.0.0-4020820240925001", - "@dcloudio/uni-mp-jd": "3.0.0-4020820240925001", - "@dcloudio/uni-mp-kuaishou": "3.0.0-4020820240925001", - "@dcloudio/uni-mp-lark": "3.0.0-4020820240925001", - "@dcloudio/uni-mp-qq": "3.0.0-4020820240925001", - "@dcloudio/uni-mp-toutiao": "3.0.0-4020820240925001", - "@dcloudio/uni-mp-weixin": "3.0.0-4020820240925001", - "@dcloudio/uni-mp-xhs": "3.0.0-4020820240925001", - "@dcloudio/uni-quickapp-webview": "3.0.0-4020820240925001", + "@dcloudio/uni-app": "3.0.0-4020920240930001", + "@dcloudio/uni-app-harmony": "3.0.0-4020920240930001", + "@dcloudio/uni-app-plus": "3.0.0-4020920240930001", + "@dcloudio/uni-components": "3.0.0-4020920240930001", + "@dcloudio/uni-h5": "3.0.0-4020920240930001", + "@dcloudio/uni-mp-alipay": "3.0.0-4020920240930001", + "@dcloudio/uni-mp-baidu": "3.0.0-4020920240930001", + "@dcloudio/uni-mp-jd": "3.0.0-4020920240930001", + "@dcloudio/uni-mp-kuaishou": "3.0.0-4020920240930001", + "@dcloudio/uni-mp-lark": "3.0.0-4020920240930001", + "@dcloudio/uni-mp-qq": "3.0.0-4020920240930001", + "@dcloudio/uni-mp-toutiao": "3.0.0-4020920240930001", + "@dcloudio/uni-mp-weixin": "3.0.0-4020920240930001", + "@dcloudio/uni-mp-xhs": "3.0.0-4020920240930001", + "@dcloudio/uni-quickapp-webview": "3.0.0-4020920240930001", "@dcloudio/uni-ui": "^1.5.6", "dayjs": "1.11.13", "diamond": "file:..\\..\\thirdparty\\diamond", @@ -100,10 +103,10 @@ "@commitlint/cli": "^19.5.0", "@commitlint/config-conventional": "^19.5.0", "@dcloudio/types": "^3.4.12", - "@dcloudio/uni-automator": "3.0.0-4020820240925001", - "@dcloudio/uni-cli-shared": "3.0.0-4020820240925001", - "@dcloudio/uni-stacktracey": "3.0.0-4020820240925001", - "@dcloudio/vite-plugin-uni": "3.0.0-4020820240925001", + "@dcloudio/uni-automator": "3.0.0-4020920240930001", + "@dcloudio/uni-cli-shared": "3.0.0-4020920240930001", + "@dcloudio/uni-stacktracey": "3.0.0-4020920240930001", + "@dcloudio/vite-plugin-uni": "3.0.0-4020920240930001", "@esbuild/darwin-arm64": "0.24.0", "@esbuild/darwin-x64": "0.24.0", "@iconify-json/carbon": "^1.2.1", @@ -146,7 +149,7 @@ "unocss": "^0.58.0", "unocss-applet": "^0.8.2", "unplugin-auto-import": "^0.18.3", - "vite": "5.4.8", + "vite": "5.2.8", "vite-plugin-restart": "^0.4.1", "vue-i18n": "9.1.9", "vue-tsc": "^2.1.6" diff --git a/client/uniapp/src/pages/wopan/view.vue b/client/uniapp/src/pages/wopan/view.vue index c1ee14b6..1f8050fc 100644 --- a/client/uniapp/src/pages/wopan/view.vue +++ b/client/uniapp/src/pages/wopan/view.vue @@ -88,6 +88,10 @@ const fileName = computed(()=>{ const total = ref(wopanStore.curDir.subFiles.length) onLoad((options) => { + if(total.value == 0){ + uni.redirectTo({url:'/pages/wopan/list'}) + return + } index.value = parseInt(options.index) file.value =wopanStore.curDir.subFiles[index.value].file console.log("file-view",file.value) diff --git a/client/uniapp/vite.config.ts b/client/uniapp/vite.config.ts index 3cba73ea..3a0c1206 100644 --- a/client/uniapp/vite.config.ts +++ b/client/uniapp/vite.config.ts @@ -98,6 +98,11 @@ export default ({ command, mode }) => { 'process.env.VUE_APP_TEST': JSON.stringify('test'), }, css: { + preprocessorOptions: { + scss: { + api:"modern-compiler" + }, + }, postcss: { plugins: [ // autoprefixer({ diff --git a/client/web/package.json b/client/web/package.json index d8e38225..c1621865 100644 --- a/client/web/package.json +++ b/client/web/package.json @@ -4,7 +4,7 @@ "private": true, "type": "module", "node": "v22.0.0", - "packageManager": "pnpm@9.1.0", + "packageManager": "pnpm@9.12.2", "scripts": { "protoc": "node ../../proto/generate.js grpc-web", "wasm:build": "wasm-pack build ../../server/rust/wasm --target web", diff --git a/client/web/src/utils/upload.js b/client/web/src/utils/upload.js index 03855181..2a5bfe9a 100644 --- a/client/web/src/utils/upload.js +++ b/client/web/src/utils/upload.js @@ -26,7 +26,7 @@ const getMD5 = function (file) { const chunkSize = 2097152; // Read in chunks of 2MB const chunks = Math.ceil(file.size / chunkSize); let currentChunk = 0; - const spark = new SparkMD5.ArrayBuffer(); + const spark = new SparkMD5(); const fileReader = new FileReader(); fileReader.onload = function (e) { diff --git a/thirdparty/diamond b/thirdparty/diamond index c31840ac..4e3ad18f 160000 --- a/thirdparty/diamond +++ b/thirdparty/diamond @@ -1 +1 @@ -Subproject commit c31840ac4f65675fe67a8e6b0a525b1150db6323 +Subproject commit 4e3ad18ff23cbece51d9b8f3b713bd11ad8ad950 diff --git a/thirdparty/example b/thirdparty/example index a20a02fe..69551c49 160000 --- a/thirdparty/example +++ b/thirdparty/example @@ -1 +1 @@ -Subproject commit a20a02fec706883f677c1d5f199ceda1a68e0da9 +Subproject commit 69551c49f1bc79f8d8648d85a11e956ebcb45811 diff --git a/thirdparty/pick b/thirdparty/pick index 9af2826c..978806eb 160000 --- a/thirdparty/pick +++ b/thirdparty/pick @@ -1 +1 @@ -Subproject commit 9af2826c3ed3dadc26545e429f4a95367795afbb +Subproject commit 978806eb91e1ee16e29a6771a075c89c349b15da diff --git a/thirdparty/utils b/thirdparty/utils index a86b9b6a..4438851c 160000 --- a/thirdparty/utils +++ b/thirdparty/utils @@ -1 +1 @@ -Subproject commit a86b9b6a0ab4c30d853277fe2e6014daa907a462 +Subproject commit 4438851c63c209c985aedc4edc5c8e0586146cea