From 9a883cf7a9812bbe4b9048757a80d6556ab3e3ed Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Tue, 7 Mar 2023 19:19:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9C=BA=E6=99=AF=E8=81=94=E5=8A=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9ETerms=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/jetlinks.ts | 137 ++++++------ src/api/rule-engine/scene.ts | 4 +- src/components/index.ts | 2 +- src/store/menu.ts | 2 +- src/utils/menu.ts | 8 +- src/views/notice/Config/Detail/index.vue | 1 + .../Scene/Save/Device/AddModal.vue | 48 +++-- .../Scene/Save/Device/DeviceList.vue | 12 +- .../Scene/Save/Device/DeviceSelect.vue | 25 +-- .../rule-engine/Scene/Save/Device/OrgList.vue | 25 ++- .../rule-engine/Scene/Save/Device/Product.vue | 19 +- .../rule-engine/Scene/Save/Device/index.vue | 2 + .../Scene/Save/components/DropdownButton.vue | 153 +++++++++++++ .../Scene/Save/components/ParamsDropdown.vue | 13 ++ .../Scene/Save/components/Terms/Branchs.vue | 135 ++++++++++++ .../Save/components/Terms/ParamsItem.vue | 142 ++++++++++++ .../Scene/Save/components/Terms/Terms.vue | 121 +++++++++++ .../Scene/Save/components/Terms/TermsItem.vue | 126 +++++++++++ .../Scene/Save/components/Terms/index.less | 204 ++++++++++++++++++ .../Scene/Save/components/Terms/index.ts | 4 + .../Scene/Save/components/Terms/util.ts | 2 + src/views/rule-engine/Scene/typings.ts | 7 +- vite.config.ts | 1 + 23 files changed, 1068 insertions(+), 125 deletions(-) create mode 100644 src/views/rule-engine/Scene/Save/components/DropdownButton.vue create mode 100644 src/views/rule-engine/Scene/Save/components/ParamsDropdown.vue create mode 100644 src/views/rule-engine/Scene/Save/components/Terms/Branchs.vue create mode 100644 src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue create mode 100644 src/views/rule-engine/Scene/Save/components/Terms/Terms.vue create mode 100644 src/views/rule-engine/Scene/Save/components/Terms/TermsItem.vue create mode 100644 src/views/rule-engine/Scene/Save/components/Terms/index.less create mode 100644 src/views/rule-engine/Scene/Save/components/Terms/index.ts create mode 100644 src/views/rule-engine/Scene/Save/components/Terms/util.ts diff --git a/plugin/jetlinks.ts b/plugin/jetlinks.ts index e56bc476..6edf3d95 100644 --- a/plugin/jetlinks.ts +++ b/plugin/jetlinks.ts @@ -8,213 +8,214 @@ export interface IMatcher { const matchComponents: IMatcher[] = [ { pattern: /^Avatar/, - styleDir: 'Avatar', + styleDir: 'Avatar' }, { pattern: /^AutoComplete/, - styleDir: 'AutoComplete', + styleDir: 'AutoComplete' }, { pattern: /^Anchor/, - styleDir: 'Anchor', + styleDir: 'Anchor' }, { pattern: /^Badge/, - styleDir: 'Badge', + styleDir: 'Badge' }, { pattern: /^Breadcrumb/, - styleDir: 'Breadcrumb', + styleDir: 'Breadcrumb' }, { pattern: /^Button/, - styleDir: 'Button', + styleDir: 'Button' }, { pattern: /^Checkbox/, - styleDir: 'Checkbox', + styleDir: 'Checkbox' + }, + { + pattern: /^CardSelect/, + styleDir: 'CardSelect' }, { pattern: /^Card/, - styleDir: 'Card', + styleDir: 'Card' }, { pattern: /^Collapse/, - styleDir: 'Collapse', + styleDir: 'Collapse' }, { pattern: /^Descriptions/, - styleDir: 'Descriptions', + styleDir: 'Descriptions' }, { pattern: /^RangePicker|^WeekPicker|^MonthPicker/, - styleDir: 'DatePicker', + styleDir: 'DatePicker' }, { pattern: /^Dropdown/, - styleDir: 'Dropdown', + styleDir: 'Dropdown' }, { pattern: /^Form/, - styleDir: 'Form', + styleDir: 'Form' }, { pattern: /^InputNumber/, - styleDir: 'InputNumber', + styleDir: 'InputNumber' }, { pattern: /^Input|^Textarea/, - styleDir: 'Input', + styleDir: 'Input' }, { pattern: /^Statistic/, - styleDir: 'Statistic', + styleDir: 'Statistic' }, { pattern: /^CheckableTag/, - styleDir: 'Tag', + styleDir: 'Tag' }, { pattern: /^TimeRangePicker/, - styleDir: 'TimePicker', + styleDir: 'TimePicker' }, { pattern: /^Layout/, - styleDir: 'Layout', + styleDir: 'Layout' }, { pattern: /^Menu|^SubMenu/, - styleDir: 'Menu', + styleDir: 'Menu' }, { pattern: /^Table/, - styleDir: 'Table', + styleDir: 'Table' }, { pattern: /^TimePicker|^TimeRangePicker/, - styleDir: 'TimeTicker', + styleDir: 'TimeTicker' }, { pattern: /^Radio/, - styleDir: 'Radio', + styleDir: 'Radio' }, { pattern: /^Image/, - styleDir: 'Image', + styleDir: 'Image' }, { pattern: /^List/, - styleDir: 'List', + styleDir: 'List' }, { pattern: /^Tab/, - styleDir: 'Tabs', + styleDir: 'Tabs' }, { pattern: /^Mentions/, - styleDir: 'Mentions', + styleDir: 'Mentions' }, { pattern: /^Step/, - styleDir: 'Steps', + styleDir: 'Steps' }, { pattern: /^Skeleton/, - styleDir: 'Skeleton', + styleDir: 'Skeleton' }, { pattern: /^Select/, - styleDir: 'Select', + styleDir: 'Select' }, { pattern: /^TreeSelect/, - styleDir: 'TreeSelect', + styleDir: 'TreeSelect' }, { pattern: /^Tree|^DirectoryTree/, - styleDir: 'Tree', + styleDir: 'Tree' }, { pattern: /^Typography/, - styleDir: 'Typography', + styleDir: 'Typography' }, { pattern: /^Timeline/, - styleDir: 'Timeline', + styleDir: 'Timeline' }, { pattern: /^Upload/, - styleDir: 'Upload', + styleDir: 'Upload' }, { pattern: /^ProTable/, - styleDir: 'ProTable', + styleDir: 'ProTable' }, { pattern: /^Search|^AdvancedSearch/, - styleDir: 'Search', + styleDir: 'Search' }, { pattern: /^Ellipsis/, - styleDir: 'Ellipsis', + styleDir: 'Ellipsis' }, { pattern: /^MonacoEditor/, - styleDir: 'MonacoEditor', + styleDir: 'MonacoEditor' }, { pattern: /^ProLayout/, - styleDir: 'ProLayout', + styleDir: 'ProLayout' }, { pattern: /^ScrollTable/, - styleDir: 'ScrollTable', + styleDir: 'ScrollTable' }, { pattern: /^TableCard/, - styleDir: 'TableCard', + styleDir: 'TableCard' }, { pattern: /^Scrollbar/, - styleDir: 'Scrollbar', + styleDir: 'Scrollbar' }, { pattern: /^AIcon/, - styleDir: 'AIcon', - }, - { - pattern: /^CardSelect/, - styleDir: 'CardSelect', + styleDir: 'AIcon' }, + { pattern: /^Tooltip/, - styleDir: 'Tooltip', + styleDir: 'Tooltip' }, { pattern: /^Empty/, - styleDir: 'Empty', + styleDir: 'Empty' }, { pattern: /^Popconfirm/, - styleDir: 'Popconfirm', + styleDir: 'Popconfirm' }, { pattern: /^message/, - styleDir: 'Message', + styleDir: 'Message' }, { pattern: /^Notification/, - styleDir: 'Notification', - }, + styleDir: 'Notification' + } ] export interface JetlinksVueResolverOptions { @@ -259,7 +260,6 @@ function getStyleDir(compName: string, _isAntd = false): string { let styleDir const components = _isAntd ? AntdMatchComponents : matchComponents const total = components.length - console.log('getStyleDir', compName) for (let i = 0; i < total; i++) { const matcher = components[i] if (compName.match(matcher.pattern)) { @@ -273,10 +273,10 @@ function getStyleDir(compName: string, _isAntd = false): string { return styleDir } -function getSideEffects(compName: string, options: JetlinksVueResolverOptions, _isAntd= false): any { +function getSideEffects(compName: string, options: JetlinksVueResolverOptions, _isAntd = false): any { const { importStyle = true, - importLess = false, + importLess = false } = options if (!importStyle) @@ -286,23 +286,21 @@ function getSideEffects(compName: string, options: JetlinksVueResolverOptions, _ if (importStyle === 'less' || importLess) { const styleDir = getStyleDir(compName, _isAntd) - console.log('getSideEffects-style-path', `${packageName}/${lib}/${styleDir}/style`) return `${packageName}/${lib}/${styleDir}/style` - } - else { + } else { const styleDir = getStyleDir(compName, _isAntd) return `${packageName}/${lib}/${styleDir}/style/css` } } -const filterName = [ 'message', 'Notification', 'AIcon'] +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 prefix = 'J' let jetlinksNames: Set function genJetlinksNames(primitiveNames: string[]): void { - jetlinksNames = new Set(primitiveNames.map(name => filterName.includes(name) ? name : `${prefix}${name}`)) + jetlinksNames = new Set(primitiveNames.map(name => filterName.includes(name) ? name : `${prefix}${name}`)) } let antdvNames: Set @@ -322,16 +320,14 @@ function isAntdv(compName: string): boolean { return antdvNames.has(compName) } -export function JetlinksVueResolver(options: JetlinksVueResolverOptions = { - -}): any { +export function JetlinksVueResolver(options: JetlinksVueResolverOptions = {}): any { return { type: 'component', resolve: (name: string) => { if (options.resolveIcons && name.match(/(Outlined|Filled|TwoTone)$/)) { return { name, - from: '@ant-design/icons-vue', + from: '@ant-design/icons-vue' } } const _isJetlinks = isJetlinks(name) @@ -340,13 +336,16 @@ export function JetlinksVueResolver(options: JetlinksVueResolverOptions = { const importName = filterName.includes(name) ? name : name.slice(1) options.packageName = _isJetlinks ? 'jetlinks-ui-components' : 'ant-design-vue' const path = `${options.packageName}/${options.cjs ? 'lib' : 'es'}` - + const stylePath = getSideEffects(importName, options, _isAntd) + if (_isJetlinks) { + console.log(name, importName, stylePath) + } return { name: importName, from: path, - sideEffects: getSideEffects(importName, options, _isAntd), + sideEffects: stylePath } } - }, + } } } \ No newline at end of file diff --git a/src/api/rule-engine/scene.ts b/src/api/rule-engine/scene.ts index 1db1eb38..45836b9d 100644 --- a/src/api/rule-engine/scene.ts +++ b/src/api/rule-engine/scene.ts @@ -21,4 +21,6 @@ export const _action = (id: string, type: '_disable' | '_enable') => server.put( export const _execute = (id: string) => server.post(`/scene/${id}/_execute`); // 内置参数 -export const queryBuiltInParams = (data: any, params?: any) => server.post(`/scene/parse-variables`, data, params); \ No newline at end of file +export const queryBuiltInParams = (data: any, params?: any) => server.post(`/scene/parse-variables`, data, params); + +export const getParseTerm = (data: Record) => server.post(`/scene/parse-term-column`, data) \ No newline at end of file diff --git a/src/components/index.ts b/src/components/index.ts index fdbb2309..42f8c942 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -10,7 +10,7 @@ import NormalUpload from './NormalUpload/index.vue' import FileFormat from './FileFormat/index.vue' import JProUpload from './JUpload/index.vue' import { BasicLayoutPage, BlankLayoutPage } from './Layout' -import { PageContainer } from 'jetlinks-ui-components/es/components' +import { PageContainer } from 'jetlinks-ui-components' import Ellipsis from './Ellipsis/index.vue' import JEmpty from './Empty/index.vue' import AMapComponent from './AMapComponent/index.vue' diff --git a/src/store/menu.ts b/src/store/menu.ts index 9be0bff5..6851f153 100644 --- a/src/store/menu.ts +++ b/src/store/menu.ts @@ -76,7 +76,7 @@ export const useMenuStore = defineStore({ const path = this.hasMenu(name) if (path) { router.push({ - name, params, query + name, params, query, state: { params } }) } else { onlyMessage('暂无权限，请联系管理员', 'error') diff --git a/src/utils/menu.ts b/src/utils/menu.ts index 98332b79..6d920212 100644 --- a/src/utils/menu.ts +++ b/src/utils/menu.ts @@ -92,7 +92,8 @@ export type MenuItem = { icon?: string [key: string]: any }, - component?: any + component?: any, + props?: boolean }; // 额外子级路由 @@ -166,6 +167,7 @@ const findChildrenRoute = (code: string, url: string, routes: any[] = []): MenuI url: `${url}/${route.code}`, code: `${code}/${route.code}`, name: route.name, + props: true, isShow: false } }) @@ -182,6 +184,7 @@ const findDetailRouteItem = (code: string, url: string): Partial | nul code: `${code}/Detail`, component: detailComponent, name: '详情信息', + props: true, isShow: false } } @@ -213,7 +216,8 @@ export function filterAsnycRouter(asyncRouterMap: any, parentCode = '', level = title: route.name, hideInMenu: route.isShow === false, buttons: route.buttons?.map((b: any) => b.id) || [] - } + }, + props: true, } const silder = {..._route} diff --git a/src/views/notice/Config/Detail/index.vue b/src/views/notice/Config/Detail/index.vue index 88a92a1e..06643609 100644 --- a/src/views/notice/Config/Detail/index.vue +++ b/src/views/notice/Config/Detail/index.vue @@ -408,6 +408,7 @@ const { resetFields, validate, validateInfos, clearValidate } = useForm( ); const getDetail = async () => { + console.log('getDetail', route) if (route.params.id === ':id') return; const res = await configApi.detail(route.params.id as string); // formData.value = res.result; diff --git a/src/views/rule-engine/Scene/Save/Device/AddModal.vue b/src/views/rule-engine/Scene/Save/Device/AddModal.vue index 2521b9a8..1654105f 100644 --- a/src/views/rule-engine/Scene/Save/Device/AddModal.vue +++ b/src/views/rule-engine/Scene/Save/Device/AddModal.vue @@ -53,9 +53,9 @@ \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown.vue new file mode 100644 index 00000000..bc101782 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/components/Terms/Branchs.vue b/src/views/rule-engine/Scene/Save/components/Terms/Branchs.vue new file mode 100644 index 00000000..1fbce681 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/components/Terms/Branchs.vue @@ -0,0 +1,135 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue new file mode 100644 index 00000000..60c55ac2 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue @@ -0,0 +1,142 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue b/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue new file mode 100644 index 00000000..eaae2ec6 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue @@ -0,0 +1,121 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/components/Terms/TermsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/TermsItem.vue new file mode 100644 index 00000000..f13e6a2b --- /dev/null +++ b/src/views/rule-engine/Scene/Save/components/Terms/TermsItem.vue @@ -0,0 +1,126 @@ + + + + + \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/components/Terms/index.less b/src/views/rule-engine/Scene/Save/components/Terms/index.less new file mode 100644 index 00000000..b8fe5f99 --- /dev/null +++ b/src/views/rule-engine/Scene/Save/components/Terms/index.less @@ -0,0 +1,204 @@ +.add-button() { + display: flex; + align-items: center; + justify-content: center; + width: 24px; + height: 24px; + color: rgba(0, 0, 0, 0.3); + background-color: #fff; + border: 1px dashed rgba(0, 0, 0, 0.3); + border-radius: 50%; + cursor: pointer; +} + +.deleteBtn() { + position: absolute; + top: -10px; + right: -10px; + display: none; + width: 20px; + height: 20px; + color: #999; + line-height: 20px; + text-align: center; + background-color: #f1f1f1; + border-radius: 50%; + cursor: pointer; + + &.show { + display: block; + } + + &:hover { + background-color: #f3f3f3; + } +} + +.actions-terms { + .actions-terms-warp { + display: flex; + width: 66.66%; + margin-bottom: 24px; + + &.first-children { + width: 100%; + .actions-branches { + width: 66.66%; + } + } + + &.first-children, + &:last-child { + margin-bottom: 0; + } + + .when-add-button { + .add-button(); + } + + .actions-terms-title { + width: 40px; + padding-top: 16px; + color: #6968be; + font-weight: 800; + font-size: 16px; + } + + .actions-terms-options { + position: relative; + display: flex; + flex-direction: column; + flex-grow: 1; + width: 0; + + &.border { + padding: 10px 18px 0 18px; + border: 1px dashed #999; + border-radius: 2px; + } + + &.no-when { + flex: none; + } + + .actions-terms-list { + position: relative; + margin-bottom: 16px; + + .ant-form-item-has-error { + .params-item_button { + border-color: @error-color; + } + } + + .actions-terms-list-content { + display: flex; + padding-top: 10px; + overflow-x: auto; + overflow-y: visible; + row-gap: 16px; + + } + } + } + } +} + +.terms-params { + display: flex; + flex-shrink: 0; + + .terms-params-warp { + display: flex; + align-items: baseline; + } + + .terms-params-content { + position: relative; + display: flex; + // flex-wrap: wrap; + padding: 8px; + padding-bottom: 0; + border: 1px dashed #e0e0e0; + //background-color: #fafafa; + border-radius: 6px; + row-gap: 16px; + .terms-params-item { + display: flex; + align-items: center; + } + + .ant-form-item { + margin-bottom: 8px; + &:not(:first-child) { + .ant-form-item-explain-error { + padding-left: 80px !important; + } + } + } + } + + .terms-group-add { + width: 66px; + margin-left: 16px; + padding: 2px 8px; + color: rgba(0, 0, 0, 0.3); + background: #fff; + border: 1px dashed rgba(0, 0, 0, 0.3); + border-radius: 30px; + cursor: pointer; + + .terms-content { + display: flex; + align-items: center; + } + } + + .term-type-warp { + width: 50px; + margin: 0 16px; + .term-type { + padding-top: 4px; + padding-bottom: 4px; + border-radius: 2px; + } + } +} + +.terms-params-item { + .params-button { + padding: 6px 8px; + border: 1px solid #d9d9d9; + border-radius: 8px; + cursor: pointer; + } + + .params-item_button { + position: relative; + display: flex; + gap: 2px; + + + .button-delete { + .deleteBtn(); + } + } + + .term-add { + margin-left: 16px; + .add-button(); + } +} + +.terms-params-delete { + .deleteBtn(); + + &.danger { + color: #e50012; + background-color: rgba(229, 0, 18, 0.1); + } + + &.filter-terms-params-delete { + transform: translateY(6px); + } +} diff --git a/src/views/rule-engine/Scene/Save/components/Terms/index.ts b/src/views/rule-engine/Scene/Save/components/Terms/index.ts new file mode 100644 index 00000000..71bd72da --- /dev/null +++ b/src/views/rule-engine/Scene/Save/components/Terms/index.ts @@ -0,0 +1,4 @@ +import Terms from './Terms.vue' +import './index.less' + +export default Terms \ No newline at end of file diff --git a/src/views/rule-engine/Scene/Save/components/Terms/util.ts b/src/views/rule-engine/Scene/Save/components/Terms/util.ts new file mode 100644 index 00000000..de1c841c --- /dev/null +++ b/src/views/rule-engine/Scene/Save/components/Terms/util.ts @@ -0,0 +1,2 @@ +export const ContextKey = 'columnOptions' + diff --git a/src/views/rule-engine/Scene/typings.ts b/src/views/rule-engine/Scene/typings.ts index eff7cdbb..308e1329 100644 --- a/src/views/rule-engine/Scene/typings.ts +++ b/src/views/rule-engine/Scene/typings.ts @@ -122,13 +122,18 @@ export interface TriggerDeviceOptions { functionParameters?: Record[]; } +export type SelectorValuesItem = { + name: string + value: any +} + /** * 设备触发配置 */ export interface TriggerDevice { productId: string; selector: string; - selectorValues?: Record[]; + selectorValues?: SelectorValuesItem[]; operation?: TriggerDeviceOptions; } diff --git a/vite.config.ts b/vite.config.ts index 16a66d4a..66528f39 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -10,6 +10,7 @@ import VueSetupExtend from 'vite-plugin-vue-setup-extend' import { createStyleImportPlugin, AndDesignVueResolve } from 'vite-plugin-style-import' import * as path from 'path' import monacoEditorPlugin from 'vite-plugin-monaco-editor'; +// import { JetlinksVueResolver } from 'jetlinks-ui-components/lib/plugin/resolve' import { JetlinksVueResolver } from './plugin/jetlinks' import copy from 'rollup-plugin-copy';