Compare commits

...

16 Commits

Author SHA1 Message Date
46b98316ee fix: add minify mode 2023-05-06 10:42:08 +08:00
7320eaf54d chore: dealing with conflict 2023-05-05 15:52:01 +08:00
ae025850b0 feat: add bunder 2023-05-03 20:09:26 +08:00
febc297d5e feat: add build 2023-05-03 19:43:56 +08:00
5338a2fe92 Merge branch 'main' of github.com:antd-tiny-vue/antd-tiny-vue into main 2023-04-27 11:30:47 +08:00
b486c0ae40 chore: migrate vue3.3 2023-04-27 11:30:19 +08:00
01eb9af46c chore: change 2023-04-20 20:48:57 +08:00
7f296bc378 Merge branch 'main' of github.com:antd-tiny-vue/antd-tiny-vue into main 2023-04-19 10:46:46 +08:00
6096c28669 feat: add loading icon 2023-04-19 08:30:24 +08:00
786877b629 chore: change 2023-04-19 08:16:23 +08:00
4e0a756239 chore: resolve conflict 2023-04-18 15:50:37 +08:00
79210d99c9 chore: change 2023-04-18 15:49:28 +08:00
7bc8ec1094 chore: change docs build 2023-04-17 21:07:30 +08:00
08f17ce876 chore: change postion 2023-04-17 21:03:25 +08:00
fe029c5a0e chore: change docs 2023-04-17 21:03:02 +08:00
0d1e4d3e7c fix: space error 2023-04-17 11:30:22 +08:00
16 changed files with 2198 additions and 741 deletions

View File

@ -1,3 +1,5 @@
cache cache
.temp .temp
*.log *.log
es
lib

2
.gitignore vendored
View File

@ -5,3 +5,5 @@ node_modules
dist dist
cache cache
.temp .temp
es
lib

View File

@ -0,0 +1,17 @@
<script lang="ts" setup>
import { onMounted, shallowRef } from 'vue'
const comp = shallowRef()
onMounted(async () => {
const { AntdTheme } = await import('vite-plugin-vitepress-demo/theme')
comp.value = AntdTheme
})
</script>
<template>
<ClientOnly>
<component v-bind="$attrs" :is="comp"></component>
</ClientOnly>
</template>
<style scoped></style>

View File

