diff --git a/packages/opendesign/package.json b/packages/opendesign/package.json index 09f53d01beb93ef47f86aee7fb9b4aefcee7de4b..67d374731d2773226bf6e853e43a59e88825c7ee 100644 --- a/packages/opendesign/package.json +++ b/packages/opendesign/package.json @@ -1,6 +1,6 @@ { "name": "@opensig/opendesign", - "version": "0.0.7", + "version": "0.0.9", "main": "lib/index.js", "module": "es/index.mjs", "types": "es/index.d.ts", @@ -18,6 +18,7 @@ "scripts": { "gen:token": "opensig-scripts gen:token --config ./src/tokens/token.config.ts", "gen:icon": "opensig-scripts gen:icon --config ./src/icons/icon.config.ts", + "clean:svg": "opensig-scripts clean:svg --config ./src/icons/cleansvg.config.ts", "build:component": "opensig-scripts build:component", "build:style": "opensig-scripts build:style", "build": "pnpm gen:icon && pnpm build:component && pnpm build:style" diff --git a/packages/opendesign/src/components/_shared/dom.ts b/packages/opendesign/src/components/_shared/dom.ts index 8563d9f0c79eda4de788e9924fe931b30ea17cf8..ead36de1bc3bacdec791eb6a6664699122eb8731 100644 --- a/packages/opendesign/src/components/_shared/dom.ts +++ b/packages/opendesign/src/components/_shared/dom.ts @@ -3,8 +3,8 @@ import { isArray } from './is'; export type DirectionT = 'left' | 'right' | 'top' | 'bottom'; export function isElement(el: any) { - return (typeof HTMLElement === 'object') - ? (el instanceof HTMLElement) + return typeof HTMLElement === 'object' + ? el instanceof HTMLElement : !!(el && typeof el === 'object' && (el.nodeType === 1 || el.nodeType === 9) && typeof el.nodeName === 'string'); } @@ -27,7 +27,7 @@ export function getScroll(el: HTMLElement | Window = window) { if (!el) { return { scrollLeft: 0, - scrollTop: 0 + scrollTop: 0, }; } const isroot = isDocumentElement(el); @@ -63,7 +63,7 @@ export function getRelativeBounding(e: DOMRect, c: DOMRect) { offsetBottom: e.bottom - c.top, }; } -export type RelativeRect = ReturnType +export type RelativeRect = ReturnType; export function getElementSize(el: HTMLElement | Window) { return { @@ -84,13 +84,18 @@ export function getElementBorder(el: HTMLElement, dir?: DirectionT | DirectionT[ d = isArray(dir) ? dir : ['left', 'right', 'bottom', 'top']; } const rlt: { - left?: number, - right?: number, - top?: number, - bottom?: number, + left?: number; + right?: number; + top?: number; + bottom?: number; } = {}; - d.forEach(k => { + d.forEach((k) => { rlt[k] = parseFloat(style.getPropertyValue(`border-${k}-width`)); }); return rlt; } + +export function getCssVariable(key: string, el?: HTMLElement) { + const ele = el ? el : document.documentElement; + return ele.style.getPropertyValue(key); +} diff --git a/packages/opendesign/src/components/cascader/OCascader.vue b/packages/opendesign/src/components/cascader/OCascader.vue index 40977a66d71b91ac2ad9be533fd25419afa6b4d2..314de65906b12aa000f9432956d4dc96684b7398 100644 --- a/packages/opendesign/src/components/cascader/OCascader.vue +++ b/packages/opendesign/src/components/cascader/OCascader.vue @@ -7,15 +7,16 @@ import { OSelect } from '../select'; import { cascaderProps } from './types'; import type { CascaderValueT, CascaderNodePathT } from './types'; import CascaderTree from './cascader'; +import type { ColumnInfoT } from './cascader'; import { isArray, isUndefined } from '../_shared/is'; -interface ColumnInfoT { - value: string | number; - label?: string; - depth: number; - isLeaf: boolean; - isActive: boolean; -} +// interface ColumnInfoT { +// value: string | number; +// label?: string; +// depth: number; +// isLeaf: boolean; +// isActive: boolean; +// } const props = defineProps(cascaderProps); diff --git a/packages/opendesign/src/components/cascader/cascader.ts b/packages/opendesign/src/components/cascader/cascader.ts index ae9a58c7934551ab3545f96ac068ea1d6b6bcaad..1d318e3250223cfb05bec9028bff839c40d9ac08 100644 --- a/packages/opendesign/src/components/cascader/cascader.ts +++ b/packages/opendesign/src/components/cascader/cascader.ts @@ -11,7 +11,7 @@ interface CascaderNodeT { isLeaf: boolean; } -interface ColumnInfoT { +export interface ColumnInfoT { value: string | number; label?: string; depth: number; diff --git a/packages/opendesign/src/components/figure/__demo__/FigureBasic.vue b/packages/opendesign/src/components/figure/__demo__/FigureBasic.vue index 3a127b6a843793f4eec672fbd81af3c2fe277d42..baeededf26c45b6da5a69b18f8a6da3a97d4a547 100644 --- a/packages/opendesign/src/components/figure/__demo__/FigureBasic.vue +++ b/packages/opendesign/src/components/figure/__demo__/FigureBasic.vue @@ -5,10 +5,10 @@ const img = 'https://www.hiascend.com/p/resource/202303/0a66367d573f4369a6d16090