diff --git a/plugin/jetlinks.ts b/plugin/jetlinks.ts index 47286c81..eac09e18 100644 --- a/plugin/jetlinks.ts +++ b/plugin/jetlinks.ts @@ -293,8 +293,8 @@ function getSideEffects(compName: string, options: JetlinksVueResolverOptions, _ } } -const filterName = ['message', 'Notification', 'AIcon'] -const primitiveNames = ['Affix', 'Anchor', 'AnchorLink', 'message', 'Notification', 'AutoComplete', 'AutoCompleteOptGroup', 'AutoCompleteOption', 'Alert', 'Avatar', 'AvatarGroup', 'BackTop', 'Badge', 'BadgeRibbon', 'Breadcrumb', 'BreadcrumbItem', 'BreadcrumbSeparator', 'Button', 'ButtonGroup', 'Calendar', 'Card', 'CardGrid', 'CardMeta', 'Collapse', 'CollapsePanel', 'Carousel', 'Cascader', 'Checkbox', 'CheckboxGroup', 'Col', 'Comment', 'ConfigProvider', 'DatePicker', 'MonthPicker', 'WeekPicker', 'RangePicker', 'QuarterPicker', 'Descriptions', 'DescriptionsItem', 'Divider', 'Dropdown', 'DropdownButton', 'Drawer', 'Empty', 'Form', 'FormItem', 'FormItemRest', 'Grid', 'Input', 'InputGroup', 'InputPassword', 'InputSearch', 'Textarea', 'Image', 'ImagePreviewGroup', 'InputNumber', 'Layout', 'LayoutHeader', 'LayoutSider', 'LayoutFooter', 'LayoutContent', 'List', 'ListItem', 'ListItemMeta', 'Menu', 'MenuDivider', 'MenuItem', 'MenuItemGroup', 'SubMenu', 'Mentions', 'MentionsOption', 'Modal', 'Statistic', 'StatisticCountdown', 'PageHeader', 'Pagination', 'Popconfirm', 'Popover', 'Progress', 'Radio', 'RadioButton', 'RadioGroup', 'Rate', 'Result', 'Row', 'Select', 'SelectOptGroup', 'SelectOption', 'Skeleton', 'SkeletonButton', 'SkeletonAvatar', 'SkeletonInput', 'SkeletonImage', 'Slider', 'Space', 'Spin', 'Steps', 'Step', 'Switch', 'Table', 'TableColumn', 'TableColumnGroup', 'TableSummary', 'TableSummaryRow', 'TableSummaryCell', 'Transfer', 'Tree', 'TreeNode', 'DirectoryTree', 'TreeSelect', 'TreeSelectNode', 'Tabs', 'TabPane', 'Tag', 'CheckableTag', 'TimePicker', 'TimeRangePicker', 'Timeline', 'TimelineItem', 'Tooltip', 'Typography', 'TypographyLink', 'TypographyParagraph', 'TypographyText', 'TypographyTitle', 'Upload', 'UploadDragger', 'LocaleProvider', 'ProTable', 'Search', 'AdvancedSearch', 'Ellipsis', 'MonacoEditor', 'ProLayout', 'ScrollTable', 'TableCard', 'Scrollbar', 'CardSelect', 'ColorPicker'] +const filterName = ['message', 'Notification'] +const primitiveNames = ['AIcon','Affix', 'Anchor', 'AnchorLink', 'message', 'Notification', 'AutoComplete', 'AutoCompleteOptGroup', 'AutoCompleteOption', 'Alert', 'Avatar', 'AvatarGroup', 'BackTop', 'Badge', 'BadgeRibbon', 'Breadcrumb', 'BreadcrumbItem', 'BreadcrumbSeparator', 'Button', 'ButtonGroup', 'Calendar', 'Card', 'CardGrid', 'CardMeta', 'Collapse', 'CollapsePanel', 'Carousel', 'Cascader', 'Checkbox', 'CheckboxGroup', 'Col', 'Comment', 'ConfigProvider', 'DatePicker', 'MonthPicker', 'WeekPicker', 'RangePicker', 'QuarterPicker', 'Descriptions', 'DescriptionsItem', 'Divider', 'Dropdown', 'DropdownButton', 'Drawer', 'Empty', 'Form', 'FormItem', 'FormItemRest', 'Grid', 'Input', 'InputGroup', 'InputPassword', 'InputSearch', 'Textarea', 'Image', 'ImagePreviewGroup', 'InputNumber', 'Layout', 'LayoutHeader', 'LayoutSider', 'LayoutFooter', 'LayoutContent', 'List', 'ListItem', 'ListItemMeta', 'Menu', 'MenuDivider', 'MenuItem', 'MenuItemGroup', 'SubMenu', 'Mentions', 'MentionsOption', 'Modal', 'Statistic', 'StatisticCountdown', 'PageHeader', 'Pagination', 'Popconfirm', 'Popover', 'Progress', 'Radio', 'RadioButton', 'RadioGroup', 'Rate', 'Result', 'Row', 'Select', 'SelectOptGroup', 'SelectOption', 'Skeleton', 'SkeletonButton', 'SkeletonAvatar', 'SkeletonInput', 'SkeletonImage', 'Slider', 'Space', 'Spin', 'Steps', 'Step', 'Switch', 'Table', 'TableColumn', 'TableColumnGroup', 'TableSummary', 'TableSummaryRow', 'TableSummaryCell', 'Transfer', 'Tree', 'TreeNode', 'DirectoryTree', 'TreeSelect', 'TreeSelectNode', 'Tabs', 'TabPane', 'Tag', 'CheckableTag', 'TimePicker', 'TimeRangePicker', 'Timeline', 'TimelineItem', 'Tooltip', 'Typography', 'TypographyLink', 'TypographyParagraph', 'TypographyText', 'TypographyTitle', 'Upload', 'UploadDragger', 'LocaleProvider', 'ProTable', 'Search', 'AdvancedSearch', 'Ellipsis', 'MonacoEditor', 'ProLayout', 'ScrollTable', 'TableCard', 'Scrollbar', 'CardSelect', 'ColorPicker'] const prefix = 'J' let jetlinksNames: Set diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx deleted file mode 100644 index 390fe993..00000000 --- a/src/components/AIcon/index.tsx +++ /dev/null @@ -1,88 +0,0 @@ -import { createFromIconfontCN } from '@ant-design/icons-vue'; -import * as $Icon from '@ant-design/icons-vue'; -import { createVNode } from 'vue'; - -const AliIcon = createFromIconfontCN({ - scriptUrl: '/icons/iconfont.js', // 在 iconfont.cn 上生成 -}); - -const AntdIcon = (props: {type: string}) => { - const {type} = props; - let antIcon: {[key: string]: any} = $Icon - return createVNode(antIcon[type]) -} - -const iconKeys = [ - 'EyeOutlined', - 'EditOutlined', - 'PlusOutlined', - 'DeleteOutlined', - 'CheckCircleOutlined', - 'StopOutlined', - 'CheckOutlined', - 'CloseOutlined', - 'DownOutlined', - 'ImportOutlined', - 'ExportOutlined', - 'SyncOutlined', - 'ExclamationCircleOutlined', - 'UploadOutlined', - 'LoadingOutlined', - 'PlusCircleOutlined', - 'QuestionCircleOutlined', - 'DisconnectOutlined', - 'LinkOutlined', - 'PoweroffOutlined', - 'SwapOutlined', - 'BugOutlined', - 'BarsOutlined', - 'ArrowDownOutlined', - 'SmallDashOutlined', - 'TeamOutlined', - 'MenuUnfoldOutlined', - 'MenuFoldOutlined', - 'QuestionCircleOutlined', - 'InfoCircleOutlined', - 'SearchOutlined', - 'EllipsisOutlined', - 'ClockCircleOutlined', - 'PartitionOutlined', - 'ShareAltOutlined', - 'PlayCircleOutlined', - 'RightOutlined', - 'FileTextOutlined', - 'UploadOutlined', - 'LikeOutlined', - 'ArrowLeftOutlined', - 'DownloadOutlined', - 'PauseOutlined', - 'ControlOutlined', - 'RedoOutlined', - 'ExpandOutlined', - 'VideoCameraOutlined', - 'HistoryOutlined', - 'ToolOutlined', - 'FileOutlined', - 'LikeOutlined', - 'CaretUpOutlined', - 'CaretRightOutlined', - 'CaretLeftOutlined', - 'CaretDownOutlined', - 'MinusOutlined', - 'AudioOutlined', - 'BellOutlined', - 'UserOutlined', - 'LogoutOutlined', - 'ReadIconOutlined', - 'CloudDownloadOutlined', - 'PauseCircleOutlined',, - 'FormOutlined', - 'EyeInvisibleOutlined', -] - -const Icon = (props: {type: string}) => { - if(iconKeys.includes(props.type)) return - return -} - -export default Icon \ No newline at end of file diff --git a/src/components/BadgeStatus/index.vue b/src/components/BadgeStatus/index.vue index d1a9528c..a5861e26 100644 --- a/src/components/BadgeStatus/index.vue +++ b/src/components/BadgeStatus/index.vue @@ -13,7 +13,7 @@ const props = defineProps({ type: String, }, status: { - type: String || Number, + type: [String, Number], default: 'default', // validator: (value) => { // // 这个值必须匹配下列字符串中的一个 diff --git a/src/components/CardBox/index.vue b/src/components/CardBox/index.vue index bdcffb5d..5f612285 100644 --- a/src/components/CardBox/index.vue +++ b/src/components/CardBox/index.vue @@ -121,11 +121,11 @@ const props = defineProps({ default: '正常', }, status: { - type: [String, Number], + type: [String, Number] as PropType, default: 'default', }, statusNames: { - type: Object, + type: Object as PropType>, default:()=>({'default':'default'}) }, actions: { @@ -142,7 +142,7 @@ const props = defineProps({ }, }); -const getBackgroundColor = (code: string) => { +const getBackgroundColor = (code: string | number) => { const _color = color[code] || color.default; return `linear-gradient( 188.4deg, diff --git a/src/components/index.ts b/src/components/index.ts index 76a1159b..9af226d5 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1,5 +1,4 @@ import type { App } from 'vue' -// import AIcon from './AIcon' import PermissionButton from './PermissionButton/index.vue' import JTable from './Table/index' import TitleComponent from "./TitleComponent/index.vue"; diff --git a/yarn.lock b/yarn.lock index 71f83f16..35ef0063 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3700,8 +3700,8 @@ jetlinks-store@^0.0.3: jetlinks-ui-components@^1.0.5: version "1.0.5" - resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#5e233e915f41ec48c63c5633ef5768253cbe8ee0" - integrity sha512-7GzacUi+9c28SBWs9UyKL8IoVaT2nTdVQbmsmfdyhjaf6QpQpdLZpT1F5UQsmPtC4C3Hg88pb9R5wQkTJ+pcCw== + resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#593185f6313895485b59e9a79bc920c63374d84d" + integrity sha512-dkSOmatSPLHlV91YdTcHWO2wfwriUIZKEuLd5bJF2GsO9SvDMyJ2YJ4n/3fkklOoL5albhY37iX2Ot3A+7QYwA== dependencies: "@vueuse/core" "^9.12.0" ant-design-vue "^3.2.15"