@ -10,20 +10,19 @@ const baseSrc = fileURLToPath(new URL('./', import.meta.url))
export default defineConfig({ export default defineConfig({
rewrites: getRewrites(), rewrites: getRewrites(),
mpa: true,
lang: 'en-US', lang: 'en-US',
ignoreDeadLinks: true, ignoreDeadLinks: true,
locales: { locales: {
'zh-CN': { 'zh-CN': {
lang: 'zh-CN', lang: 'zh-CN',
title: 'vue3组件库站点', title: 'Antd Tiny Vue',
label: '简体中文', label: '简体中文',
description: 'vue3组件库站点', description: 'vue3组件库站点',
themeConfig: getZhCNConfig() themeConfig: getZhCNConfig()
}, },
root: { root: {
lang: 'en-US', lang: 'en-US',
title: 'vue3 component library site', title: 'Antd Tiny Vue',
label: 'English', label: 'English',
description: 'vue3 component library site', description: 'vue3 component library site',
themeConfig: getEnUSConfig() themeConfig: getEnUSConfig()

View File

@ -1,15 +1,18 @@
import type { Theme } from 'vitepress' import type { Theme } from 'vitepress'
// eslint-disable-next-line import/no-named-as-default // eslint-disable-next-line import/no-named-as-default
import DefaultTheme from 'vitepress/theme' import DefaultTheme from 'vitepress/theme'
import { AntdTheme } from 'vite-plugin-vitepress-demo/theme' import AntdTheme from '../components/demo.vue'
// @ts-expect-error this is a local module // import { AntdTheme } from 'vite-plugin-vitepress-demo/theme'
import Antd from 'antd-tiny-vue'
export default { export default {
...DefaultTheme, ...DefaultTheme,
enhanceApp(ctx) { async enhanceApp(ctx) {
DefaultTheme.enhanceApp?.(ctx) DefaultTheme.enhanceApp?.(ctx)
ctx.app.component('Demo', AntdTheme) ctx.app.component('Demo', AntdTheme)
ctx.app.use(Antd) // @ts-expect-error this is a local module
if (!import.meta.env.SSR) {
// @ts-expect-error this is a local module
const Antd = (await import('antd-tiny-vue')).default
ctx.app.use(Antd)
}
} }
} as Theme } as Theme

View File

@ -21,6 +21,7 @@ import {
isUnBorderedButtonType, isUnBorderedButtonType,
spaceChildren spaceChildren
} from './button-helper' } from './button-helper'
import LoadingIcon from './loading-icon'
type Loading = number | boolean type Loading = number | boolean
function getLoadingConfig(loading: ButtonProps['loading']): LoadingConfigType { function getLoadingConfig(loading: ButtonProps['loading']): LoadingConfigType {
@ -147,11 +148,11 @@ const Button = defineComponent({
return () => { return () => {
const { shape, rootClassName, ghost, type, block, danger } = props const { shape, rootClassName, ghost, type, block, danger } = props
const icon = getSlotsProps(slots, props, 'icon') const icon = getSlotsProps(slots, props, 'icon')
const children = filterEmpty(slots.default?.()) const children = filterEmpty(slots.default?.() as any)
isNeedInserted = isNeedInserted =
children.length === 1 && children.length === 1 &&
!slots.icon && !slots.icon &&
isUnBorderedButtonType(props.type) !isUnBorderedButtonType(props.type)
fixTwoCNChar() fixTwoCNChar()
showError() showError()
const iconType = innerLoading.value ? 'loading' : icon const iconType = innerLoading.value ? 'loading' : icon
@ -183,7 +184,17 @@ const Button = defineComponent({
compactItemClassnames.value, compactItemClassnames.value,
rootClassName rootClassName
) )
const iconNode = icon && (!innerLoading.value ? icon?.() : <>L</>) const iconNode =
icon &&
(!innerLoading.value ? (
icon?.()
) : (
<LoadingIcon
existIcon={!!icon}
prefixCls={prefixCls.value}
loading={!!innerLoading.value}
/>
))
const kids = const kids =
children || children === 0 children || children === 0

View File

@ -0,0 +1,67 @@
import { Transition, defineComponent, nextTick } from 'vue'
import { booleanType, someType, stringType } from '@v-c/utils'
import LoadingOutlined from '@ant-design/icons-vue/LoadingOutlined'
export interface LoadingIconProps {
prefixCls: string
existIcon: boolean
loading?: boolean | object
}
export const loadingIconProps = {
prefixCls: stringType(),
existIcon: booleanType(),
loading: someType<boolean | object>([Boolean, Object])
}
const getCollapsedWidth = (el: Element) => {
const node: HTMLElement = el as HTMLElement
if (node) {
node.style.width = '0'
node.style.opacity = '0'
node.style.transform = 'scale(0)'
}
}
const getRealWidth = (el: Element) => {
const node: HTMLElement = el as HTMLElement
nextTick(() => {
if (node) {
node.style.width = `${node.scrollWidth}px`
node.style.opacity = '1'
node.style.transform = 'scale(1)'
}
}).then()
}
const LoadingIcon = defineComponent({
name: 'LoadingIcon',
props: loadingIconProps,
setup(props) {
return () => {
const { loading, existIcon, prefixCls } = props
const visible = !!loading
if (existIcon) {
return (
<span class={`${prefixCls}-loading-icon`}>
<LoadingOutlined />
</span>
)
}
return (
<Transition
name={`${prefixCls}-loading-icon-motion`}
onBeforeEnter={getCollapsedWidth}
onEnter={getRealWidth}
>
{visible ? (
<span class={`${prefixCls}-loading-icon`}>
<LoadingOutlined />
</span>
) : null}
</Transition>
)
}
}
})
export default LoadingIcon

View File

@ -20,7 +20,6 @@ const genSharedButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (
token token
): CSSObject => { ): CSSObject => {
const { componentCls, iconCls } = token const { componentCls, iconCls } = token
return { return {
[componentCls]: { [componentCls]: {
outline: 'none', outline: 'none',

View File

@ -84,7 +84,7 @@ const Space = defineComponent({
return () => { return () => {
const { align, direction, rootClassName, split, wrap } = props const { align, direction, rootClassName, split, wrap } = props
const childNodes = filterEmpty(slots.default?.()) const childNodes = filterEmpty(slots.default?.() as any)
const mergedAlign = const mergedAlign =
align === undefined && direction === 'horizontal' ? 'center' : align align === undefined && direction === 'horizontal' ? 'center' : align
const cn = classNames( const cn = classNames(

View File

@ -1,7 +1,9 @@
import type { AliasToken, GenerateStyle } from '../../theme/internal' import type { AliasToken, GenerateStyle } from '../../theme/internal'
import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook' import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook'
const genCollapseMotion: GenerateStyle<TokenWithCommonCls<AliasToken>> = token => ({ const genCollapseMotion: GenerateStyle<TokenWithCommonCls<AliasToken>> = (
token
) => ({
[token.componentCls]: { [token.componentCls]: {
// For common/openAnimation // For common/openAnimation
[`${token.antCls}-motion-collapse-legacy`]: { [`${token.antCls}-motion-collapse-legacy`]: {

View File

@ -1,7 +1,12 @@
import { generate } from '@ant-design/colors' import { generate } from '@ant-design/colors'
import genControlHeight from '../shared/genControlHeight' import genControlHeight from '../shared/genControlHeight'
import genSizeMapToken from '../shared/genSizeMapToken' import genSizeMapToken from '../shared/genSizeMapToken'
import type { ColorPalettes, MapToken, PresetColorType, SeedToken } from '../../interface' import type {
ColorPalettes,
MapToken,
PresetColorType,
SeedToken
} from '../../interface'
import { defaultPresetColors } from '../seed' import { defaultPresetColors } from '../seed'
import genColorMapToken from '../shared/genColorMapToken' import genColorMapToken from '../shared/genColorMapToken'
import genCommonMapToken from '../shared/genCommonMapToken' import genCommonMapToken from '../shared/genCommonMapToken'
@ -10,7 +15,8 @@ import { generateColorPalettes, generateNeutralColorPalettes } from './colors'
export default function derivative(token: SeedToken): MapToken { export default function derivative(token: SeedToken): MapToken {
const colorPalettes = Object.keys(defaultPresetColors) const colorPalettes = Object.keys(defaultPresetColors)
.map((colorKey: keyof PresetColorType) => { .map((value) => {
const colorKey = value as keyof PresetColorType
const colors = generate(token[colorKey]) const colors = generate(token[colorKey])
return new Array(10).fill(1).reduce((prev, _, i) => { return new Array(10).fill(1).reduce((prev, _, i) => {

View File

@ -1,6 +1,7 @@
{ {
"name": "antd-tiny-vue", "name": "antd-tiny-vue",
"version": "1.0.0", "version": "1.0.0",
"packageManager": "pnpm@8.2.0",
"description": "this is a tiny antd components for vue3", "description": "this is a tiny antd components for vue3",
"keywords": [ "keywords": [
"antd", "antd",
@ -12,40 +13,53 @@
], ],
"license": "MIT", "license": "MIT",
"author": "aibayanyu", "author": "aibayanyu",
"main": "dist/index.js", "main": "lib/index.js",
"module": "es/index.js",
"types": "lib/index.d.ts",
"files": [
"lib",
"es",
"dist",
"README.md"
],
"scripts": { "scripts": {
"test": "vitest", "test": "vitest",
"prepare": "husky install", "prepare": "husky install",
"dev": "vitepress dev", "dev": "vitepress dev",
"build:site": "vitepress build", "build:site": "vitepress build",
"build:lib": "vite build --config vite.build.config.ts",
"build:umd": "vite build --config vite.bundle.config.ts",
"copy:css": "cpx \"components/style/*.css\" dist",
"preview": "vitepress preview" "preview": "vitepress preview"
}, },
"packageManager": "pnpm@8.2.0",
"dependencies": { "dependencies": {
"@ant-design/colors": "^7.0.0", "@ant-design/colors": "^7.0.0",
"@antd-tiny-vue/cssinjs": "^0.0.4", "@ant-design/icons-vue": "^6.1.0",
"@antd-tiny-vue/cssinjs": "0.0.8",
"@ctrl/tinycolor": "^3.6.0", "@ctrl/tinycolor": "^3.6.0",
"@v-c/utils": "^0.0.19", "@v-c/utils": "^0.0.22",
"@vueuse/core": "^9.13.0", "@vueuse/core": "^9.13.0",
"vue": "^3.2.47" "vue": "^3.3.0-beta.2"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^17.5.0", "@commitlint/cli": "^17.5.0",
"@commitlint/config-conventional": "^17.4.4", "@commitlint/config-conventional": "^17.4.4",
"@mistjs/eslint-config-vue-jsx": "^0.0.7", "@mistjs/eslint-config-vue-jsx": "^0.0.7",
"@mistjs/tsconfig": "^1.0.0", "@mistjs/tsconfig": "^1.1.1",
"@mistjs/tsconfig-vue": "^0.0.3", "@mistjs/tsconfig-vue": "^1.1.2",
"@types/node": "^18.15.10", "@types/node": "^18.15.10",
"@vitejs/plugin-vue-jsx": "^3.0.1", "@vitejs/plugin-vue-jsx": "^3.0.1",
"cpx": "^1.5.0",
"eslint": "^8.36.0", "eslint": "^8.36.0",
"husky": "^8.0.3", "husky": "^8.0.3",
"lint-staged": "^13.2.0", "lint-staged": "^13.2.0",
"prettier": "^2.8.7", "prettier": "^2.8.7",
"typescript": "^4.9.5", "typescript": "^5.0.4",
"unbuild": "^1.1.2", "unbuild": "^1.1.2",
"vite": "^4.2.1", "vite": "^4.3.3",
"vite-plugin-vitepress-demo": "2.0.0-beta.28", "vite-plugin-dts": "^2.3.0",
"vitepress": "1.0.0-alpha.69", "vite-plugin-vitepress-demo": "2.0.0-beta.29",
"vitepress": "1.0.0-alpha.74",
"vitest": "^0.28.5" "vitest": "^0.28.5"
}, },
"pnpm": { "pnpm": {
@ -53,6 +67,9 @@
"ignoreMissing": [ "ignoreMissing": [
"@algolia/client-search" "@algolia/client-search"
] ]
},
"overrides": {
"vue": "3.3.0-beta.2"
} }
}, },
"lint-staged": { "lint-staged": {

2693
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,6 @@
{ {
"extends": "@mistjs/tsconfig-vue" "extends": "@mistjs/tsconfig-vue",
"compilerOptions": {
"moduleResolution": "bundler"
}
} }

47
vite.build.config.ts Normal file
View File

@ -0,0 +1,47 @@
import { defineConfig } from 'vite'
import vueJsx from '@vitejs/plugin-vue-jsx'
import dts from 'vite-plugin-dts'
export default defineConfig({
plugins: [
vueJsx(),
dts({
outputDir: ['es', 'lib'],
include: ['components/**/*.ts', 'components/**/*.tsx']
})
],
build: {
minify: false,
rollupOptions: {
external: [
'@ant-design/colors',
/^@ant-design\/icons-vue/,
'@antd-tiny-vue/cssinjs',
'@ctrl/tinycolor',
'@v-c/utils',
'@vueuse/core',
'vue'
],
output: [
{
format: 'es',
dir: 'es',
entryFileNames: '[name].js',
preserveModules: true,
preserveModulesRoot: 'components'
},
{
format: 'cjs',
dir: 'lib',
entryFileNames: '[name].js',
preserveModules: true,
preserveModulesRoot: 'components',
exports: 'named'
}
]
},
lib: {
entry: 'components/index.ts',
formats: ['es', 'cjs']
}
}
})

13
vite.bundle.config.ts Normal file
View File

@ -0,0 +1,13 @@
import { defineConfig } from 'vite'
import vueJsx from '@vitejs/plugin-vue-jsx'
export default defineConfig({
plugins: [vueJsx()],
build: {
lib: {
entry: 'components/index.ts',
name: 'Antd',
fileName: () => `antd.js`,
formats: ['umd']
}
}
})