From 0f1448fe8515584f98601a5650c637d0f3bb8276 Mon Sep 17 00:00:00 2001 From: HRK <119110706+18148764734@users.noreply.github.com> Date: Tue, 23 Apr 2024 16:20:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=83=A8=E5=88=86=E9=92=88=E5=AF=B9?= =?UTF-8?q?=E6=8A=96=E9=9F=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?visualhost=E7=89=B9=E5=88=AB=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uni-file-picker/uni-file-picker.vue | 11 ++---- .../components/uni-forms/uni-forms.vue | 11 ++---- .../uni-number-box/uni-number-box.vue | 4 +- .../uni-row/components/uni-col/uni-col.vue | 11 ++---- .../uni-row/components/uni-row/uni-row.vue | 13 +++---- .../uni-swipe-action-item.vue | 2 +- .../components/uni-table/uni-table.vue | 23 +++++------ .../components/uni-tbody/uni-tbody.vue | 35 +++++++---------- .../uni-table/components/uni-td/uni-td.vue | 13 ++----- .../components/uni-th/filter-dropdown.vue | 7 +--- .../uni-table/components/uni-th/uni-th.vue | 13 ++----- uni_modules/uni-ui/changelog.md | 38 ------------------- uni_modules/uni-ui/package.json | 6 +-- 13 files changed, 52 insertions(+), 135 deletions(-) diff --git a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue index 162eca70a..bd099c7ee 100644 --- a/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue +++ b/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue @@ -83,14 +83,9 @@ components: { uploadImage, uploadFile - }, - options: { - // #ifdef MP-TOUTIAO - virtualHost: false, - // #endif - // #ifndef MP-TOUTIAO - virtualHost: true - // #endif + }, + options: { + virtualHost: true }, emits: ['select', 'success', 'fail', 'progress', 'delete', 'update:modelValue', 'input'], props: { diff --git a/uni_modules/uni-forms/components/uni-forms/uni-forms.vue b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue index a9552c2e4..b484cc9df 100644 --- a/uni_modules/uni-forms/components/uni-forms/uni-forms.vue +++ b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue @@ -66,14 +66,9 @@ */ export default { name: 'uniForms', - emits: ['validate', 'submit'], - options: { - // #ifdef MP-TOUTIAO - virtualHost: false, - // #endif - // #ifndef MP-TOUTIAO - virtualHost: true - // #endif + emits: ['validate', 'submit'], + options: { + virtualHost: true }, props: { // 即将弃用 diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue index 31da786a4..987364f1b 100644 --- a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue +++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue @@ -225,9 +225,9 @@ } .uni-numbox .uni-numbox--disabled { - color: #c0c0c0; + color: #c0c0c0 !important; /* #ifdef H5 */ cursor: not-allowed; /* #endif */ } - + diff --git a/uni_modules/uni-row/components/uni-col/uni-col.vue b/uni_modules/uni-row/components/uni-col/uni-col.vue index f74687ed3..5b2ecd821 100644 --- a/uni_modules/uni-row/components/uni-col/uni-col.vue +++ b/uni_modules/uni-row/components/uni-col/uni-col.vue @@ -50,14 +50,9 @@ // -1 默认值,因为在微信小程序端只给Number会有默认值0 export default { name: 'uniCol', - // #ifdef MP-WEIXIN - options: { - // #ifdef MP-TOUTIAO - virtualHost: false, - // #endif - // #ifndef MP-TOUTIAO - virtualHost: true - // #endif + // #ifdef MP-WEIXIN + options: { + virtualHost: true // 在微信小程序中将组件节点渲染为虚拟节点,更加接近Vue组件的表现 }, // #endif props: { diff --git a/uni_modules/uni-row/components/uni-row/uni-row.vue b/uni_modules/uni-row/components/uni-row/uni-row.vue index c5ad0610a..3451cc905 100644 --- a/uni_modules/uni-row/components/uni-row/uni-row.vue +++ b/uni_modules/uni-row/components/uni-row/uni-row.vue @@ -29,15 +29,12 @@ export default { name: 'uniRow', - componentName: 'uniRow', - options: { - // #ifdef MP-TOUTIAO - virtualHost: false, - // #endif - // #ifdef MP-WEIXIN - virtualHost: true - // #endif + componentName: 'uniRow', + // #ifdef MP-WEIXIN + options: { + virtualHost: true // 在微信小程序中将组件节点渲染为虚拟节点,更加接近Vue组件的表现,可使用flex布局 }, + // #endif props: { type: String, gutter: Number, diff --git a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue index a6080b31f..ec3ad237b 100644 --- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue +++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue @@ -345,4 +345,4 @@ } /* #endif */ - + diff --git a/uni_modules/uni-table/components/uni-table/uni-table.vue b/uni_modules/uni-table/components/uni-table/uni-table.vue index 9b558e192..9fe681d3e 100644 --- a/uni_modules/uni-table/components/uni-table/uni-table.vue +++ b/uni_modules/uni-table/components/uni-table/uni-table.vue @@ -34,15 +34,10 @@ * @event {Function} selection-change 开启多选时,当选择项发生变化时会触发该事件 */ export default { - name: 'uniTable', - options: { - // #ifdef MP-TOUTIAO - virtualHost: false, - // #endif - // #ifndef MP-TOUTIAO - virtualHost: true - // #endif - }, + name: 'uniTable', + options: { + virtualHost: true + }, emits:['selection-change'], props: { data: { @@ -95,10 +90,10 @@ export default { if (this.theadChildren) { rowspan = this.theadChildren.rowspan } - + // this.trChildren.length - rowspan this.noData = false - // this.noData = newVal.length === 0 + // this.noData = newVal.length === 0 } }, created() { @@ -252,9 +247,9 @@ export default { if (!this.theadChildren) { theadChildren = this.trChildren[0] } - - - + + + let childDomIndex = this.trChildren.findIndex((item, index) => child === item) if(childDomIndex < 0){ childDomIndex = this.data.findIndex(v=>v[this.rowKey] === keyValue) + 1 diff --git a/uni_modules/uni-table/components/uni-tbody/uni-tbody.vue b/uni_modules/uni-table/components/uni-tbody/uni-tbody.vue index b66ef8895..1d808b3bd 100644 --- a/uni_modules/uni-table/components/uni-tbody/uni-tbody.vue +++ b/uni_modules/uni-table/components/uni-tbody/uni-tbody.vue @@ -5,31 +5,24 @@ - - - +