From ee759b2a5f2d8023ffaeaf36a55b7a69ac38e370 Mon Sep 17 00:00:00 2001 From: ajaxzheng <894103554@qq.com> Date: Sun, 28 May 2023 18:25:32 -0700 Subject: [PATCH] =?UTF-8?q?fix(tinyvue):=20=E5=90=8C=E6=AD=A5=E5=86=85?= =?UTF-8?q?=E9=83=A8=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9?= =?UTF-8?q?grid=E7=BB=84=E4=BB=B6=E5=86=8Dvue2=E4=B8=8B=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#254)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/renderless/package.json | 2 +- packages/renderless/src/button-group/vue.ts | 7 ++++--- packages/renderless/src/pager/vue.ts | 5 +++++ packages/theme-mobile/package.json | 2 +- packages/theme/package.json | 2 +- packages/vue/src/grid/src/grid/grid.ts | 2 +- packages/vue/src/option/package.json | 3 +-- packages/vue/src/option/src/pc.vue | 5 +---- packages/vue/src/pager/src/pc.vue | 10 +++++++--- packages/vue/src/select/src/pc.vue | 2 +- 10 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 packages/renderless/src/pager/vue.ts diff --git a/packages/renderless/package.json b/packages/renderless/package.json index 7d44a7210..c232c2075 100644 --- a/packages/renderless/package.json +++ b/packages/renderless/package.json @@ -1,7 +1,7 @@ { "name": "@opentiny/vue-renderless", "private": true, - "version": "3.8.5", + "version": "3.8.2", "description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.", "homepage": "https://opentiny.design/tiny-vue", "keywords": [ diff --git a/packages/renderless/src/button-group/vue.ts b/packages/renderless/src/button-group/vue.ts index c85248de3..7b5eaee23 100644 --- a/packages/renderless/src/button-group/vue.ts +++ b/packages/renderless/src/button-group/vue.ts @@ -10,11 +10,11 @@ * */ -import { handleClick } from './index' +import { handleClick, moreNodeClick } from './index' export const api = ['state', 'handleClick', 'moreNodeClick'] -export const renderless = (props, { computed, reactive, watch, inject }, { emit, parent }) => { +export function renderless(props, { computed, reactive, watch, inject }, { emit, parent }) { parent.tinyForm = parent.tinyForm || inject('form', null) const state = reactive({ @@ -44,7 +44,8 @@ export const renderless = (props, { computed, reactive, watch, inject }, { emit, const api = { state, - handleClick: handleClick({ emit, props, state }) + handleClick: handleClick({ emit, props, state }), + moreNodeClick: moreNodeClick({ emit, props, state }), } return api diff --git a/packages/renderless/src/pager/vue.ts b/packages/renderless/src/pager/vue.ts new file mode 100644 index 000000000..271e1b905 --- /dev/null +++ b/packages/renderless/src/pager/vue.ts @@ -0,0 +1,5 @@ +export const api = [] +export function renderless() { + const api = {} + return api +} diff --git a/packages/theme-mobile/package.json b/packages/theme-mobile/package.json index 422b85b01..d95f4495c 100644 --- a/packages/theme-mobile/package.json +++ b/packages/theme-mobile/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/vue-theme-mobile", - "version": "3.8.5", + "version": "3.8.2", "description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.", "homepage": "https://opentiny.design/tiny-vue", "main": "index.css", diff --git a/packages/theme/package.json b/packages/theme/package.json index fd3158593..b6c487baa 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/vue-theme", - "version": "3.8.0", + "version": "3.8.2", "description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.", "main": "index.css", "homepage": "https://opentiny.design/tiny-vue", diff --git a/packages/vue/src/grid/src/grid/grid.ts b/packages/vue/src/grid/src/grid/grid.ts index c32c11258..49f6569f8 100644 --- a/packages/vue/src/grid/src/grid/grid.ts +++ b/packages/vue/src/grid/src/grid/grid.ts @@ -274,7 +274,7 @@ export default { }, render() { let { editConfig, fetchOption, listeners, loading, optimization, pager, pagerConfig, remoteFilter, remoteSort, selectToolbar } = this as any - let { seqIndex, $slots, tableCustoms, tableData, tableListeners, tableLoading, tableProps, toolbar, vSize, designConfig } = this as any + let { seqIndex, slots: $slots, tableCustoms, tableData, tableListeners, tableLoading, tableProps, toolbar, vSize, designConfig } = this as any // grid全局替换smb图标 if (designConfig && designConfig.icons) { diff --git a/packages/vue/src/option/package.json b/packages/vue/src/option/package.json index 3cb94db47..fa654c3a9 100644 --- a/packages/vue/src/option/package.json +++ b/packages/vue/src/option/package.json @@ -14,8 +14,7 @@ }, "dependencies": { "@opentiny/vue-renderless": "workspace:~", - "@opentiny/vue-common": "workspace:~", - "@opentiny/vue-icon": "workspace:~" + "@opentiny/vue-common": "workspace:~" }, "license": "MIT" } diff --git a/packages/vue/src/option/src/pc.vue b/packages/vue/src/option/src/pc.vue index ab7b67906..22eeafb54 100644 --- a/packages/vue/src/option/src/pc.vue +++ b/packages/vue/src/option/src/pc.vue @@ -28,7 +28,7 @@ > @@ -42,14 +42,11 @@ import { renderless, api } from '@opentiny/vue-renderless/option/vue' import { $prefix, setup, defineComponent } from '@opentiny/vue-common' import Checkbox from '@opentiny/vue-checkbox' -import { iconCheck, iconCheckedSur } from '@opentiny/vue-icon' export default defineComponent({ name: $prefix + 'Option', componentName: 'Option', components: { - IconCheck: iconCheck(), - IconCheckedSur: iconCheckedSur(), TinyCheckbox: Checkbox }, props: { diff --git a/packages/vue/src/pager/src/pc.vue b/packages/vue/src/pager/src/pc.vue index 8907c68d7..8e3d66395 100644 --- a/packages/vue/src/pager/src/pc.vue +++ b/packages/vue/src/pager/src/pc.vue @@ -13,7 +13,8 @@ import Pager from '@opentiny/vue-pager-item' import Popover from '@opentiny/vue-popover' import { t } from '@opentiny/vue-locale' -import { $prefix, h, defineComponent } from '@opentiny/vue-common' +import { $prefix, h, setup, defineComponent } from '@opentiny/vue-common' +import { renderless, api } from '@opentiny/vue-renderless/pager/vue' import { iconTriangleDown, iconChevronLeft, @@ -80,6 +81,9 @@ export default defineComponent({ internalTotal: this.total } }, + setup(props, context) { + return setup({ props, context, renderless, api }) + }, render() { const layout = this.internalLayout @@ -117,7 +121,7 @@ export default defineComponent({ pageSizes={this.pageSizes} > ), - slot: {typeof this.$slots.default === 'function' ? this.$slots.default() : this.$slots.default}, + slot: {this.slots.default && this.slots.default()}, total: } @@ -211,7 +215,7 @@ export default defineComponent({
-
+
), diff --git a/packages/vue/src/select/src/pc.vue b/packages/vue/src/select/src/pc.vue index 9b7e2b658..1caa848cb 100644 --- a/packages/vue/src/select/src/pc.vue +++ b/packages/vue/src/select/src/pc.vue @@ -262,7 +262,7 @@ @mousedown.stop @mouseenter="state.hoverIndex = -9" > - + {{ t('ui.base.all') }}