diff --git a/examples/sites/package.json b/examples/sites/package.json index d7df6bd918..9fbeb66237 100644 --- a/examples/sites/package.json +++ b/examples/sites/package.json @@ -52,7 +52,6 @@ "devDependencies": { "@opentiny-internal/unplugin-virtual-template": "workspace:~", "@playwright/test": "~1.42.0", - "@opentiny/vue-mobile": "workspace:~", "@types/markdown-it": "^12.2.3", "@types/node": "^17.0.45", "@unocss/preset-icons": "^0.38.2", @@ -88,4 +87,4 @@ "vite-svg-loader": "^3.6.0", "vue-tsc": "^1.8.5" } -} +} \ No newline at end of file diff --git a/packages/modules.json b/packages/modules.json index dc02d08838..4776d5b487 100644 --- a/packages/modules.json +++ b/packages/modules.json @@ -3060,11 +3060,6 @@ "pc" ] }, - "TreeMenuPc": { - "path": "vue/src/tree-menu/src/pc.vue", - "type": "template", - "exclude": false - }, "TreePc": { "path": "vue/src/tree/src/pc.vue", "type": "template", diff --git a/packages/renderless/src/flowchart/index.ts b/packages/renderless/src/flowchart/index.ts index c2926618a1..a967b4234f 100644 --- a/packages/renderless/src/flowchart/index.ts +++ b/packages/renderless/src/flowchart/index.ts @@ -290,8 +290,11 @@ export const refresh = ({ graphWidth = 0, adjustX = 0 } = {}) => { api.removeListeners() - if (graphWidth && graphWidth !== state.temporary.graphWidth) { - state.temporary.graphWidth = graphWidth + // 修复浏览器缩放时出现抖动问题， 缩放模式下offsetWidth与真实宽度可能有差异(差异不超过1px) + const graphWidthAdapt = graphWidth - 1 >= 0 ? graphWidth - 1 : 0 + + if (graphWidth && graphWidthAdapt !== state.temporary.graphWidth) { + state.temporary.graphWidth = graphWidthAdapt state.temporary.adjustX = adjustX } diff --git a/packages/renderless/types/tree-menu.type.ts b/packages/renderless/types/tree-menu.type.ts index 7fa04a2ebf..006098f6ee 100644 --- a/packages/renderless/types/tree-menu.type.ts +++ b/packages/renderless/types/tree-menu.type.ts @@ -1,5 +1,5 @@ import type { ComputedRef, ExtractPropTypes } from 'vue' -import type { treeMenuProps } from '@/tree-menu/src' +import type { treeMenuProps } from '@/tree-menu/src/props.ts' import type { initData, setMenuKey, diff --git a/packages/theme-saas/src/cascader-menu/index.less b/packages/theme-saas/src/cascader-menu/index.less index 1abad7fe15..ab4ed70d5b 100644 --- a/packages/theme-saas/src/cascader-menu/index.less +++ b/packages/theme-saas/src/cascader-menu/index.less @@ -18,7 +18,7 @@ } & &__wrap { - height: 204px; + min-height: 204px; } & &__list { diff --git a/packages/theme-saas/src/date-range/index.less b/packages/theme-saas/src/date-range/index.less index b112d536e7..f62bfc5452 100644 --- a/packages/theme-saas/src/date-range/index.less +++ b/packages/theme-saas/src/date-range/index.less @@ -67,8 +67,8 @@ } .@{date-range-picker-prefix-cls}__header div { - margin-left: 50px; - margin-right: 50px; + @apply leading-5; + margin: 0 auto; } } diff --git a/packages/theme-saas/src/grid/mixins/table.less b/packages/theme-saas/src/grid/mixins/table.less index 785a086e95..fbfe6c9596 100644 --- a/packages/theme-saas/src/grid/mixins/table.less +++ b/packages/theme-saas/src/grid/mixins/table.less @@ -33,6 +33,11 @@ .@{grid-cell-prefix-cls} { .TextEllipsis(); @apply leading-normal; + // 表头布局从block改为了flex，此处兼容插槽文本溢出不显示省略号问题 + &:not(:has(.tiny-grid-cell-text)) > span:only-of-type { + @apply text-ellipsis; + @apply overflow-hidden; + } & > .@{grid-checkbox-prefix-cls} { .TextEllipsis(); diff --git a/packages/theme-saas/src/grid/table.less b/packages/theme-saas/src/grid/table.less index 045277a6db..5d0624199b 100644 --- a/packages/theme-saas/src/grid/table.less +++ b/packages/theme-saas/src/grid/table.less @@ -644,9 +644,6 @@ @apply flex; @apply items-center; @apply justify-start; - &:has(> span:only-child) { - @apply block; - } } &.col__center { diff --git a/packages/theme-saas/src/picker/index.less b/packages/theme-saas/src/picker/index.less index 37181ef06c..b392594205 100644 --- a/packages/theme-saas/src/picker/index.less +++ b/packages/theme-saas/src/picker/index.less @@ -146,11 +146,11 @@ .@{range-prefix-cls}-separator { @apply leading-6; - @apply text-xs; + @apply text-sm; } .@{range-prefix-cls}-input { - @apply text-xs; + @apply text-sm; } .@{range-prefix-cls}__close-icon, @@ -238,7 +238,7 @@ @apply ~'-translate-y-2/4'; @apply max-w-full; @apply truncate; - @apply text-xs; + @apply text-sm; } } diff --git a/packages/theme/src/old-theme-index.js b/packages/theme/src/old-theme-index.js index 152193ddc8..703943073a 100644 --- a/packages/theme/src/old-theme-index.js +++ b/packages/theme/src/old-theme-index.js @@ -2,5 +2,5 @@ export default { id: 'tiny-old-theme', name: 'OldTheme', cnName: '旧的主题', - css: `:root{--tv-base-color-brand:#5e7ce0;--tv-base-color-brand-1:#f2f5fc;--tv-base-color-brand-2:#e9edfa;--tv-base-color-brand-3:#beccfa;--tv-base-color-brand-4:#96adfa;--tv-base-color-brand-5:#7693f5;--tv-base-color-brand-6:#5e7ce0;--tv-base-color-brand-7:#526ecc;--tv-base-color-brand-8:#465eb8;--tv-base-color-brand-9:#3c51a6;--tv-base-color-brand-10:#344899;--tv-base-color-brand-11:#2a3cb5;--tv-base-color-common-1:#ffffff;--tv-base-color-common-2:#f5f5f6;--tv-base-color-common-3:#eef0f5;--tv-base-color-common-4:#dfe1e6;--tv-base-color-common-5:#adb0b8;--tv-base-color-common-6:#8a8e99;--tv-base-color-common-7:#575d6c;--tv-base-color-common-8:#252b3a;--tv-base-color-common-9:#464c59;--tv-base-color-common-10:#5c6173;--tv-base-color-common-11:#282b33;--tv-base-color-common-12:#000000;--tv-base-color-success-1:#edfff9;--tv-base-color-success-2:#cffcee;--tv-base-color-success-3:#acf2dc;--tv-base-color-success-4:#8be8cb;--tv-base-color-success-5:#6ddebb;--tv-base-color-success-6:#50d4ab;--tv-base-color-success-7:#3ac295;--tv-base-color-success-8:#27b080;--tv-base-color-success-9:#169e6c;--tv-base-color-success-10:#088c58;--tv-base-color-success-11:#007a45;--tv-base-color-error-1:#ffeceb;--tv-base-color-error-2:#ffd7d6;--tv-base-color-error-3:#ffbab8;--tv-base-color-error-4:#ffa6a3;--tv-base-color-error-5:#ff8985;--tv-base-color-error-6:#f66e6a;--tv-base-color-error-7:#df514e;--tv-base-color-error-8:#c83737;--tv-base-color-error-9:#b02121;--tv-base-color-error-10:#971111;--tv-base-color-error-11:#810404;--tv-base-color-error-12:#c7000b;--tv-base-color-error-13:#d64a52;--tv-base-color-error-14:#b12220;--tv-base-color-warn-1:#fff3e8;--tv-base-color-warn-2:#ffe1c7;--tv-base-color-warn-3:#ffd0a6;--tv-base-color-warn-4:#ffbf85;--tv-base-color-warn-5:#ffad63;--tv-base-color-warn-6:#fa9841;--tv-base-color-warn-7:#e37d29;--tv-base-color-warn-8:#cc6414;--tv-base-color-warn-9:#b54e04;--tv-base-color-warn-10:#9e3f00;--tv-base-color-warn-11:#873400;--tv-base-color-warn-secondary-1:#ffb700;--tv-base-color-warn-secondary-2:#fac20a;--tv-base-color-info-1:#f0f7ff;--tv-base-color-info-2:#e9edfa;--tv-base-color-info-3:#beccfa;--tv-base-color-info-4:#96adfa;--tv-base-color-info-5:#7693f5;--tv-base-color-info-6:#5e7ce0;--tv-base-color-info-7:#526ecc;--tv-base-color-info-8:#465eb8;--tv-base-color-info-9:#3c51a6;--tv-base-color-info-10:#344899;--tv-base-color-info-11:#2a3c85;--tv-color-success-text:var(--tv-base-color-success-6);--tv-color-success-text-primary:var(--tv-base-color-common-8);--tv-color-success-text-white:var(--tv-base-color-common-1);--tv-color-success-bg:var(--tv-base-color-success-6);--tv-color-success-bg-light:var(--tv-base-color-success-1);--tv-color-success-bg-white:var(--tv-base-color-common-1);--tv-color-success-border:var(--tv-base-color-success-6);--tv-color-success-border-light:var(--tv-base-color-success-3);--tv-color-success-icon:var(--tv-base-color-success-6);--tv-color-error-text:var(--tv-base-color-error-6);--tv-color-error-text-primary:var(--tv-base-color-common-8);--tv-color-error-text-white:var(--tv-base-color-common-1);--tv-color-error-bg:var(--tv-base-color-error-6);--tv-color-error-bg-light:var(--tv-base-color-error-1);--tv-color-error-bg-white:var(--tv-base-color-common-1);--tv-color-error-border:var(--tv-base-color-error-6);--tv-color-error-border-light:var(--tv-base-color-error-3);--tv-color-error-icon:var(--tv-base-color-error-6);--tv-color-warn-text:var(--tv-base-color-warn-7);--tv-color-warn-text-primary:var(--tv-base-color-common-8);--tv-color-warn-text-white:var(--tv-base-color-common-1);--tv-color-warn-bg:var(--tv-base-color-warn-6);--tv-color-warn-bg-light:var(--tv-base-color-warn-1);--tv-color-warn-bg-white:var(--tv-base-color-common-1);--tv-color-warn-border:var(--tv-base-color-warn-6);--tv-color-warn-border-light:var(--tv-base-color-warn-3);--tv-color-warn-icon:var(--tv-base-color-warn-6);--tv-color-info-text:var(--tv-base-color-info-7);--tv-color-info-text-primary:var(--tv-base-color-common-8);--tv-color-info-text-white:var(--tv-base-color-common-1);--tv-color-info-bg:var(--tv-base-color-info-6);--tv-color-info-bg-light:#ebf6ff;--tv-color-info-bg-white:var(--tv-base-color-common-1);--tv-color-info-border:var(--tv-base-color-info-6);--tv-color-info-border-light:var(--tv-base-color-info-3);--tv-color-info-icon:var(--tv-base-color-info-6);--tv-color-act-primary-text:var(--tv-base-color-brand-6);--tv-color-act-primary-text-hover:var(--tv-base-color-brand-6);--tv-color-act-primary-text-active:var(--tv-base-color-brand-6);--tv-color-act-primary-text-white:var(--tv-base-color-common-1);--tv-color-act-primary-text-white-hover:var(--tv-base-color-common-1);--tv-color-act-primary-text-white-active:var(--tv-base-color-common-1);--tv-color-act-primary-bg:var(--tv-base-color-brand-6);--tv-color-act-primary-bg-hover:var(--tv-base-color-brand-5);--tv-color-act-primary-bg-active:var(--tv-base-color-brand-5);--tv-color-act-primary-bg-white:var(--tv-base-color-brand-1);--tv-color-act-primary-bg-white-hover:var(--tv-base-color-brand-6);--tv-color-act-primary-bg-white-active:var(--tv-base-color-brand-6);--tv-color-act-primary-border:var(--tv-base-color-brand-6);--tv-color-act-primary-border-hover:var(--tv-base-color-brand-5);--tv-color-act-primary-border-active:var(--tv-base-color-brand-5);--tv-color-act-primary-border-light:var(--tv-base-color-brand-6);--tv-color-act-primary-border-light-hover:var(--tv-base-color-brand-3);--tv-color-act-primary-border-light-active:var(--tv-base-color-brand-3);--tv-color-act-primary-border-light-hover-1:var(--tv-base-color-brand-3);--tv-color-act-primary-border-light-active-1:var(--tv-base-color-brand-3);--tv-color-act-primary-plain-text-hover:var(--tv-base-color-common-1);--tv-color-act-success-text:var(--tv-base-color-success-6);--tv-color-act-success-text-hover:var(--tv-base-color-success-6);--tv-color-act-success-text-active:var(--tv-base-color-success-6);--tv-color-act-success-text-white:var(--tv-base-color-common-1);--tv-color-act-success-text-white-hover:var(--tv-base-color-common-1);--tv-color-act-success-text-white-active:var(--tv-base-color-common-1);--tv-color-act-success-bg:var(--tv-base-color-success-6);--tv-color-act-success-bg-hover:var(--tv-base-color-success-5);--tv-color-act-success-bg-active:var(--tv-base-color-success-5);--tv-color-act-success-bg-light:var(--tv-base-color-success-1);--tv-color-act-success-bg-light-hover:var(--tv-base-color-success-6);--tv-color-act-success-bg-light-active:var(--tv-base-color-success-6);--tv-color-act-success-border:var(--tv-base-color-success-6);--tv-color-act-success-border-hover:var(--tv-base-color-success-5);--tv-color-act-success-border-active:var(--tv-base-color-success-5);--tv-color-act-success-border-hover-1:var(--tv-base-color-success-2);--tv-color-act-success-border-active-1:var(--tv-base-color-success-3);--tv-color-act-success-border-light:var(--tv-base-color-success-6);--tv-color-act-success-border-light-hover:var(--tv-base-color-success-1);--tv-color-act-success-border-light-active:var(--tv-base-color-success-1);--tv-color-act-success-plain-text-hover:var(--tv-base-color-common-1);--tv-color-act-warning-text:var(--tv-base-color-warn-7);--tv-color-act-warning-text-hover:var(--tv-base-color-warn-7);--tv-color-act-warning-text-active:var(--tv-base-color-warn-7);--tv-color-act-warning-text-white:var(--tv-base-color-common-1);--tv-color-act-warning-text-white-hover:var(--tv-base-color-common-1);--tv-color-act-warning-text-white-active:var(--tv-base-color-common-1);--tv-color-act-warning-bg:var(--tv-base-color-warn-6);--tv-color-act-warning-bg-hover:var(--tv-base-color-warn-5);--tv-color-act-warning-bg-active:var(--tv-base-color-warn-5);--tv-color-act-warning-bg-light:var(--tv-base-color-warn-1);--tv-color-act-warning-bg-light-hover:var(--tv-base-color-warn-6);--tv-color-act-warning-bg-light-active:var(--tv-base-color-warn-6);--tv-color-act-warning-border:var(--tv-base-color-warn-6);--tv-color-act-warning-border-hover:var(--tv-base-color-warn-5);--tv-color-act-warning-border-active:var(--tv-base-color-warn-5);--tv-color-act-warning-border-hover-1:var(--tv-base-color-warn-2);--tv-color-act-warning-border-active-1:var(--tv-base-color-warn-2);--tv-color-act-warning-border-light:var(--tv-base-color-warn-6);--tv-color-act-warning-border-light-hover:var(--tv-base-color-warn-1);--tv-color-act-warning-border-light-active:var(--tv-base-color-warn-1);--tv-color-act-warning-plain-text-hover:var(--tv-base-color-common-1);--tv-color-act-danger-text:var(--tv-base-color-error-12);--tv-color-act-danger-text-hover:var(--tv-base-color-error-12);--tv-color-act-danger-text-active:var(--tv-base-color-error-12);--tv-color-act-danger-text-white:var(--tv-base-color-common-1);--tv-color-act-danger-text-white-hover:var(--tv-base-color-common-1);--tv-color-act-danger-text-white-active:var(--tv-base-color-common-1);--tv-color-act-danger-bg:var(--tv-base-color-error-12);--tv-color-act-danger-bg-hover:var(--tv-base-color-error-13);--tv-color-act-danger-bg-active:var(--tv-base-color-error-14);--tv-color-act-danger-bg-light:var(--tv-base-color-error-1);--tv-color-act-danger-bg-light-hover:var(--tv-base-color-error-12);--tv-color-act-danger-bg-light-active:var(--tv-base-color-error-12);--tv-color-act-danger-border:var(--tv-base-color-error-12);--tv-color-act-danger-border-hover:var(--tv-base-color-error-13);--tv-color-act-danger-border-active:var(--tv-base-color-error-13);--tv-color-act-danger-border-hover-1:var(--tv-base-color-error-3);--tv-color-act-danger-border-active-1:var(--tv-base-color-error-3);--tv-color-act-danger-border-light:var(--tv-base-color-error-12);--tv-color-act-danger-border-light-hover:var(--tv-base-color-error-1);--tv-color-act-danger-border-light-active:var(--tv-base-color-error-1);--tv-color-act-danger-plain-text-hover:var(--tv-base-color-common-1);--tv-color-act-info-text:var(--tv-base-color-info-7);--tv-color-act-info-text-hover:var(--tv-base-color-info-7);--tv-color-act-info-text-active:var(--tv-base-color-info-7);--tv-color-act-info-text-white:var(--tv-base-color-common-1);--tv-color-act-info-text-white-hover:var(--tv-base-color-common-1);--tv-color-act-info-text-white-active:var(--tv-base-color-common-1);--tv-color-act-info-bg:var(--tv-base-color-info-6);--tv-color-act-info-bg-hover:var(--tv-base-color-info-6);--tv-color-act-info-bg-active:var(--tv-base-color-info-6);--tv-color-act-info-bg-light:var(--tv-base-color-info-1);--tv-color-act-info-bg-light-hover:var(--tv-base-color-info-6);--tv-color-act-info-bg-light-active:var(--tv-base-color-info-6);--tv-color-act-info-border:var(--tv-base-color-brand-6);--tv-color-act-info-border-hover:var(--tv-base-color-brand-6);--tv-color-act-info-border-active:var(--tv-base-color-brand-6);--tv-color-act-info-border-hover-1:var(--tv-base-color-info-3);--tv-color-act-info-border-active-1:var(--tv-base-color-info-3);--tv-color-act-info-border-light:var(--tv-base-color-info-6);--tv-color-act-info-border-light-hover:var(--tv-base-color-info-1);--tv-color-act-info-border-light-active:var(--tv-base-color-info-1);--tv-color-act-info-plain-text-hover:var(--tv-base-color-common-1);--tv-color-text:var(--tv-base-color-common-8);--tv-color-text-secondary:var(--tv-base-color-common-7);--tv-color-text-weaken:var(--tv-base-color-common-6);--tv-color-text-placeholder:var(--tv-base-color-common-5);--tv-color-text-disabled:var(--tv-base-color-common-5);--tv-color-text-active:var(--tv-base-color-brand-7);--tv-color-text-important:var(--tv-base-color-error-7);--tv-color-text-white:var(--tv-base-color-common-1);--tv-color-text-link:var(--tv-base-color-brand-7);--tv-color-text-link-hover:var(--tv-base-color-brand-10);--tv-color-text-darbg:var(--tv-base-color-common-5);--tv-color-plain-text-hover:var(--tv-base-color-brand-6);--tv-color-icon:var(--tv-base-color-common-7);--tv-color-icon-hover:var(--tv-base-color-brand-6);--tv-color-icon-active:var(--tv-base-color-brand-6);--tv-color-icon-disabled:var(--tv-base-color-common-5);--tv-color-icon-checked-disabled:var(--tv-base-color-common-5);--tv-color-icon-control:var(--tv-base-color-common-8);--tv-color-icon-control-active:var(--tv-base-color-brand-6);--tv-color-icon-control-disabled:var(--tv-base-color-common-5);--tv-color-icon-white:var(--tv-base-color-common-1);--tv-color-icon-link:var(--tv-base-color-brand-7);--tv-color-icon-warn-secondary:var(--tv-base-color-warn-secondary-2);--tv-color-bg:var(--tv-base-color-common-3);--tv-color-bg-primary:var(--tv-base-color-brand);--tv-color-bg-secondary:var(--tv-base-color-common-1);--tv-color-bg-control:var(--tv-base-color-common-5);--tv-color-bg-control-unactive:var(--tv-base-color-common-5);--tv-color-bg-gray-1:var(--tv-base-color-common-2);--tv-color-bg-gray-2:var(--tv-base-color-common-3);--tv-color-bg-header:var(--tv-base-color-common-4);--tv-color-bg-mask:rgba(0, 0, 0, 0.3);--tv-color-bg-dark:var(--tv-base-color-common-9);--tv-color-bg-disabled:var(--tv-base-color-common-2);--tv-color-bg-disabled-control-checked:var(--tv-base-color-common-4);--tv-color-bg-disabled-control-unactive:var(--tv-base-color-common-4);--tv-color-bg-disabled-control-active:var(--tv-base-color-brand-3);--tv-color-bg-hover:var(--tv-base-color-brand-1);--tv-color-bg-hover-primary:var(--tv-base-color-common-10);--tv-color-bg-hover-secondary:var(--tv-base-color-common-1);--tv-color-bg-hover-1:var(--tv-base-color-brand-1);--tv-color-bg-hover-2:var(--tv-base-color-common-5);--tv-color-bg-hover-3:var(--tv-base-color-brand-1);--tv-color-bg-hover-dark:var(--tv-base-color-common-10);--tv-color-bg-active:var(--tv-base-color-brand-1);--tv-color-bg-active-control:var(--tv-base-color-brand);--tv-color-bg-active-primary:var(--tv-base-color-brand);--tv-color-bg-active-secondary:var(--tv-base-color-common-1);--tv-color-bg-active-emphasize:var(--tv-base-color-brand);--tv-color-bg-active-emphasize-light:var(--tv-base-color-brand-1);--tv-color-bg-active-dark:var(--tv-base-color-common-3);--tv-color-border:var(--tv-base-color-common-5);--tv-color-border-hover:var(--tv-base-color-common-7);--tv-color-border-active:var(--tv-base-color-brand);--tv-color-border-active-control:var(--tv-base-color-brand-6);--tv-color-border-disabled:var(--tv-base-color-common-4);--tv-color-border-secondary:var(--tv-base-color-common-5);--tv-color-border-ghost:var(--tv-base-color-common-5);--tv-color-border-ghost-active:var(--tv-base-color-common-4);--tv-color-border-divider:var(--tv-base-color-common-4);--tv-color-border-divider-short:var(--tv-base-color-common-4);--tv-font-family:'Helvetica','Arial','PingFangSC-Regular','Hiragino Sans GB','Microsoft YaHei','微软雅黑','Microsoft JhengHei';--tv-font-family-1:'Arial','San Francisco','Helvetica';--tv-font-size-sm:12px;--tv-font-size-md:14px;--tv-font-size-lg:16px;--tv-font-size-xl:18px;--tv-font-size-xxl:20px;--tv-font-size-default:var(--tv-font-size-sm);--tv-font-size-heading-xs:16px;--tv-font-size-heading-sm:18px;--tv-font-size-heading-md:20px;--tv-font-size-heading-lg:24px;--tv-font-size-heading-xl:32px;--tv-line-height-number:1.5;--tv-font-weight-thin:200;--tv-font-weight-regular:400;--tv-font-weight-bold:600;--tv-border-radius-xs:2px;--tv-border-radius-sm:2px;--tv-border-radius-md:2px;--tv-border-radius-lg:4px;--tv-border-radius-round:999px;--tv-border-width:1px;--tv-space-base:4px;--tv-space-xs:2px;--tv-space-sm:var(--tv-space-base);--tv-space-md:calc(var(--tv-space-base) * 2);--tv-space-lg:calc(var(--tv-space-base) * 3);--tv-space-xl:calc(var(--tv-space-base) * 4);--tv-space-table-x:2px;--tv-space-table-y:1px;--tv-size-base:4px;--tv-size-height-xs:24px;--tv-size-height-sm:24px;--tv-size-height-md:28px;--tv-size-height-lg:32px;--tv-size-height-xl:36px;--tv-icon-size:14px;--tv-shadow-0:0 4px 16px 0 rgba(0, 0, 0, 0.08);--tv-shadow-1:0 0 0 0 rgba(0, 0, 0, 0);--tv-shadow-1-up:0 -1px 4px 0 rgba(0, 0, 0, 0.08);--tv-shadow-1-down:0 1px 4px 0 rgba(0, 0, 0, 0.08);--tv-shadow-1-left:-1px 0 4px 0 rgba(0, 0, 0, 0.08);--tv-shadow-1-right:1px 0 4px 0 rgba(0, 0, 0, 0.08);--tv-shadow-2-up:0 -2px 8px 0 rgba(0, 0, 0, 0.16);--tv-shadow-2-down:0 2px 8px 0 rgba(0, 0, 0, 0.16);--tv-shadow-2-left:-2px 0 8px 0 rgba(0, 0, 0, 0.16);--tv-shadow-2-right:2px 0 8px 0 rgba(0, 0, 0, 0.16);--tv-shadow-3-up:0 -4px 16px 0 rgba(0, 0, 0, 0.08);--tv-shadow-3-down:0 4px 16px 0 rgba(0, 0, 0, 0.08);--tv-shadow-3-left:-4px 0 16px 0 rgba(0, 0, 0, 0.08);--tv-shadow-3-right:4px 0 16px 0 rgba(0, 0, 0, 0.08);--tv-shadow-4-up:0 -8px 40px 0 rgba(0, 0, 0, 0.16);--tv-shadow-4-down:0 8px 40px 0 rgba(0, 0, 0, 0.16);--tv-shadow-4-left:-8px 0 40px 0 rgba(0, 0, 0, 0.16);--tv-shadow-4-right:8px 0 40px 0 rgba(0, 0, 0, 0.16);--tv-size-scrollbar-width:8px;--tv-size-scrollbar-height:8px;--tv-border-radius-scrollbar-thumb:4px;--tv-color-bg-scrollbar-thumb:var(--tv-base-color-common-6);--tv-color-bg-scrollbar-thumb-hover:var(--tv-base-color-common-6);--tv-color-bg-scrollbar-thumb-active:var(--tv-base-color-common-6);--tv-color-bg-scrollbar-track:var(--tv-base-color-common-1)}.tiny-button{--tv-Button-size-icon-font-size:14px;--tv-Button-size-icon-font-size-large:16px;--tv-Button-size-icon-font-size-medium:14px;--tv-Button-size-icon-font-size-small:12px;--tv-Button-size-icon-font-size-mini:12px}` + css: `:root{--tv-base-color-brand:#5e7ce0;--tv-base-color-brand-1:#f2f5fc;--tv-base-color-brand-2:#e9edfa;--tv-base-color-brand-3:#beccfa;--tv-base-color-brand-4:#96adfa;--tv-base-color-brand-5:#7693f5;--tv-base-color-brand-6:#5e7ce0;--tv-base-color-brand-7:#526ecc;--tv-base-color-brand-8:#465eb8;--tv-base-color-brand-9:#3c51a6;--tv-base-color-brand-10:#344899;--tv-base-color-brand-11:#2a3cb5;--tv-base-color-common-1:#ffffff;--tv-base-color-common-2:#f5f5f6;--tv-base-color-common-3:#eef0f5;--tv-base-color-common-4:#dfe1e6;--tv-base-color-common-5:#adb0b8;--tv-base-color-common-6:#8a8e99;--tv-base-color-common-7:#575d6c;--tv-base-color-common-8:#252b3a;--tv-base-color-common-9:#464c59;--tv-base-color-common-10:#5c6173;--tv-base-color-common-11:#282b33;--tv-base-color-common-12:#000000;--tv-base-color-success-1:#edfff9;--tv-base-color-success-2:#cffcee;--tv-base-color-success-3:#acf2dc;--tv-base-color-success-4:#8be8cb;--tv-base-color-success-5:#6ddebb;--tv-base-color-success-6:#50d4ab;--tv-base-color-success-7:#3ac295;--tv-base-color-success-8:#27b080;--tv-base-color-success-9:#169e6c;--tv-base-color-success-10:#088c58;--tv-base-color-success-11:#007a45;--tv-base-color-error-1:#ffeceb;--tv-base-color-error-2:#ffd7d6;--tv-base-color-error-3:#ffbab8;--tv-base-color-error-4:#ffa6a3;--tv-base-color-error-5:#ff8985;--tv-base-color-error-6:#f66e6a;--tv-base-color-error-7:#df514e;--tv-base-color-error-8:#c83737;--tv-base-color-error-9:#b02121;--tv-base-color-error-10:#971111;--tv-base-color-error-11:#810404;--tv-base-color-error-12:#c7000b;--tv-base-color-error-13:#d64a52;--tv-base-color-error-14:#b12220;--tv-base-color-warn-1:#fff3e8;--tv-base-color-warn-2:#ffe1c7;--tv-base-color-warn-3:#ffd0a6;--tv-base-color-warn-4:#ffbf85;--tv-base-color-warn-5:#ffad63;--tv-base-color-warn-6:#fa9841;--tv-base-color-warn-7:#e37d29;--tv-base-color-warn-8:#cc6414;--tv-base-color-warn-9:#b54e04;--tv-base-color-warn-10:#9e3f00;--tv-base-color-warn-11:#873400;--tv-base-color-warn-secondary-1:#ffb700;--tv-base-color-warn-secondary-2:#fac20a;--tv-base-color-info-1:#f0f7ff;--tv-base-color-info-2:#e9edfa;--tv-base-color-info-3:#beccfa;--tv-base-color-info-4:#96adfa;--tv-base-color-info-5:#7693f5;--tv-base-color-info-6:#5e7ce0;--tv-base-color-info-7:#526ecc;--tv-base-color-info-8:#465eb8;--tv-base-color-info-9:#3c51a6;--tv-base-color-info-10:#344899;--tv-base-color-info-11:#2a3c85;--tv-color-success-text:var(--tv-base-color-success-6);--tv-color-success-text-primary:var(--tv-base-color-common-8);--tv-color-success-text-white:var(--tv-base-color-common-1);--tv-color-success-bg:var(--tv-base-color-success-6);--tv-color-success-bg-light:var(--tv-base-color-success-1);--tv-color-success-bg-white:var(--tv-base-color-common-1);--tv-color-success-border:var(--tv-base-color-success-6);--tv-color-success-border-light:var(--tv-base-color-success-3);--tv-color-success-icon:var(--tv-base-color-success-6);--tv-color-error-text:var(--tv-base-color-error-6);--tv-color-error-text-primary:var(--tv-base-color-common-8);--tv-color-error-text-white:var(--tv-base-color-common-1);--tv-color-error-bg:var(--tv-base-color-error-6);--tv-color-error-bg-light:var(--tv-base-color-error-1);--tv-color-error-bg-white:var(--tv-base-color-common-1);--tv-color-error-border:var(--tv-base-color-error-6);--tv-color-error-border-light:var(--tv-base-color-error-3);--tv-color-error-icon:var(--tv-base-color-error-6);--tv-color-warn-text:var(--tv-base-color-warn-7);--tv-color-warn-text-primary:var(--tv-base-color-common-8);--tv-color-warn-text-white:var(--tv-base-color-common-1);--tv-color-warn-bg:var(--tv-base-color-warn-6);--tv-color-warn-bg-light:var(--tv-base-color-warn-1);--tv-color-warn-bg-white:var(--tv-base-color-common-1);--tv-color-warn-border:var(--tv-base-color-warn-6);--tv-color-warn-border-light:var(--tv-base-color-warn-3);--tv-color-warn-icon:var(--tv-base-color-warn-6);--tv-color-info-text:var(--tv-base-color-info-7);--tv-color-info-text-primary:var(--tv-base-color-common-8);--tv-color-info-text-white:var(--tv-base-color-common-1);--tv-color-info-bg:var(--tv-base-color-info-6);--tv-color-info-bg-light:#ebf6ff;--tv-color-info-bg-white:var(--tv-base-color-common-1);--tv-color-info-border:var(--tv-base-color-info-6);--tv-color-info-border-light:var(--tv-base-color-info-3);--tv-color-info-icon:var(--tv-base-color-info-6);--tv-color-act-primary-text:var(--tv-base-color-brand-6);--tv-color-act-primary-text-hover:var(--tv-base-color-brand-6);--tv-color-act-primary-text-active:var(--tv-base-color-brand-6);--tv-color-act-primary-text-white:var(--tv-base-color-common-1);--tv-color-act-primary-text-white-hover:var(--tv-base-color-common-1);--tv-color-act-primary-text-white-active:var(--tv-base-color-common-1);--tv-color-act-primary-bg:var(--tv-base-color-brand-6);--tv-color-act-primary-bg-hover:var(--tv-base-color-brand-5);--tv-color-act-primary-bg-active:var(--tv-base-color-brand-5);--tv-color-act-primary-bg-white:var(--tv-base-color-brand-1);--tv-color-act-primary-bg-white-hover:var(--tv-base-color-brand-6);--tv-color-act-primary-bg-white-active:var(--tv-base-color-brand-6);--tv-color-act-primary-border:var(--tv-base-color-brand-6);--tv-color-act-primary-border-hover:var(--tv-base-color-brand-5);--tv-color-act-primary-border-active:var(--tv-base-color-brand-5);--tv-color-act-primary-border-light:var(--tv-base-color-brand-6);--tv-color-act-primary-border-light-hover:var(--tv-base-color-brand-3);--tv-color-act-primary-border-light-active:var(--tv-base-color-brand-3);--tv-color-act-primary-border-light-hover-1:var(--tv-base-color-brand-3);--tv-color-act-primary-border-light-active-1:var(--tv-base-color-brand-3);--tv-color-act-primary-plain-text-hover:var(--tv-base-color-common-1);--tv-color-act-success-text:var(--tv-base-color-success-6);--tv-color-act-success-text-hover:var(--tv-base-color-success-6);--tv-color-act-success-text-active:var(--tv-base-color-success-6);--tv-color-act-success-text-white:var(--tv-base-color-common-1);--tv-color-act-success-text-white-hover:var(--tv-base-color-common-1);--tv-color-act-success-text-white-active:var(--tv-base-color-common-1);--tv-color-act-success-bg:var(--tv-base-color-success-6);--tv-color-act-success-bg-hover:var(--tv-base-color-success-5);--tv-color-act-success-bg-active:var(--tv-base-color-success-5);--tv-color-act-success-bg-light:var(--tv-base-color-success-1);--tv-color-act-success-bg-light-hover:var(--tv-base-color-success-6);--tv-color-act-success-bg-light-active:var(--tv-base-color-success-6);--tv-color-act-success-border:var(--tv-base-color-success-6);--tv-color-act-success-border-hover:var(--tv-base-color-success-5);--tv-color-act-success-border-active:var(--tv-base-color-success-5);--tv-color-act-success-border-hover-1:var(--tv-base-color-success-2);--tv-color-act-success-border-active-1:var(--tv-base-color-success-3);--tv-color-act-success-border-light:var(--tv-base-color-success-6);--tv-color-act-success-border-light-hover:var(--tv-base-color-success-1);--tv-color-act-success-border-light-active:var(--tv-base-color-success-1);--tv-color-act-success-plain-text-hover:var(--tv-base-color-common-1);--tv-color-act-warning-text:var(--tv-base-color-warn-7);--tv-color-act-warning-text-hover:var(--tv-base-color-warn-7);--tv-color-act-warning-text-active:var(--tv-base-color-warn-7);--tv-color-act-warning-text-white:var(--tv-base-color-common-1);--tv-color-act-warning-text-white-hover:var(--tv-base-color-common-1);--tv-color-act-warning-text-white-active:var(--tv-base-color-common-1);--tv-color-act-warning-bg:var(--tv-base-color-warn-6);--tv-color-act-warning-bg-hover:var(--tv-base-color-warn-5);--tv-color-act-warning-bg-active:var(--tv-base-color-warn-5);--tv-color-act-warning-bg-light:var(--tv-base-color-warn-1);--tv-color-act-warning-bg-light-hover:var(--tv-base-color-warn-6);--tv-color-act-warning-bg-light-active:var(--tv-base-color-warn-6);--tv-color-act-warning-border:var(--tv-base-color-warn-6);--tv-color-act-warning-border-hover:var(--tv-base-color-warn-5);--tv-color-act-warning-border-active:var(--tv-base-color-warn-5);--tv-color-act-warning-border-hover-1:var(--tv-base-color-warn-2);--tv-color-act-warning-border-active-1:var(--tv-base-color-warn-2);--tv-color-act-warning-border-light:var(--tv-base-color-warn-6);--tv-color-act-warning-border-light-hover:var(--tv-base-color-warn-1);--tv-color-act-warning-border-light-active:var(--tv-base-color-warn-1);--tv-color-act-warning-plain-text-hover:var(--tv-base-color-common-1);--tv-color-act-danger-text:var(--tv-base-color-error-12);--tv-color-act-danger-text-hover:var(--tv-base-color-error-12);--tv-color-act-danger-text-active:var(--tv-base-color-error-12);--tv-color-act-danger-text-white:var(--tv-base-color-common-1);--tv-color-act-danger-text-white-hover:var(--tv-base-color-common-1);--tv-color-act-danger-text-white-active:var(--tv-base-color-common-1);--tv-color-act-danger-bg:var(--tv-base-color-error-12);--tv-color-act-danger-bg-hover:var(--tv-base-color-error-13);--tv-color-act-danger-bg-active:var(--tv-base-color-error-14);--tv-color-act-danger-bg-light:var(--tv-base-color-error-1);--tv-color-act-danger-bg-light-hover:var(--tv-base-color-error-12);--tv-color-act-danger-bg-light-active:var(--tv-base-color-error-12);--tv-color-act-danger-border:var(--tv-base-color-error-12);--tv-color-act-danger-border-hover:var(--tv-base-color-error-13);--tv-color-act-danger-border-active:var(--tv-base-color-error-13);--tv-color-act-danger-border-hover-1:var(--tv-base-color-error-3);--tv-color-act-danger-border-active-1:var(--tv-base-color-error-3);--tv-color-act-danger-border-light:var(--tv-base-color-error-12);--tv-color-act-danger-border-light-hover:var(--tv-base-color-error-1);--tv-color-act-danger-border-light-active:var(--tv-base-color-error-1);--tv-color-act-danger-plain-text-hover:var(--tv-base-color-common-1);--tv-color-act-info-text:var(--tv-base-color-info-7);--tv-color-act-info-text-hover:var(--tv-base-color-info-7);--tv-color-act-info-text-active:var(--tv-base-color-info-7);--tv-color-act-info-text-white:var(--tv-base-color-common-1);--tv-color-act-info-text-white-hover:var(--tv-base-color-common-1);--tv-color-act-info-text-white-active:var(--tv-base-color-common-1);--tv-color-act-info-bg:var(--tv-base-color-info-6);--tv-color-act-info-bg-hover:var(--tv-base-color-info-6);--tv-color-act-info-bg-active:var(--tv-base-color-info-6);--tv-color-act-info-bg-light:var(--tv-base-color-info-1);--tv-color-act-info-bg-light-hover:var(--tv-base-color-info-6);--tv-color-act-info-bg-light-active:var(--tv-base-color-info-6);--tv-color-act-info-border:var(--tv-base-color-brand-6);--tv-color-act-info-border-hover:var(--tv-base-color-brand-6);--tv-color-act-info-border-active:var(--tv-base-color-brand-6);--tv-color-act-info-border-hover-1:var(--tv-base-color-info-3);--tv-color-act-info-border-active-1:var(--tv-base-color-info-3);--tv-color-act-info-border-light:var(--tv-base-color-info-6);--tv-color-act-info-border-light-hover:var(--tv-base-color-info-1);--tv-color-act-info-border-light-active:var(--tv-base-color-info-1);--tv-color-act-info-plain-text-hover:var(--tv-base-color-common-1);--tv-color-text:var(--tv-base-color-common-8);--tv-color-text-secondary:var(--tv-base-color-common-7);--tv-color-text-weaken:var(--tv-base-color-common-6);--tv-color-text-placeholder:var(--tv-base-color-common-5);--tv-color-text-disabled:var(--tv-base-color-common-5);--tv-color-text-active:var(--tv-base-color-brand-7);--tv-color-text-important:var(--tv-base-color-error-7);--tv-color-text-white:var(--tv-base-color-common-1);--tv-color-text-link:var(--tv-base-color-brand-7);--tv-color-text-link-hover:var(--tv-base-color-brand-10);--tv-color-text-darbg:var(--tv-base-color-common-5);--tv-color-plain-text-hover:var(--tv-base-color-brand-6);--tv-color-icon:var(--tv-base-color-common-7);--tv-color-icon-hover:var(--tv-base-color-brand-6);--tv-color-icon-active:var(--tv-base-color-brand-6);--tv-color-icon-disabled:var(--tv-base-color-common-5);--tv-color-icon-checked-disabled:var(--tv-base-color-common-5);--tv-color-icon-control:var(--tv-base-color-common-8);--tv-color-icon-control-active:var(--tv-base-color-brand-6);--tv-color-icon-control-disabled:var(--tv-base-color-common-5);--tv-color-icon-white:var(--tv-base-color-common-1);--tv-color-icon-link:var(--tv-base-color-brand-7);--tv-color-icon-warn-secondary:var(--tv-base-color-warn-secondary-2);--tv-color-bg:var(--tv-base-color-common-3);--tv-color-bg-primary:var(--tv-base-color-brand);--tv-color-bg-secondary:var(--tv-base-color-common-1);--tv-color-bg-control:var(--tv-base-color-common-5);--tv-color-bg-control-unactive:var(--tv-base-color-common-5);--tv-color-bg-gray-1:var(--tv-base-color-common-2);--tv-color-bg-gray-2:var(--tv-base-color-common-3);--tv-color-bg-header:var(--tv-base-color-common-4);--tv-color-bg-mask:rgba(0, 0, 0, 0.3);--tv-color-bg-dark:var(--tv-base-color-common-9);--tv-color-bg-disabled:var(--tv-base-color-common-2);--tv-color-bg-disabled-control-checked:var(--tv-base-color-common-4);--tv-color-bg-disabled-control-unactive:var(--tv-base-color-common-4);--tv-color-bg-disabled-control-active:var(--tv-base-color-brand-3);--tv-color-bg-hover:var(--tv-base-color-brand-1);--tv-color-bg-hover-primary:var(--tv-base-color-common-10);--tv-color-bg-hover-secondary:var(--tv-base-color-common-1);--tv-color-bg-hover-1:var(--tv-base-color-brand-1);--tv-color-bg-hover-2:var(--tv-base-color-common-5);--tv-color-bg-hover-3:var(--tv-base-color-brand-1);--tv-color-bg-hover-dark:var(--tv-base-color-common-10);--tv-color-bg-active:var(--tv-base-color-brand-1);--tv-color-bg-active-control:var(--tv-base-color-brand);--tv-color-bg-active-primary:var(--tv-base-color-brand);--tv-color-bg-active-secondary:var(--tv-base-color-common-1);--tv-color-bg-active-emphasize:var(--tv-base-color-brand-2);--tv-color-bg-active-emphasize-light:var(--tv-base-color-brand-1);--tv-color-bg-active-dark:var(--tv-base-color-common-3);--tv-color-border:var(--tv-base-color-common-5);--tv-color-border-hover:var(--tv-base-color-common-7);--tv-color-border-active:var(--tv-base-color-brand);--tv-color-border-active-control:var(--tv-base-color-brand-6);--tv-color-border-disabled:var(--tv-base-color-common-4);--tv-color-border-secondary:var(--tv-base-color-common-5);--tv-color-border-ghost:var(--tv-base-color-common-5);--tv-color-border-ghost-active:var(--tv-base-color-common-4);--tv-color-border-divider:var(--tv-base-color-common-4);--tv-color-border-divider-short:var(--tv-base-color-common-4);--tv-font-family:'Helvetica','Arial','PingFangSC-Regular','Hiragino Sans GB','Microsoft YaHei','微软雅黑','Microsoft JhengHei';--tv-font-family-1:'Arial','San Francisco','Helvetica';--tv-font-size-sm:12px;--tv-font-size-md:14px;--tv-font-size-lg:16px;--tv-font-size-xl:18px;--tv-font-size-xxl:20px;--tv-font-size-default:var(--tv-font-size-sm);--tv-font-size-heading-xs:16px;--tv-font-size-heading-sm:18px;--tv-font-size-heading-md:20px;--tv-font-size-heading-lg:24px;--tv-font-size-heading-xl:32px;--tv-line-height-number:1.5;--tv-font-weight-thin:200;--tv-font-weight-regular:400;--tv-font-weight-bold:600;--tv-border-radius-xs:2px;--tv-border-radius-sm:2px;--tv-border-radius-md:2px;--tv-border-radius-lg:4px;--tv-border-radius-round:999px;--tv-border-radius-brand:2px;--tv-border-width:1px;--tv-space-base:4px;--tv-space-xs:2px;--tv-space-sm:var(--tv-space-base);--tv-space-md:calc(var(--tv-space-base) * 2);--tv-space-lg:calc(var(--tv-space-base) * 3);--tv-space-xl:calc(var(--tv-space-base) * 4);--tv-space-xxl:calc(var(--tv-space-base) * 5);--tv-space-xxxl:calc(var(--tv-space-base) * 8);--tv-space-table-x:2px;--tv-space-table-y:1px;--tv-size-base:4px;--tv-size-height-xs:24px;--tv-size-height-sm:24px;--tv-size-height-md:28px;--tv-size-height-lg:32px;--tv-size-height-xl:36px;--tv-icon-size:14px;--tv-shadow-0:0 4px 16px 0 rgba(0, 0, 0, 0.08);--tv-shadow-1:0 0 0 0 rgba(0, 0, 0, 0);--tv-shadow-1-up:0 -1px 4px 0 rgba(0, 0, 0, 0.08);--tv-shadow-1-down:0 1px 4px 0 rgba(0, 0, 0, 0.08);--tv-shadow-1-left:-1px 0 4px 0 rgba(0, 0, 0, 0.08);--tv-shadow-1-right:1px 0 4px 0 rgba(0, 0, 0, 0.08);--tv-shadow-2-up:0 -2px 8px 0 rgba(0, 0, 0, 0.16);--tv-shadow-2-down:0 2px 8px 0 rgba(0, 0, 0, 0.16);--tv-shadow-2-left:-2px 0 8px 0 rgba(0, 0, 0, 0.16);--tv-shadow-2-right:2px 0 8px 0 rgba(0, 0, 0, 0.16);--tv-shadow-3-up:0 -4px 16px 0 rgba(0, 0, 0, 0.08);--tv-shadow-3-down:0 4px 16px 0 rgba(0, 0, 0, 0.08);--tv-shadow-3-left:-4px 0 16px 0 rgba(0, 0, 0, 0.08);--tv-shadow-3-right:4px 0 16px 0 rgba(0, 0, 0, 0.08);--tv-shadow-4-up:0 -8px 40px 0 rgba(0, 0, 0, 0.16);--tv-shadow-4-down:0 8px 40px 0 rgba(0, 0, 0, 0.16);--tv-shadow-4-left:-8px 0 40px 0 rgba(0, 0, 0, 0.16);--tv-shadow-4-right:8px 0 40px 0 rgba(0, 0, 0, 0.16);--tv-size-scrollbar-width:8px;--tv-size-scrollbar-height:8px;--tv-border-radius-scrollbar-thumb:4px;--tv-color-bg-scrollbar-thumb:var(--tv-base-color-common-6);--tv-color-bg-scrollbar-thumb-hover:var(--tv-base-color-common-6);--tv-color-bg-scrollbar-thumb-active:var(--tv-base-color-common-6);--tv-color-bg-scrollbar-track:var(--tv-base-color-common-1)}.tiny-button{--tv-Button-size-icon-font-size:14px;--tv-Button-size-icon-font-size-large:16px;--tv-Button-size-icon-font-size-medium:14px;--tv-Button-size-icon-font-size-small:12px;--tv-Button-size-icon-font-size-mini:12px}` } diff --git a/packages/theme/src/svgs/ellipsis.svg b/packages/theme/src/svgs/ellipsis.svg index fcddae5787..4b3aa2fbe2 100644 --- a/packages/theme/src/svgs/ellipsis.svg +++ b/packages/theme/src/svgs/ellipsis.svg @@ -1,9 +1,12 @@ - - + + Created with Pixso. - - - - + + + + + + + diff --git a/packages/vue/src/file-upload/src/mobile-first.vue b/packages/vue/src/file-upload/src/mobile-first.vue index f5239a63a2..a6cf27b9ef 100644 --- a/packages/vue/src/file-upload/src/mobile-first.vue +++ b/packages/vue/src/file-upload/src/mobile-first.vue @@ -673,7 +673,7 @@ export default defineComponent({
{getDefaultTitle({ listType, title, showTitle, displayOnly, mode })} {noticePC} - {isText ? (slots.trigger ? [createUploadComponent()] : createUploadComponent()) : null} + {isText && !displayOnly ? (slots.trigger ? [createUploadComponent()] : createUploadComponent()) : null} {noticeMF} {uploadList} {previewComponent} diff --git a/packages/vue/src/grid/package.json b/packages/vue/src/grid/package.json index 6bb8507f1f..d53a0a58ab 100644 --- a/packages/vue/src/grid/package.json +++ b/packages/vue/src/grid/package.json @@ -16,6 +16,7 @@ }, "dependencies": { "@opentiny/vue-common": "workspace:~", + "@opentiny/vue-directive": "workspace:~", "@opentiny/vue-dropdown": "workspace:~", "@opentiny/vue-dropdown-item": "workspace:~", "@opentiny/vue-dropdown-menu": "workspace:~", diff --git a/packages/vue/src/grid/src/radio/src/radio.ts b/packages/vue/src/grid/src/radio/src/radio.ts index 4e9f05efd7..e9693572e2 100644 --- a/packages/vue/src/grid/src/radio/src/radio.ts +++ b/packages/vue/src/grid/src/radio/src/radio.ts @@ -22,8 +22,9 @@ * SOFTWARE. * */ -import { h, $prefix, defineComponent } from '@opentiny/vue-common' +import { h, $prefix, defineComponent, isVue2, hooks } from '@opentiny/vue-common' import { iconRadio, iconRadioselected } from '@opentiny/vue-icon' +import { AutoTip } from '@opentiny/vue-directive' export default defineComponent({ name: $prefix + 'GridRadio', @@ -35,6 +36,7 @@ export default defineComponent({ name: String, size: String }, + directives: { AutoTip }, computed: { vSize() { return this.size || this.$parent.size || this.$parent.vSize @@ -48,6 +50,18 @@ export default defineComponent({ let $slots = this.slots const disableClass = 'disabled' + const labelContent = () => { + let content = h( + 'span', + { class: 'tiny-grid-radio__label', directives: isVue2 ? [{ name: 'AutoTip' }] : null }, + $slots.default() + ) + if (!isVue2) { + hooks.withDirectives(content, [[AutoTip]]) + } + return content + } + return h( 'label', { @@ -82,7 +96,7 @@ export default defineComponent({ h(iconRadio(), { class: ['tiny-svg-size', 'icon-radio'] }), h(iconRadioselected(), { class: ['tiny-svg-size', 'icon-radio-selected'] }) ]), - $slots.default ? h('span', { class: 'tiny-grid-radio__label' }, $slots.default()) : null + $slots.default ? labelContent() : null ] ) } diff --git a/packages/vue/src/grid/src/table/src/utils/handleGlobalMousedownEvent.ts b/packages/vue/src/grid/src/table/src/utils/handleGlobalMousedownEvent.ts index 322c7aeef5..0e7ef17463 100644 --- a/packages/vue/src/grid/src/table/src/utils/handleGlobalMousedownEvent.ts +++ b/packages/vue/src/grid/src/table/src/utils/handleGlobalMousedownEvent.ts @@ -76,11 +76,13 @@ export function handleGlobalIsClear({ $el, _vm, actived, editConfig, event, isCl } export function handleGlobalClearActived({ $el, _vm, event, isClear }) { + const tableContent = _vm.$refs.tableBody?.$refs.table + // 如果点击了当前表格之外 if ( isClear || - // 如果点击了当前表格之外 !_vm.getEventTargetNode(event, $el).flag || - (_vm.$refs.tableHeader && _vm.$refs.tableHeader.$el.contains(event.target)) + (_vm.$refs.tableHeader && _vm.$refs.tableHeader.$el.contains(event.target)) || + (tableContent && !tableContent.contains(event.target)) ) { setTimeout(() => _vm.clearActived(event)) } diff --git a/packages/vue/src/tree-menu/index.ts b/packages/vue/src/tree-menu/index.ts index 1d5ecd72ad..3fcef1ff0f 100644 --- a/packages/vue/src/tree-menu/index.ts +++ b/packages/vue/src/tree-menu/index.ts @@ -9,8 +9,7 @@ * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. * */ -import TreeMenu from './src/index' -import '@opentiny/vue-theme/tree-menu/index.less' +import TreeMenu from './src/pc.vue' import { version } from './package.json' /* istanbul ignore next */ diff --git a/packages/vue/src/tree-menu/src/pc.vue b/packages/vue/src/tree-menu/src/pc.vue index 6505003709..27acab0613 100644 --- a/packages/vue/src/tree-menu/src/pc.vue +++ b/packages/vue/src/tree-menu/src/pc.vue @@ -104,7 +104,9 @@ import { $prefix, setup, defineComponent } from '@opentiny/vue-common' import { renderless, api } from '@opentiny/vue-renderless/tree-menu/vue' import Tree from '@opentiny/vue-tree' import Input from '@opentiny/vue-input' -import { iconSearch, iconLeftWardArrow, iconEditorMenuLeft, iconEditorMenuRight } from '@opentiny/vue-icon' +import { iconLeftWardArrow, iconEditorMenuLeft, iconEditorMenuRight } from '@opentiny/vue-icon' +import { treeMenuProps } from './props' +import '@opentiny/vue-theme/tree-menu/index.less' export default defineComponent({ name: $prefix + 'TreeMenu', @@ -130,104 +132,9 @@ export default defineComponent({ IconEditorMenuLeft: iconEditorMenuLeft(), IconEditorMenuRight: iconEditorMenuRight() }, - props: { - placeholder: { - default: '', - type: String - }, - data: Array, - nodeKey: String, - defaultExpandAll: Boolean, - suffixIcon: Object, - searchIcon: { - type: Object, - default: () => iconSearch() - }, - props: Object, - draggable: { - type: Boolean, - default: false - }, - emptyText: { - type: String, - default: '' - }, - checkStrictly: Boolean, - lazy: { - type: Boolean, - default: false - }, - load: Function, - showCheckbox: Boolean, - filterNodeMethod: Function, - defaultCheckedKeys: Array, - defaultExpandedKeys: Array, - defaultExpandedKeysHighlight: [Number, String], - indent: { - type: Number, - default: 16 - }, - allowDrag: Function, - allowDrop: Function, - expandOnClickNode: { - type: Boolean, - default: true - }, - ellipsis: { - type: Boolean, - default: false - }, - wrap: { - type: Boolean, - default: false - }, - getMenuDataSync: Function, - accordion: Boolean, - showTitle: { - type: Boolean, - default: true - }, - showFilter: { - type: Boolean, - default: true - }, - showExpand: { - type: Boolean, - default: false - }, - collapsible: { - type: Boolean, - default: true - }, - showNumber: { - type: Boolean, - default: false - }, - nodeHeight: Number, - onlyCheckChildren: { - type: Boolean, - default: false - }, - menuCollapsible: { - type: Boolean, - default: false - }, - clearable: { - type: Boolean, - default: false - }, - highlightQuery: { - type: Boolean, - default: false - }, - // metaErp 新增属性 - widthAdapt: { - type: Boolean, - default: false - } - }, + props: treeMenuProps, setup(props, context) { - return setup({ props, context, renderless, api }) + return setup({ props, context, renderless, api, mono: true }) } }) diff --git a/packages/vue/src/tree-menu/src/index.ts b/packages/vue/src/tree-menu/src/props.ts similarity index 84% rename from packages/vue/src/tree-menu/src/index.ts rename to packages/vue/src/tree-menu/src/props.ts index 0e3a19a7d4..47f5dab258 100644 --- a/packages/vue/src/tree-menu/src/index.ts +++ b/packages/vue/src/tree-menu/src/props.ts @@ -1,6 +1,5 @@ -import { $props, $prefix, $setup, defineComponent } from '@opentiny/vue-common' -import template from 'virtual-template?pc' import { iconSearch } from '@opentiny/vue-icon' +import { $props } from '@opentiny/vue-common' export const treeMenuProps = { ...$props, @@ -95,11 +94,3 @@ export const treeMenuProps = { default: false } } - -export default defineComponent({ - name: $prefix + 'TreeMenu', - props: treeMenuProps, - setup(props, context) { - return $setup({ props, context, template }) - } -})