提交 ae9c36e0 作者: 方治民

合并分支 '3.x' 到 'main'

3.x

查看合并请求 !69
strict-peer-dependencies=false strict-peer-dependencies=false
shell-emulator=true shell-emulator=true
registry=https://registry.npmmirror.com
...@@ -66,26 +66,27 @@ ...@@ -66,26 +66,27 @@
} }
}, },
"dependencies": { "dependencies": {
"@dcloudio/uni-app": "3.0.0-4010520240507001", "@dcloudio/uni-app": "3.0.0-4020420240722002",
"@dcloudio/uni-app-plus": "3.0.0-4010520240507001", "@dcloudio/uni-app-plus": "3.0.0-4020420240722002",
"@dcloudio/uni-components": "3.0.0-4010520240507001", "@dcloudio/uni-components": "3.0.0-4020420240722002",
"@dcloudio/uni-h5": "3.0.0-4010520240507001", "@dcloudio/uni-h5": "3.0.0-4020420240722002",
"@dcloudio/uni-mp-alipay": "3.0.0-4010520240507001", "@dcloudio/uni-mp-alipay": "3.0.0-4020420240722002",
"@dcloudio/uni-mp-baidu": "3.0.0-4010520240507001", "@dcloudio/uni-mp-baidu": "3.0.0-4020420240722002",
"@dcloudio/uni-mp-jd": "3.0.0-4010520240507001", "@dcloudio/uni-mp-jd": "3.0.0-4020420240722002",
"@dcloudio/uni-mp-kuaishou": "3.0.0-4010520240507001", "@dcloudio/uni-mp-kuaishou": "3.0.0-4020420240722002",
"@dcloudio/uni-mp-lark": "3.0.0-4010520240507001", "@dcloudio/uni-mp-lark": "3.0.0-4020420240722002",
"@dcloudio/uni-mp-qq": "3.0.0-4010520240507001", "@dcloudio/uni-mp-qq": "3.0.0-4020420240722002",
"@dcloudio/uni-mp-toutiao": "3.0.0-4010520240507001", "@dcloudio/uni-mp-toutiao": "3.0.0-4020420240722002",
"@dcloudio/uni-mp-weixin": "3.0.0-4010520240507001", "@dcloudio/uni-mp-weixin": "3.0.0-4020420240722002",
"@dcloudio/uni-quickapp-webview": "3.0.0-4010520240507001", "@dcloudio/uni-quickapp-webview": "3.0.0-4020420240722002",
"@dcloudio/uni-ui": "^1.5.5", "@dcloudio/uni-ui": "^1.5.6",
"@faker-js/faker": "^8.4.1", "@faker-js/faker": "^8.4.1",
"@vue/runtime-core": "3.4.21", "@vue/runtime-core": "3.4.21",
"@vueuse/core": "^10.11.0", "@vueuse/core": "^10.11.1",
"axios": "^1.7.2", "@vueuse/shared": "^11.0.3",
"axios": "^1.7.5",
"crypto-js": "^4.2.0", "crypto-js": "^4.2.0",
"dayjs": "^1.11.11", "dayjs": "^1.11.13",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"nanoid": "^5.0.7", "nanoid": "^5.0.7",
"pinia": "2.0.36", "pinia": "2.0.36",
...@@ -93,71 +94,72 @@ ...@@ -93,71 +94,72 @@
"stompjs": "^2.3.3", "stompjs": "^2.3.3",
"urijs": "^1.19.11", "urijs": "^1.19.11",
"vue": "3.4.21", "vue": "3.4.21",
"vue-i18n": "^9.13.1", "vue-demi": "^0.14.10",
"vue-i18n": "9.1.9",
"vue-request": "^2.0.4", "vue-request": "^2.0.4",
"vue-types": "^5.1.2" "vue-types": "^5.1.3"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^0.43.1", "@antfu/eslint-config": "^0.43.1",
"@commitlint/cli": "^19.3.0", "@commitlint/cli": "^19.4.0",
"@commitlint/config-conventional": "^19.2.2", "@commitlint/config-conventional": "^19.2.2",
"@dcloudio/types": "^3.4.8", "@dcloudio/types": "^3.4.12",
"@dcloudio/uni-automator": "3.0.0-4010520240507001", "@dcloudio/uni-automator": "3.0.0-4020420240722002",
"@dcloudio/uni-cli-shared": "3.0.0-4010520240507001", "@dcloudio/uni-cli-shared": "3.0.0-4020420240722002",
"@dcloudio/uni-helper-json": "^1.0.13", "@dcloudio/uni-helper-json": "^1.0.13",
"@dcloudio/uni-stacktracey": "3.0.0-4010520240507001", "@dcloudio/uni-stacktracey": "3.0.0-4020420240722002",
"@dcloudio/uni-uts-v1": "3.0.0-4010520240507001", "@dcloudio/uni-uts-v1": "3.0.0-4020420240722002",
"@dcloudio/vite-plugin-uni": "3.0.0-4010520240507001", "@dcloudio/vite-plugin-uni": "3.0.0-4020420240722002",
"@iconify/json": "^2.2.220", "@iconify/json": "^2.2.241",
"@types/crypto-js": "^4.2.2", "@types/crypto-js": "^4.2.2",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/node": "^20.14.6", "@types/node": "^20.16.1",
"@types/qs": "^6.9.15", "@types/qs": "^6.9.15",
"@types/stompjs": "^2.3.9", "@types/stompjs": "^2.3.9",
"@types/urijs": "^1.19.25", "@types/urijs": "^1.19.25",
"@typescript-eslint/eslint-plugin": "^7.13.1", "@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.13.1", "@typescript-eslint/parser": "^7.18.0",
"commitizen": "^4.3.0", "commitizen": "^4.3.0",
"conventional-changelog-cli": "^4.1.0", "conventional-changelog-cli": "^5.0.0",
"cz-conventional-changelog": "^3.3.0", "cz-conventional-changelog": "^3.3.0",
"cz-customizable": "^7.0.0", "cz-customizable": "^7.2.1",
"cz-git": "^1.9.3", "cz-git": "^1.9.4",
"czg": "^1.9.3", "czg": "^1.9.4",
"dotenv": "^16.4.5", "dotenv": "^16.4.5",
"eslint": "^8.57.0", "eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3", "eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-vue": "^9.26.0", "eslint-plugin-vue": "^9.27.0",
"husky": "^8.0.3", "husky": "^8.0.3",
"jest": "27.0.4", "jest": "27.0.4",
"jest-environment-node": "27.5.1", "jest-environment-node": "27.5.1",
"less": "^4.2.0", "less": "^4.2.0",
"lint-staged": "^15.2.7", "lint-staged": "^15.2.9",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"picocolors": "^1.0.1", "picocolors": "^1.0.1",
"pont-engine": "^1.6.3", "pont-engine": "^1.6.3",
"postcss": "^8.4.38", "postcss": "^8.4.41",
"postcss-html": "^1.7.0", "postcss-html": "^1.7.0",
"postcss-less": "^6.0.0", "postcss-less": "^6.0.0",
"prettier": "^3.3.2", "prettier": "^3.3.3",
"rimraf": "^5.0.7", "rimraf": "^6.0.1",
"sass": "^1.77.6", "sass": "^1.77.8",
"sort-package-json": "^2.10.0", "sort-package-json": "^2.10.1",
"stylelint": "^16.6.1", "stylelint": "^16.8.2",
"stylelint-config-html": "^1.1.0", "stylelint-config-html": "^1.1.0",
"stylelint-config-recommended": "^14.0.0", "stylelint-config-recommended": "^14.0.1",
"stylelint-config-standard": "^36.0.0", "stylelint-config-standard": "^36.0.1",
"stylelint-order": "^6.0.4", "stylelint-order": "^6.0.4",
"typescript": "~5.4.5", "typescript": "~5.4.5",
"unocss": "^0.58.9", "unocss": "^0.58.9",
"unocss-preset-weapp": "^0.58.8", "unocss-preset-weapp": "^0.58.8",
"unplugin-auto-import": "^0.17.6", "unplugin-auto-import": "^0.17.8",
"unplugin-vue-components": "^0.27.0", "unplugin-vue-components": "^0.27.4",
"vite": "^5.3.1", "vite": "^5.4.2",
"vue-eslint-parser": "^9.4.3" "vue-eslint-parser": "^9.4.3"
}, },
"engines": { "engines": {
"node": ">=16", "node": ">=18",
"pnpm": ">=8.1.0" "pnpm": ">=9.0.0"
} }
} }
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -34,11 +34,8 @@ ...@@ -34,11 +34,8 @@
}, },
}) })
const visibleSrc = ref() const visibleSrc = ref(props.src)
const hashCacheKey = ref() const hashCacheKey = ref()
onMounted(async () => {
await tryCache()
})
// 监听 src 变化 // 监听 src 变化
watch( watch(
...@@ -149,6 +146,7 @@ ...@@ -149,6 +146,7 @@
:background="props.background" :background="props.background"
:src="visibleSrc" :src="visibleSrc"
@error="onError" @error="onError"
@visible="tryCache"
> >
<slot></slot> <slot></slot>
</fui-lazyload> </fui-lazyload>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<script> <script>
export default { export default {
name: "fui-lazyload", name: "fui-lazyload",
emits: ['error', 'load', 'click'], emits: ['error', 'load', 'click', 'visible'],
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
options: { options: {
virtualHost: true virtualHost: true
...@@ -146,6 +146,7 @@ ...@@ -146,6 +146,7 @@
this.visible = false; this.visible = false;
setTimeout(() => { setTimeout(() => {
this.visible = true; this.visible = true;
this.$emit('visible', {})
}, 500) }, 500)
}, },
endObserver() { endObserver() {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论