提交 1318114e 作者: 方治民

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

3.x

查看合并请求 !54
...@@ -66,19 +66,19 @@ ...@@ -66,19 +66,19 @@
} }
}, },
"dependencies": { "dependencies": {
"@dcloudio/uni-app": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-app": "3.0.0-3081220230817001",
"@dcloudio/uni-app-plus": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-app-plus": "3.0.0-3081220230817001",
"@dcloudio/uni-components": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-components": "3.0.0-3081220230817001",
"@dcloudio/uni-h5": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-h5": "3.0.0-3081220230817001",
"@dcloudio/uni-mp-alipay": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-mp-alipay": "3.0.0-3081220230817001",
"@dcloudio/uni-mp-baidu": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-mp-baidu": "3.0.0-3081220230817001",
"@dcloudio/uni-mp-jd": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-mp-jd": "3.0.0-3081220230817001",
"@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-mp-kuaishou": "3.0.0-3081220230817001",
"@dcloudio/uni-mp-lark": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-mp-lark": "3.0.0-3081220230817001",
"@dcloudio/uni-mp-qq": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-mp-qq": "3.0.0-3081220230817001",
"@dcloudio/uni-mp-toutiao": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-mp-toutiao": "3.0.0-3081220230817001",
"@dcloudio/uni-mp-weixin": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-mp-weixin": "3.0.0-3081220230817001",
"@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-quickapp-webview": "3.0.0-3081220230817001",
"@dcloudio/uni-ui": "^1.4.28", "@dcloudio/uni-ui": "^1.4.28",
"@faker-js/faker": "^8.0.2", "@faker-js/faker": "^8.0.2",
"@vue/runtime-core": "~3.2.47", "@vue/runtime-core": "~3.2.47",
...@@ -102,20 +102,20 @@ ...@@ -102,20 +102,20 @@
"@commitlint/cli": "^17.7.1", "@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0", "@commitlint/config-conventional": "^17.7.0",
"@dcloudio/types": "^3.3.3", "@dcloudio/types": "^3.3.3",
"@dcloudio/uni-automator": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-automator": "3.0.0-3081220230817001",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-cli-shared": "3.0.0-3081220230817001",
"@dcloudio/uni-helper-json": "^1.0.13", "@dcloudio/uni-helper-json": "^1.0.13",
"@dcloudio/uni-stacktracey": "3.0.0-alpha-3081220230802001", "@dcloudio/uni-stacktracey": "3.0.0-3081220230817001",
"@dcloudio/vite-plugin-uni": "3.0.0-alpha-3081220230802001", "@dcloudio/vite-plugin-uni": "3.0.0-3081220230817001",
"@iconify/json": "^2.2.101", "@iconify/json": "^2.2.102",
"@types/crypto-js": "^4.1.1", "@types/crypto-js": "^4.1.1",
"@types/lodash-es": "^4.17.8", "@types/lodash-es": "^4.17.8",
"@types/node": "^20.5.0", "@types/node": "^20.5.0",
"@types/qs": "^6.9.7", "@types/qs": "^6.9.7",
"@types/stompjs": "^2.3.5", "@types/stompjs": "^2.3.5",
"@types/urijs": "^1.19.19", "@types/urijs": "^1.19.19",
"@typescript-eslint/eslint-plugin": "^6.3.0", "@typescript-eslint/eslint-plugin": "^6.4.0",
"@typescript-eslint/parser": "^6.3.0", "@typescript-eslint/parser": "^6.4.0",
"commitizen": "^4.3.0", "commitizen": "^4.3.0",
"conventional-changelog-cli": "^3.0.0", "conventional-changelog-cli": "^3.0.0",
"cz-conventional-changelog": "^3.3.0", "cz-conventional-changelog": "^3.3.0",
...@@ -135,10 +135,10 @@ ...@@ -135,10 +135,10 @@
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
"pont-engine": "^1.5.12", "pont-engine": "^1.5.12",
"postcss": "^8.4.27", "postcss": "^8.4.28",
"postcss-html": "^1.5.0", "postcss-html": "^1.5.0",
"postcss-less": "^6.0.0", "postcss-less": "^6.0.0",
"prettier": "^3.0.1", "prettier": "^3.0.2",
"rimraf": "^5.0.1", "rimraf": "^5.0.1",
"sass": "^1.65.1", "sass": "^1.65.1",
"sort-package-json": "^2.5.1", "sort-package-json": "^2.5.1",
......
...@@ -1036,6 +1036,7 @@ ...@@ -1036,6 +1036,7 @@
}, 80) }, 80)
}, },
pickerChange(e) { pickerChange(e) {
if (!this.isShow) return
//1-年 2-年月 3-年月日 4-年月日 时 5-年月日 时分 6-时分 7-时分秒 8-分秒 //1-年 2-年月 3-年月日 4-年月日 时 5-年月日 时分 6-时分 7-时分秒 8-分秒
let value = e.detail.value; let value = e.detail.value;
let type = Number(this.type) let type = Number(this.type)
......
...@@ -730,6 +730,7 @@ ...@@ -730,6 +730,7 @@
}, 50) }, 50)
}, },
pickerChange(e) { pickerChange(e) {
if (!this.isShow) return
let value = e.detail.value; let value = e.detail.value;
if (!this.isInitShow || value.length != this.layer) return; if (!this.isInitShow || value.length != this.layer) return;
if (this.linkage) { if (this.linkage) {
......
...@@ -385,7 +385,9 @@ ...@@ -385,7 +385,9 @@
}) })
} }
this.itemList = vals; this.itemList = vals;
} } else {
this.itemList = []
}
}, },
itemClick(index) { itemClick(index) {
let vals = [...this.itemList] let vals = [...this.itemList]
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论