From 5da7d45e82a34c9b535c33f5c7d0ff5bbb8b3609 Mon Sep 17 00:00:00 2001 From: bqy_fe <1743369777@qq.com> Date: Tue, 13 Jul 2021 21:02:07 +0800 Subject: [PATCH] fix: :bug:custom component can not use vue lifecycle hooks --- .eslintrc.js | 4 +- index.html | 5 +- package.json | 14 +- preview/App.vue | 22 +- preview/index.html | 5 +- preview/views/comp-render.tsx | 17 +- src/packages/base-widgets/button/index.tsx | 2 +- src/packages/base-widgets/checkbox/index.tsx | 18 +- .../base-widgets/datetimePicker/index.tsx | 6 +- src/packages/base-widgets/divider/index.tsx | 11 +- src/packages/base-widgets/image/index.tsx | 4 +- src/packages/base-widgets/input/index.tsx | 6 +- src/packages/base-widgets/nav-bar/index.tsx | 25 +- .../base-widgets/notice-bar/index.tsx | 4 +- src/packages/base-widgets/picker/index.tsx | 79 ++-- src/packages/base-widgets/process/index.tsx | 4 +- src/packages/base-widgets/radio/index.tsx | 6 +- src/packages/base-widgets/rate/index.tsx | 6 +- src/packages/base-widgets/slider/index.tsx | 6 +- src/packages/base-widgets/stepper/index.tsx | 9 +- src/packages/base-widgets/swipe/index.tsx | 4 +- src/packages/base-widgets/switch/index.tsx | 6 +- src/packages/base-widgets/tabbar/index.tsx | 22 +- .../base-widgets/tabbar/tabbar-item.tsx | 6 +- src/packages/base-widgets/text/index.tsx | 4 +- .../container-component/form/index.tsx | 4 +- .../container-component/layout/index.tsx | 19 +- .../cross-sortable-options-editor.tsx | 12 +- .../simulator-editor/comp-render.tsx | 17 +- src/visual-editor/hooks/useVisualData.ts | 2 +- src/visual-editor/visual-editor.utils.ts | 4 +- yarn.lock | 364 +++++++++--------- 32 files changed, 381 insertions(+), 336 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 2c555f4..db6fdf9 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -22,9 +22,9 @@ module.exports = { 'plugin:prettier/recommended' ], rules: { - '@typescript-eslint/no-unused-vars': 'off', - 'no-unused-vars': 'off', 'vue/require-default-prop': 'off', + + '@typescript-eslint/no-unused-vars': 'off', '@typescript-eslint/ban-ts-comment': 'off', '@typescript-eslint/no-explicit-any': 'off', '@typescript-eslint/ban-types': 'off', diff --git a/index.html b/index.html index 30b2dbf..817ba28 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,10 @@ - + H5低代码 diff --git a/package.json b/package.json index 14440b9..98c6c43 100644 --- a/package.json +++ b/package.json @@ -44,10 +44,10 @@ "@commitlint/cli": "^12.1.4", "@commitlint/config-conventional": "^12.1.4", "@types/node": "^16.3.1", - "@typescript-eslint/eslint-plugin": "^4.28.2", - "@typescript-eslint/parser": "^4.28.2", - "@vitejs/plugin-legacy": "^1.4.3", - "@vitejs/plugin-vue": "^1.2.4", + "@typescript-eslint/eslint-plugin": "^4.28.3", + "@typescript-eslint/parser": "^4.28.3", + "@vitejs/plugin-legacy": "^1.4.4", + "@vitejs/plugin-vue": "^1.2.5", "@vitejs/plugin-vue-jsx": "^1.1.6", "@vue/compiler-sfc": "3.1.4", "commitizen": "^4.2.4", @@ -61,7 +61,7 @@ "eslint-plugin-vue": "^7.13.0", "gh-pages": "^3.2.3", "husky": "^7.0.1", - "lint-staged": "^11.0.0", + "lint-staged": "^11.0.1", "prettier": "^2.3.2", "pretty-quick": "^3.1.1", "sass": "1.35.2", @@ -70,13 +70,13 @@ "stylelint-config-standard": "^22.0.0", "stylelint-order": "^4.1.0", "typescript": "^4.3.5", - "vite": "2.4.1", + "vite": "2.4.2", "vite-plugin-components": "^0.12.2", "vite-plugin-style-import": "^1.0.1", "vite-plugin-windicss": "^1.2.4", "vue-eslint-parser": "^7.8.0", "vue-tsc": "^0.2.0", - "windicss": "^3.1.4" + "windicss": "^3.1.5" }, "repository": { "type": "git", diff --git a/preview/App.vue b/preview/App.vue index 472a0a2..ff7eb61 100644 --- a/preview/App.vue +++ b/preview/App.vue @@ -1,16 +1,32 @@ diff --git a/preview/index.html b/preview/index.html index f7f61dd..c173ff0 100644 --- a/preview/index.html +++ b/preview/index.html @@ -3,7 +3,10 @@ - + 效果页 diff --git a/preview/views/comp-render.tsx b/preview/views/comp-render.tsx index 317431e..fa76bcc 100644 --- a/preview/views/comp-render.tsx +++ b/preview/views/comp-render.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-05-04 05:36:58 - * @LastEditTime: 2021-07-06 23:51:26 + * @LastEditTime: 2021-07-13 17:18:23 * @LastEditors: 卜启缘 * @Description: * @FilePath: \vite-vue3-lowcode\preview\views\comp-render.tsx @@ -19,13 +19,12 @@ export default defineComponent({ } }, setup(props) { - return () => - visualConfig.componentMap[props.element.componentKey].render({ - styles: props.element.styles || {}, - props: props.element.props || {}, - model: {}, - block: props.element, - custom: {} - }) + return visualConfig.componentMap[props.element.componentKey].render({ + styles: props.element.styles || {}, + props: props.element.props || {}, + model: {}, + block: props.element, + custom: {} + }) } }) diff --git a/src/packages/base-widgets/button/index.tsx b/src/packages/base-widgets/button/index.tsx index 9f5afef..45d0382 100644 --- a/src/packages/base-widgets/button/index.tsx +++ b/src/packages/base-widgets/button/index.tsx @@ -15,7 +15,7 @@ export default { render: ({ props, block, styles }) => { const { registerRef } = useGlobalProperties() - return ( + return () => (
diff --git a/src/packages/base-widgets/checkbox/index.tsx b/src/packages/base-widgets/checkbox/index.tsx index a18f628..ea9ceeb 100644 --- a/src/packages/base-widgets/checkbox/index.tsx +++ b/src/packages/base-widgets/checkbox/index.tsx @@ -1,12 +1,12 @@ /* * @Author: 卜启缘 * @Date: 2021-06-01 09:45:21 - * @LastEditTime: 2021-07-07 10:54:50 + * @LastEditTime: 2021-07-13 20:26:04 * @LastEditors: 卜启缘 * @Description: 表单项类型 - 复选框 * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\checkbox\index.tsx */ -import { reactive } from 'vue' +import { computed } from 'vue' import { Field, Checkbox, CheckboxGroup } from 'vant' import type { VisualEditorComponent } from '@/visual-editor/visual-editor.utils' import { createFieldProps } from './createFieldProps' @@ -35,23 +35,25 @@ export default { render: ({ styles, block, props }) => { const { registerRef } = useGlobalProperties() - const state = reactive({ - checkList: - typeof props.modelValue === 'string' ? props.modelValue.split(',') : props.modelValue + const checkList = computed({ + get() { + return typeof props.modelValue === 'string' ? props.modelValue.split(',') : props.modelValue + }, + set: (val) => (props.modelValue = val) }) - return ( + return () => (
( registerRef(el, block._vid)} {...props} - v-model={state.checkList} + v-model={checkList.value} > {props.options?.map((item) => ( diff --git a/src/packages/base-widgets/datetimePicker/index.tsx b/src/packages/base-widgets/datetimePicker/index.tsx index e79cebc..694e275 100644 --- a/src/packages/base-widgets/datetimePicker/index.tsx +++ b/src/packages/base-widgets/datetimePicker/index.tsx @@ -45,7 +45,7 @@ export default { console.log(props) } - const PopupPicker = () => ( + return () => (
(state.showPicker = true)} - name={Array.isArray(props.name) ? [...props.name].pop() : props.name} + name={Array.isArray(props.name) ? props.name?.pop() : props.name} v-slots={{ input: () => state.text?.trim() == '' ? ( @@ -75,8 +75,6 @@ export default {
) - - return }, props: { modelValue: createEditorInputProp({ label: '默认值' }), diff --git a/src/packages/base-widgets/divider/index.tsx b/src/packages/base-widgets/divider/index.tsx index 6ccce6c..bc45f90 100644 --- a/src/packages/base-widgets/divider/index.tsx +++ b/src/packages/base-widgets/divider/index.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-06-01 09:45:21 - * @LastEditTime: 2021-07-07 21:10:10 + * @LastEditTime: 2021-07-13 18:51:58 * @LastEditors: 卜启缘 * @Description: 分割线 * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\divider\index.tsx @@ -15,6 +15,7 @@ import { } from '@/visual-editor/visual-editor.props' import type { VisualEditorComponent } from '@/visual-editor/visual-editor.utils' import { useGlobalProperties } from '@/hooks/useGlobalProperties' +import { computed } from 'vue' export default { key: 'divider', @@ -24,15 +25,15 @@ export default { render: ({ props, block, styles }) => { const { registerRef } = useGlobalProperties() - const style = { + const style = computed(() => ({ width: '100%', color: props['text-color'], borderColor: props['divider-color'] - } + })) - return ( + return () => (
- registerRef(el, block._vid)} {...props} style={style}> + registerRef(el, block._vid)} {...props} style={style.value}> {{ default: () => props.text }} diff --git a/src/packages/base-widgets/image/index.tsx b/src/packages/base-widgets/image/index.tsx index c05ec40..d579c4e 100644 --- a/src/packages/base-widgets/image/index.tsx +++ b/src/packages/base-widgets/image/index.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-06-01 09:45:21 - * @LastEditTime: 2021-07-07 10:56:20 + * @LastEditTime: 2021-07-13 17:14:05 * @LastEditors: 卜启缘 * @Description: 图片组件 * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\image\index.tsx @@ -33,7 +33,7 @@ export default { render: ({ props, block, styles }) => { const { registerRef } = useGlobalProperties() - return ( + return () => (
registerRef(el, block._vid)} {...props} />
diff --git a/src/packages/base-widgets/input/index.tsx b/src/packages/base-widgets/input/index.tsx index 4c8b81f..f18f0e6 100644 --- a/src/packages/base-widgets/input/index.tsx +++ b/src/packages/base-widgets/input/index.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-05-04 05:36:58 - * @LastEditTime: 2021-07-07 10:56:39 + * @LastEditTime: 2021-07-13 17:14:12 * @LastEditors: 卜启缘 * @Description: 表单项类型 - 输入框 * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\input\index.tsx @@ -26,7 +26,7 @@ export default { rules = JSON.parse(props.rules) } catch (e) {} - return ( + return () => (
registerRef(el, block._vid)} @@ -34,7 +34,7 @@ export default { {...props} {...model.default} v-model={props.modelValue} - name={Array.isArray(props.name) ? [...props.name].pop() : props.name} + name={Array.isArray(props.name) ? props.name?.pop() : props.name} rules={rules} />
diff --git a/src/packages/base-widgets/nav-bar/index.tsx b/src/packages/base-widgets/nav-bar/index.tsx index e8370fa..e7d22ab 100644 --- a/src/packages/base-widgets/nav-bar/index.tsx +++ b/src/packages/base-widgets/nav-bar/index.tsx @@ -1,16 +1,16 @@ /* * @Author: 卜启缘 * @Date: 2021-05-04 05:36:58 - * @LastEditTime: 2021-07-11 16:36:05 + * @LastEditTime: 2021-07-13 20:34:53 * @LastEditors: 卜启缘 * @Description: 导航栏 * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\nav-bar\index.tsx */ import { NavBar } from 'vant' -import 'vant/lib/nav-bar/index.css' import type { VisualEditorComponent } from '@/visual-editor/visual-editor.utils' import { createEditorInputProp, createEditorSwitchProp } from '@/visual-editor/visual-editor.props' import { useGlobalProperties } from '@/hooks/useGlobalProperties' +import { onBeforeUnmount, onMounted } from 'vue' export default { key: 'nav-bar', @@ -22,16 +22,22 @@ export default { render: ({ props, block }) => { const { registerRef } = useGlobalProperties() - setTimeout(() => { + onMounted(() => { const compEl = window.$$refs[block._vid]?.$el const draggableEl = compEl?.closest('div[data-draggable]') const navbarEl = draggableEl?.querySelector('.van-nav-bar--fixed') as HTMLDivElement - if (draggableEl && navbarEl) { + const dragArea = document.querySelector( + '.simulator-editor-content > .dragArea ' + ) as HTMLDivElement + if (draggableEl && navbarEl && dragArea) { navbarEl.style.position = 'unset' + draggableEl.style.position = 'fixed' draggableEl.style.top = '0' draggableEl.style.left = '0' draggableEl.style.width = '100%' + dragArea.style.paddingTop = '50px' } else { + document.body.style.paddingTop = '46px' const slotEl = compEl?.closest('__slot-item') if (slotEl) { slotEl.style.position = 'fixed' @@ -40,7 +46,16 @@ export default { } }) - return registerRef(el, block._vid)} placeholder {...props} /> + onBeforeUnmount(() => { + const dragArea = document.querySelector( + '.simulator-editor-content > .dragArea ' + ) as HTMLDivElement + if (dragArea) { + dragArea.style.paddingTop = '' + } + }) + + return () => registerRef(el, block._vid)} {...props} /> }, props: { title: createEditorInputProp({ label: '标题', defaultValue: '标题' }), diff --git a/src/packages/base-widgets/notice-bar/index.tsx b/src/packages/base-widgets/notice-bar/index.tsx index a8bc467..0c3dba9 100644 --- a/src/packages/base-widgets/notice-bar/index.tsx +++ b/src/packages/base-widgets/notice-bar/index.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-06-14 12:24:12 - * @LastEditTime: 2021-07-07 18:49:16 + * @LastEditTime: 2021-07-13 17:14:20 * @LastEditors: 卜启缘 * @Description: * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\notice-bar\index.tsx @@ -25,7 +25,7 @@ export default { render: ({ block, props, styles }) => { const { registerRef } = useGlobalProperties() - return ( + return () => (
registerRef(el, block._vid)} style={{ width: '100%' }} {...props} />
diff --git a/src/packages/base-widgets/picker/index.tsx b/src/packages/base-widgets/picker/index.tsx index 1bd6c71..7c203b2 100644 --- a/src/packages/base-widgets/picker/index.tsx +++ b/src/packages/base-widgets/picker/index.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-06-01 09:45:21 - * @LastEditTime: 2021-07-08 15:15:52 + * @LastEditTime: 2021-07-13 20:20:59 * @LastEditors: 卜启缘 * @Description: 表单项类型 - 选择器 * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\picker\index.tsx @@ -37,51 +37,52 @@ export default { value: 'value' } - if (props.modelValue) { - state.defaultIndex = props.columns?.findIndex((item) => item.value == props.modelValue) - state.text = props.columns[state.defaultIndex]?.label - } - const onConfirm = (value) => { props.modelValue = value.value state.text = value[props.valueKey || 'text'] + state.showPicker = false console.log(props) } - const PopupPicker = () => ( -
- (state.showPicker = true)} - name={Array.isArray(props.name) ? [...props.name].pop() : props.name} - > - {{ - input: () => - state.text?.trim() == '' ? ( - {props.placeholder} - ) : ( - state.text - ) - }} - - - registerRef(el, block._vid)} - {...props} - {...attrs} - defaultIndex={state.defaultIndex} - columnsFieldNames={customFieldName} - onConfirm={onConfirm} - onCancel={() => (state.showPicker = false)} - /> - -
- ) + return () => { + if (props.modelValue) { + state.defaultIndex = props.columns?.findIndex((item) => item.value == props.modelValue) + state.text = props.columns[state.defaultIndex]?.label + } - return + return ( +
+ (state.showPicker = true)} + name={Array.isArray(props.name) ? [...props.name].pop() : props.name} + > + {{ + input: () => + state.text?.trim() == '' ? ( + {props.placeholder} + ) : ( + state.text + ) + }} + + + registerRef(el, block._vid)} + {...props} + {...attrs} + defaultIndex={state.defaultIndex} + columnsFieldNames={customFieldName} + onConfirm={onConfirm} + onCancel={() => (state.showPicker = false)} + /> + +
+ ) + } }, props: { modelValue: createEditorInputProp({ label: '默认值' }), diff --git a/src/packages/base-widgets/process/index.tsx b/src/packages/base-widgets/process/index.tsx index e99eb68..d142696 100644 --- a/src/packages/base-widgets/process/index.tsx +++ b/src/packages/base-widgets/process/index.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-06-12 22:18:48 - * @LastEditTime: 2021-07-07 10:58:10 + * @LastEditTime: 2021-07-13 17:14:47 * @LastEditors: 卜启缘 * @Description: 进度条 * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\process\index.tsx @@ -23,7 +23,7 @@ export default { render: ({ props, styles }) => { const RenderProgress = () => - return ( + return () => (
diff --git a/src/packages/base-widgets/radio/index.tsx b/src/packages/base-widgets/radio/index.tsx index 9457881..b3645b3 100644 --- a/src/packages/base-widgets/radio/index.tsx +++ b/src/packages/base-widgets/radio/index.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-06-01 09:45:21 - * @LastEditTime: 2021-07-07 10:59:56 + * @LastEditTime: 2021-07-13 17:14:55 * @LastEditors: 卜启缘 * @Description: 表单项类型 - 单选框 * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\radio\index.tsx @@ -30,12 +30,12 @@ export default { render: ({ styles, block, props }) => { const { registerRef } = useGlobalProperties() - return ( + return () => (
( { const { registerRef } = useGlobalProperties() - return ( + return () => (
( { const { registerRef } = useGlobalProperties() - return ( + return () => (
( { const { registerRef } = useGlobalProperties() - return ( + props.name = Array.isArray(props.name) ? props.name?.pop() : props.name + + return () => (
( registerRef(el, block._vid)} - {...props} v-model={props.modelValue} + {...props} > ) }} diff --git a/src/packages/base-widgets/swipe/index.tsx b/src/packages/base-widgets/swipe/index.tsx index 75fa2cc..81933d8 100644 --- a/src/packages/base-widgets/swipe/index.tsx +++ b/src/packages/base-widgets/swipe/index.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-06-14 12:24:12 - * @LastEditTime: 2021-07-11 16:43:31 + * @LastEditTime: 2021-07-13 17:12:11 * @LastEditors: 卜启缘 * @Description: 轮播图组件 * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\swipe\index.tsx @@ -32,7 +32,7 @@ export default { render: ({ block, props }) => { const { registerRef } = useGlobalProperties() - return ( + return () => (
registerRef(el, block._vid)} diff --git a/src/packages/base-widgets/switch/index.tsx b/src/packages/base-widgets/switch/index.tsx index f0915c4..74b40d4 100644 --- a/src/packages/base-widgets/switch/index.tsx +++ b/src/packages/base-widgets/switch/index.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-06-01 09:45:21 - * @LastEditTime: 2021-07-07 11:01:29 + * @LastEditTime: 2021-07-13 18:20:55 * @LastEditors: 卜启缘 * @Description: 表单项类型 - 开关 * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\switch\index.tsx @@ -27,12 +27,12 @@ export default { render: ({ styles, block, props }) => { const { registerRef } = useGlobalProperties() - return ( + return () => (
( { const { registerRef } = useGlobalProperties() - setTimeout(() => { + onMounted(() => { const compEl = window.$$refs[block._vid]?.$el const draggableEl = compEl?.closest('div[data-draggable]') + const dragArea: HTMLDivElement = document.querySelector( + '.simulator-editor-content > .dragArea ' + )! const tabbarEl = draggableEl?.querySelector('.van-tabbar') as HTMLDivElement - if (draggableEl && tabbarEl) { + if (draggableEl && tabbarEl && dragArea) { tabbarEl.style.position = 'unset' draggableEl.style.position = 'fixed' draggableEl.style.bottom = '0' draggableEl.style.left = '0' draggableEl.style.width = '100%' draggableEl.style.zIndex = '1000' + dragArea.style.paddingBottom = '56px' } else { document.body.style.paddingBottom = '50px' const slotEl = compEl?.closest('__slot-item') @@ -54,7 +59,16 @@ export default { } }) - return ( + onBeforeUnmount(() => { + const dragArea: HTMLDivElement = document.querySelector( + '.simulator-editor-content > .dragArea ' + )! + if (dragArea) { + dragArea.style.paddingBottom = '' + } + }) + + return () => ( registerRef(el, block._vid)} v-model={props.modelValue} {...props}> {props.tabs?.map((item) => { const itemProps = item.block?.props diff --git a/src/packages/base-widgets/tabbar/tabbar-item.tsx b/src/packages/base-widgets/tabbar/tabbar-item.tsx index 0fc68f1..4b13594 100644 --- a/src/packages/base-widgets/tabbar/tabbar-item.tsx +++ b/src/packages/base-widgets/tabbar/tabbar-item.tsx @@ -1,10 +1,10 @@ /* * @Author: 卜启缘 * @Date: 2021-05-04 05:36:58 - * @LastEditTime: 2021-07-11 19:58:14 + * @LastEditTime: 2021-07-13 18:20:44 * @LastEditors: 卜启缘 * @Description: 导航栏项 - * @FilePath: \vite-vue3-lowcode\src\packages\container-component\tabbar\tabbar-item.tsx + * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\tabbar\tabbar-item.tsx */ import type { VisualEditorComponent } from '@/visual-editor/visual-editor.utils' import { createEditorInputProp, createEditorSwitchProp } from '@/visual-editor/visual-editor.props' @@ -14,7 +14,7 @@ export default { moduleName: 'baseWidgets', label: '底部标签栏', preview: () => <>, - render: () => <>, + render: () => () => <>, props: { // name: createEditorInputProp({ // label: '标签名称，作为匹配的标识符', diff --git a/src/packages/base-widgets/text/index.tsx b/src/packages/base-widgets/text/index.tsx index 7b9a7de..3bf47cd 100644 --- a/src/packages/base-widgets/text/index.tsx +++ b/src/packages/base-widgets/text/index.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-06-01 09:45:21 - * @LastEditTime: 2021-07-07 11:01:54 + * @LastEditTime: 2021-07-13 17:15:31 * @LastEditors: 卜启缘 * @Description: 文本 * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\text\index.tsx @@ -24,7 +24,7 @@ export default { render: ({ props, block, styles }) => { const { registerRef } = useGlobalProperties() - return ( + return () => (
registerRef(el, block._vid)} style={{ diff --git a/src/packages/container-component/form/index.tsx b/src/packages/container-component/form/index.tsx index 7b0b3ac..64898ed 100644 --- a/src/packages/container-component/form/index.tsx +++ b/src/packages/container-component/form/index.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-06-01 09:45:21 - * @LastEditTime: 2021-07-08 15:13:02 + * @LastEditTime: 2021-07-13 17:15:43 * @LastEditors: 卜启缘 * @Description: * @FilePath: \vite-vue3-lowcode\src\packages\container-component\form\index.tsx @@ -35,7 +35,7 @@ export default { console.log('onSubmit:', values) } - return ( + return () => (
registerRef(el, block._vid)} diff --git a/src/packages/container-component/layout/index.tsx b/src/packages/container-component/layout/index.tsx index 5b5c596..3b50d12 100644 --- a/src/packages/container-component/layout/index.tsx +++ b/src/packages/container-component/layout/index.tsx @@ -4,6 +4,7 @@ import { createEditorInputProp, createEditorSelectProp } from '@/visual-editor/v import type { VisualEditorComponent } from '@/visual-editor/visual-editor.utils' import styleModule from './index.module.scss' import { useGlobalProperties } from '@/hooks/useGlobalProperties' +import { watchEffect } from 'vue' interface SlotItem { value: string @@ -42,15 +43,17 @@ export default { slotsTemp[block._vid] ??= {} - if (Object.keys(props.slots || {}).length) { - Object.keys(props.slots).forEach((key) => { - if (slotsTemp[block._vid][key]?.children) { - props.slots[key].children = slotsTemp[block._vid][key].children - } - }) - } + watchEffect(() => { + if (Object.keys(props.slots || {}).length) { + Object.keys(props.slots).forEach((key) => { + if (slotsTemp[block._vid][key]?.children) { + props.slots[key].children = slotsTemp[block._vid][key].children + } + }) + } + }) - return ( + return () => (
registerRef(el, block._vid)} diff --git a/src/visual-editor/components/right-attribute-panel/components/attr-editor/components/cross-sortable-options-editor/cross-sortable-options-editor.tsx b/src/visual-editor/components/right-attribute-panel/components/attr-editor/components/cross-sortable-options-editor/cross-sortable-options-editor.tsx index 86637e2..1df048d 100644 --- a/src/visual-editor/components/right-attribute-panel/components/attr-editor/components/cross-sortable-options-editor/cross-sortable-options-editor.tsx +++ b/src/visual-editor/components/right-attribute-panel/components/attr-editor/components/cross-sortable-options-editor/cross-sortable-options-editor.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-06-14 15:00:45 - * @LastEditTime: 2021-07-12 10:15:21 + * @LastEditTime: 2021-07-12 14:44:29 * @LastEditors: 卜启缘 * @Description: 可以拖拽排序的选项列表 * @FilePath: \vite-vue3-lowcode\src\visual-editor\components\right-attribute-panel\components\attr-editor\components\cross-sortable-options-editor\cross-sortable-options-editor.tsx @@ -67,7 +67,10 @@ export const CrossSortableOptionsEditor = defineComponent({ } }) - const onChange = (val) => { + /** + * @description 复选框值改变时触发 + */ + const onChange = (val: any[]) => { val = val.filter((item) => item !== '') val = props.multiple ? val @@ -75,7 +78,10 @@ export const CrossSortableOptionsEditor = defineComponent({ currentBlock.value.props.modelValue = val.join(',') } - const incrementOption = (index) => { + /** + * @param {number} index - 在某项之前新增一项 + */ + const incrementOption = (index: number) => { const length = state.list.length + 1 const newItem = state.list.some((item) => isObject(item)) ? Object.assign(cloneDeep(state.list[0]), { diff --git a/src/visual-editor/components/simulator-editor/comp-render.tsx b/src/visual-editor/components/simulator-editor/comp-render.tsx index 830e077..53d20fa 100644 --- a/src/visual-editor/components/simulator-editor/comp-render.tsx +++ b/src/visual-editor/components/simulator-editor/comp-render.tsx @@ -1,7 +1,7 @@ /* * @Author: 卜启缘 * @Date: 2021-05-04 05:36:58 - * @LastEditTime: 2021-07-07 16:45:34 + * @LastEditTime: 2021-07-13 17:17:52 * @LastEditors: 卜启缘 * @Description: * @FilePath: \vite-vue3-lowcode\src\visual-editor\components\simulator-editor\comp-render.tsx @@ -19,13 +19,12 @@ export default defineComponent({ } }, setup(props) { - return () => - visualConfig.componentMap[props.element.componentKey].render({ - styles: props.element.styles || {}, - props: props.element.props || {}, - model: {}, - block: props.element, - custom: {} - }) + return visualConfig.componentMap[props.element.componentKey].render({ + styles: props.element.styles || {}, + props: props.element.props || {}, + model: {}, + block: props.element, + custom: {} + }) } }) diff --git a/src/visual-editor/hooks/useVisualData.ts b/src/visual-editor/hooks/useVisualData.ts index 2595064..ff804ef 100644 --- a/src/visual-editor/hooks/useVisualData.ts +++ b/src/visual-editor/hooks/useVisualData.ts @@ -22,7 +22,7 @@ import { CacheEnum } from '@/enums' export const localKey = CacheEnum.PAGE_DATA_KEY // 注入jsonData的key -export const injectKey: InjectionKey = Symbol() +export const injectKey: InjectionKey> = Symbol() interface IState { currentBlock: VisualEditorBlockData // 当前正在操作的组件 diff --git a/src/visual-editor/visual-editor.utils.ts b/src/visual-editor/visual-editor.utils.ts index dac1437..d85d29a 100644 --- a/src/visual-editor/visual-editor.utils.ts +++ b/src/visual-editor/visual-editor.utils.ts @@ -203,7 +203,7 @@ export interface VisualEditorComponent { styles: CSSProperties block: VisualEditorBlockData custom: Record - }) => JSX.Element + }) => () => JSX.Element /** 组件是否可以被拖拽 */ draggable?: boolean /** 是否显示组件的样式配置项 */ @@ -318,7 +318,7 @@ export function createVisualEditorConfig() { styles: CSSProperties block: VisualEditorBlockData custom: Record - }) => JSX.Element + }) => () => JSX.Element props?: Props model?: Model styles?: CSSProperties diff --git a/yarn.lock b/yarn.lock index 603f1e7..7fb8eb7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -473,9 +473,9 @@ integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.walk@^1.2.3": - version "1.2.7" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz#94c23db18ee4653e129abd26fb06f870ac9e1ee2" - integrity sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA== + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" @@ -650,51 +650,41 @@ integrity sha512-LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew== "@types/json-schema@^7.0.7": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" - integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== - -"@types/json5@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + version "7.0.8" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818" + integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg== "@types/lodash@^4.14.161": - version "4.14.170" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.170.tgz#0d67711d4bf7f4ca5147e9091b847479b87925d6" - integrity sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q== + version "4.14.171" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.171.tgz#f01b3a5fe3499e34b622c362a46a609fdb23573b" + integrity sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg== "@types/mdast@^3.0.0": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb" - integrity sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw== + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.4.tgz#8ee6b5200751b6cadb9a043ca39612693ad6cb9e" + integrity sha512-gIdhbLDFlspL53xzol2hVzrXAbzt71erJHoOwQZWssjaiouOotf03lNtMmFm9VfFkvnLWccSVjUAZGQ5Kqw+jA== dependencies: "@types/unist" "*" "@types/minimatch@^3.0.3": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" - integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/minimist@^1.2.0": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256" - integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg== + version "1.2.2" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" + integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== -"@types/node@*": - version "16.0.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.0.0.tgz#067a6c49dc7a5c2412a505628e26902ae967bf6f" - integrity sha512-TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg== - -"@types/node@^16.3.1": +"@types/node@*", "@types/node@^16.3.1": version "16.3.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.3.1.tgz#24691fa2b0c3ec8c0d34bfcfd495edac5593ebb4" integrity sha512-N87VuQi7HEeRJkhzovao/JviiqKjDKMVKxKMfUvSKw+MbkbW8R0nA3fi/MQhhlxV2fQ+2ReM+/Nt4efdrJx3zA== "@types/normalize-package-data@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== + version "2.4.1" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" + integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== "@types/parse-json@^4.0.0": version "4.0.0" @@ -707,9 +697,9 @@ integrity sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ== "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.4.tgz#453e27c6930d66380b4c121e7d5e361c5c2d921b" - integrity sha512-zfyYsDTK1HTGYXU3fTiM76+om93HcFtsZd2M0bO/CL4DiETV7mSa/pIVN/6+G3esOqEMdg2An5cHHbK5t+9w+A== + version "2.0.5" + resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.5.tgz#fdd299f23205c3455af88ce618dd65c14cb73e22" + integrity sha512-wnra4Vw9dopnuybR6HBywJ/URYpYrKLoepBTEtgfJup8Ahoi2zJECPP2cwiXp7btTvOT2CULv87aQRA4eZSP6g== "@types/vfile-message@*": version "2.0.0" @@ -727,73 +717,73 @@ "@types/unist" "*" "@types/vfile-message" "*" -"@typescript-eslint/eslint-plugin@^4.28.2": - version "4.28.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.2.tgz#7a8320f00141666813d0ae43b49ee8244f7cf92a" - integrity sha512-PGqpLLzHSxq956rzNGasO3GsAPf2lY9lDUBXhS++SKonglUmJypaUtcKzRtUte8CV7nruwnDxtLUKpVxs0wQBw== +"@typescript-eslint/eslint-plugin@^4.28.3": + version "4.28.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.3.tgz#36cdcd9ca6f9e5cb49b9f61b970b1976708d084b" + integrity sha512-jW8sEFu1ZeaV8xzwsfi6Vgtty2jf7/lJmQmDkDruBjYAbx5DA8JtbcMnP0rNPUG+oH5GoQBTSp+9613BzuIpYg== dependencies: - "@typescript-eslint/experimental-utils" "4.28.2" - "@typescript-eslint/scope-manager" "4.28.2" + "@typescript-eslint/experimental-utils" "4.28.3" + "@typescript-eslint/scope-manager" "4.28.3" debug "^4.3.1" functional-red-black-tree "^1.0.1" regexpp "^3.1.0" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@4.28.2": - version "4.28.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.2.tgz#4ebdec06a10888e9326e1d51d81ad52a361bd0b0" - integrity sha512-MwHPsL6qo98RC55IoWWP8/opTykjTp4JzfPu1VfO2Z0MshNP0UZ1GEV5rYSSnZSUI8VD7iHvtIPVGW5Nfh7klQ== +"@typescript-eslint/experimental-utils@4.28.3": + version "4.28.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.3.tgz#976f8c1191b37105fd06658ed57ddfee4be361ca" + integrity sha512-zZYl9TnrxwEPi3FbyeX0ZnE8Hp7j3OCR+ELoUfbwGHGxWnHg9+OqSmkw2MoCVpZksPCZYpQzC559Ee9pJNHTQw== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.28.2" - "@typescript-eslint/types" "4.28.2" - "@typescript-eslint/typescript-estree" "4.28.2" + "@typescript-eslint/scope-manager" "4.28.3" + "@typescript-eslint/types" "4.28.3" + "@typescript-eslint/typescript-estree" "4.28.3" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/parser@^4.28.2": - version "4.28.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.2.tgz#6aff11bf4b91eb67ca7517962eede951e9e2a15d" - integrity sha512-Q0gSCN51eikAgFGY+gnd5p9bhhCUAl0ERMiDKrTzpSoMYRubdB8MJrTTR/BBii8z+iFwz8oihxd0RAdP4l8w8w== +"@typescript-eslint/parser@^4.28.3": + version "4.28.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.3.tgz#95f1d475c08268edffdcb2779993c488b6434b44" + integrity sha512-ZyWEn34bJexn/JNYvLQab0Mo5e+qqQNhknxmc8azgNd4XqspVYR5oHq9O11fLwdZMRcj4by15ghSlIEq+H5ltQ== dependencies: - "@typescript-eslint/scope-manager" "4.28.2" - "@typescript-eslint/types" "4.28.2" - "@typescript-eslint/typescript-estree" "4.28.2" + "@typescript-eslint/scope-manager" "4.28.3" + "@typescript-eslint/types" "4.28.3" + "@typescript-eslint/typescript-estree" "4.28.3" debug "^4.3.1" -"@typescript-eslint/scope-manager@4.28.2": - version "4.28.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.2.tgz#451dce90303a3ce283750111495d34c9c204e510" - integrity sha512-MqbypNjIkJFEFuOwPWNDjq0nqXAKZvDNNs9yNseoGBB1wYfz1G0WHC2AVOy4XD7di3KCcW3+nhZyN6zruqmp2A== +"@typescript-eslint/scope-manager@4.28.3": + version "4.28.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.3.tgz#c32ad4491b3726db1ba34030b59ea922c214e371" + integrity sha512-/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ== dependencies: - "@typescript-eslint/types" "4.28.2" - "@typescript-eslint/visitor-keys" "4.28.2" + "@typescript-eslint/types" "4.28.3" + "@typescript-eslint/visitor-keys" "4.28.3" -"@typescript-eslint/types@4.28.2": - version "4.28.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.2.tgz#e6b9e234e0e9a66c4d25bab881661e91478223b5" - integrity sha512-Gr15fuQVd93uD9zzxbApz3wf7ua3yk4ZujABZlZhaxxKY8ojo448u7XTm/+ETpy0V0dlMtj6t4VdDvdc0JmUhA== +"@typescript-eslint/types@4.28.3": + version "4.28.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.3.tgz#8fffd436a3bada422c2c1da56060a0566a9506c7" + integrity sha512-kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA== -"@typescript-eslint/typescript-estree@4.28.2": - version "4.28.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.2.tgz#680129b2a285289a15e7c6108c84739adf3a798c" - integrity sha512-86lLstLvK6QjNZjMoYUBMMsULFw0hPHJlk1fzhAVoNjDBuPVxiwvGuPQq3fsBMCxuDJwmX87tM/AXoadhHRljg== +"@typescript-eslint/typescript-estree@4.28.3": + version "4.28.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz#253d7088100b2a38aefe3c8dd7bd1f8232ec46fb" + integrity sha512-YAb1JED41kJsqCQt1NcnX5ZdTA93vKFCMP4lQYG6CFxd0VzDJcKttRlMrlG+1qiWAw8+zowmHU1H0OzjWJzR2w== dependencies: - "@typescript-eslint/types" "4.28.2" - "@typescript-eslint/visitor-keys" "4.28.2" + "@typescript-eslint/types" "4.28.3" + "@typescript-eslint/visitor-keys" "4.28.3" debug "^4.3.1" globby "^11.0.3" is-glob "^4.0.1" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/visitor-keys@4.28.2": - version "4.28.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.2.tgz#bf56a400857bb68b59b311e6d0a5fbef5c3b5130" - integrity sha512-aT2B4PLyyRDUVUafXzpZFoc0C9t0za4BJAKP5sgWIhG+jHECQZUEjuQSCIwZdiJJ4w4cgu5r3Kh20SOdtEBl0w== +"@typescript-eslint/visitor-keys@4.28.3": + version "4.28.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz#26ac91e84b23529968361045829da80a4e5251c4" + integrity sha512-ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg== dependencies: - "@typescript-eslint/types" "4.28.2" + "@typescript-eslint/types" "4.28.3" eslint-visitor-keys "^2.0.0" "@vant/icons@^1.6.0": @@ -819,20 +809,20 @@ integrity sha512-Om6e8kCAnmk/q8byngKreff7Hyn6XxwOGr8yedP3y3LEVoE+iyj8/+Mn+AYvGEQ00GK0MlgAfyaV4emXAYj1Hw== "@vant/use@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@vant/use/-/use-1.1.2.tgz#d35265e05df88a47b04196a308efb5e89e44ca10" - integrity sha512-s4YO6zqJ3NlGeAZ104exb0c/KvlXB908pOhWhCyhfedVBn1eBnKH401ildK0sttazmq0CH8jme6mnw2ZzZvutw== + version "1.2.0" + resolved "https://registry.yarnpkg.com/@vant/use/-/use-1.2.0.tgz#c762c85aa5beda8e847ed553793acad7bfde2d07" + integrity sha512-pTVK/r0of/80n4j74F7AlbdXGM8AUAQjtRSZDV+x5hPkJNrlgGZGsfNxXGYOIHluwFx4l5sKAYwst2rtMJk+wQ== -"@vitejs/plugin-legacy@^1.4.3": - version "1.4.3" - resolved "https://registry.yarnpkg.com/@vitejs/plugin-legacy/-/plugin-legacy-1.4.3.tgz#d022275d08e6f1f777891fb405816a9dd41a9f1f" - integrity sha512-lxZUJaMWYMQuqvZM1wPzDP6KABQgA/drVL5fnaygEPcz9adc2OHhfFNN/SvvHQ1V0rP8gybIc7uA+iI1gAdkVQ== +"@vitejs/plugin-legacy@^1.4.4": + version "1.4.4" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-legacy/-/plugin-legacy-1.4.4.tgz#a13bcfdf053f219fd8db6199e0d19c87b3d12994" + integrity sha512-pVYeQUDPG5InWwrTu7acy187WWjGonJnL/GMqMLmeKCFiwkZ6UcsoUjojiKmCUI0nAJTrrKH5lhjTqkccY9Iow== dependencies: "@babel/standalone" "^7.14.7" - core-js "^3.15.1" + core-js "^3.15.2" magic-string "^0.25.7" regenerator-runtime "^0.13.7" - systemjs "^6.10.1" + systemjs "^6.10.2" "@vitejs/plugin-vue-jsx@^1.1.6": version "1.1.6" @@ -846,18 +836,18 @@ "@vue/babel-plugin-jsx" "^1.0.6" hash-sum "^2.0.0" -"@vitejs/plugin-vue@^1.2.4": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.2.4.tgz#a7aa6e6a31c556a8b781de730316deeecf7f56f2" - integrity sha512-D/3H9plevPQGgQGwmV6eecvOnooLTecPR63HPffVVWPEhbfvmtYLWgznzs456NBb2DItiRTCIa1yWxvGqC+I8A== +"@vitejs/plugin-vue@^1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.2.5.tgz#ef7dc4a92e53fe866b54bcc1266788513262ac09" + integrity sha512-GIR31mdXTEfvElmBUaRhDc5v7lfdkEdawWQqJRiaRL/5qKsH+xusukglkvJz5y7+c6dEpxgmvcATv2BbB7+fzQ== -"@volar/code-gen@^0.25.26": - version "0.25.26" - resolved "https://registry.yarnpkg.com/@volar/code-gen/-/code-gen-0.25.26.tgz#44294b71451df317be29f26263c9aec6c6132101" - integrity sha512-PuUahRMRQForfBZpmlW/f/UdftTBIhGNpV81k9cQtM//nFOPN3Jvq4QUNLjFiO/D/o+0jNItSJKIadp6tkV0Ag== +"@volar/code-gen@^0.25.28": + version "0.25.28" + resolved "https://registry.yarnpkg.com/@volar/code-gen/-/code-gen-0.25.28.tgz#beb2892c921b6d0711a578d993e02c50cf846448" + integrity sha512-kbAsgpY1U6nEOs7OX5p8zcZy1Srp3JJLuZvXFYJLNxbciNkQ6g2RSDTdlYq5T6gTGPAhyOakB5LEcrTMiM84yA== dependencies: - "@volar/shared" "^0.25.26" - "@volar/source-map" "^0.25.26" + "@volar/shared" "^0.25.28" + "@volar/source-map" "^0.25.28" "@volar/html2pug@^0.25.4": version "0.25.4" @@ -869,27 +859,27 @@ htmlparser2 "^6.1.0" pug "^3.0.2" -"@volar/shared@^0.25.26": - version "0.25.26" - resolved "https://registry.yarnpkg.com/@volar/shared/-/shared-0.25.26.tgz#90c8d4549f2512d24d800307dfe4951093148cb6" - integrity sha512-jdW2WFwhGoQNnxURMfHlYdXuMoR9TzgnYaG6J17yEqjkVsMbw6MfqLPXp9NOe+lpwi2UM9IMrdWgVpVkD7grjA== +"@volar/shared@^0.25.28": + version "0.25.28" + resolved "https://registry.yarnpkg.com/@volar/shared/-/shared-0.25.28.tgz#c7f635f7045b413e89edcf2ea8c92063abe1e932" + integrity sha512-f2nHQGdJqhnb9E+HaI0uFBPIBQ2n5m5e4mgT4+FIYpZqeN7wSkjkkoBfHMdfLtJ7B5HSUvPD4H61waaeD34ULQ== dependencies: upath "^2.0.1" vscode-languageserver "^7.1.0-next.4" -"@volar/source-map@^0.25.26": - version "0.25.26" - resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-0.25.26.tgz#fdf47a407b7d3f7383ebc6ac87c70eafda1648c9" - integrity sha512-voPURNnlvbm7aFze0fXTO7GAbjZL0sBH/ioLZ3Wj+GZ9NoDL5vCC3jrddA3FcFHyHH1Yw9tXToPLb2Q11VkIag== +"@volar/source-map@^0.25.28": + version "0.25.28" + resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-0.25.28.tgz#76756d017270030f7e0e221ae5f997e43b7a0c90" + integrity sha512-QUoAMt+UPY7lUCC09AlAG/kyje0A87kDEkQwoRBK81zUVt1tuI8qZ7kV0gy/PiBv/bWEoB27po/qhX0n2m/YgQ== dependencies: - "@volar/shared" "^0.25.26" + "@volar/shared" "^0.25.28" -"@volar/transforms@^0.25.26": - version "0.25.26" - resolved "https://registry.yarnpkg.com/@volar/transforms/-/transforms-0.25.26.tgz#a23b31e6b06a2195bbaea82392c3b08da08a8ca5" - integrity sha512-3rzOabA96s+YmPUIWnRxIlyOqXRk2Pmlk8StMOKAB9o7QEt0jlVFW8jATEXrGJPcUrKyWo/cVXO06RlEETwB8w== +"@volar/transforms@^0.25.28": + version "0.25.28" + resolved "https://registry.yarnpkg.com/@volar/transforms/-/transforms-0.25.28.tgz#c0f71bdd31fc7508bce8ea916dac968e34befc0d" + integrity sha512-XS2NOotfvdSD9skY/Um1KjJmiT4ee32sn6j75ryVx+m8Tj0ox3WFo18DXktJMrSWbZ3E+AEQPE/x9uWyu06Kng== dependencies: - "@volar/shared" "^0.25.26" + "@volar/shared" "^0.25.28" "@vue/babel-helper-vue-transform-on@^1.0.2": version "1.0.2" @@ -1056,9 +1046,9 @@ JSONStream@^1.0.4: through ">=2.2.7 <3" acorn-jsx@^5.2.0, acorn-jsx@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" - integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn@^7.1.1, acorn@^7.4.0: version "7.4.1" @@ -1478,9 +1468,9 @@ camelcase@^6.0.0: integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219: - version "1.0.30001242" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001242.tgz#04201627abcd60dc89211f22cbe2347306cda46b" - integrity sha512-KvNuZ/duufelMB3w2xtf9gEWCSxJwUgoxOx5b6ScLXC4kPc9xsczUVCPrQU26j5kOsHM4pSUL54tAZt5THQKug== + version "1.0.30001243" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz#d9250155c91e872186671c523f3ae50cfc94a3aa" + integrity sha512-vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA== capital-case@^1.0.4: version "1.0.4" @@ -1840,7 +1830,7 @@ cookie@^0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== -core-js@^3.15.1: +core-js@^3.15.2: version "3.15.2" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61" integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q== @@ -1953,12 +1943,7 @@ dargs@^7.0.0: resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg== -dayjs@1.x: - version "1.10.5" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.5.tgz#5600df4548fc2453b3f163ebb2abbe965ccfb986" - integrity sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g== - -dayjs@^1.10.6: +dayjs@1.x, dayjs@^1.10.6: version "1.10.6" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63" integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw== @@ -2175,9 +2160,9 @@ editor@1.0.0: integrity sha1-YMf4e9YrzGqJT6jM1q+3gjok90I= electron-to-chromium@^1.3.723: - version "1.3.766" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.766.tgz#2fd14a4e54f77665872f4e23fcf4968e83638220" - integrity sha512-u2quJ862q9reRKh/je3GXis3w38+RoXH1J9N3XjtsS6NzmUAosNsyZgUVFZPN/ZlJ3v6T0rTyZR3q/J5c6Sy5w== + version "1.3.774" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.774.tgz#4d6661a23119e35151646c9543b346bb3beca423" + integrity sha512-Fggh17Q1yyv1uMzq8Qn1Ci58P50qcRXMXd2MBcB9sxo6rJxjUutWcNw8uCm3gFWMdcblBO6mDT5HzX/RVRRECA== element-plus@1.0.2-beta.54: version "1.0.2-beta.54" @@ -2301,9 +2286,9 @@ es6-promisify@^5.0.0: es6-promise "^4.0.3" esbuild@^0.12.8: - version "0.12.14" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.14.tgz#43157dbd0b36d939247d4eb4909a4886ac40f82e" - integrity sha512-z8p+6FGiplR7a3pPonXREbm+8IeXjBGvDpVidZmGB/AJMsJSfGCU+n7KOMCazA9AwvagadRWBhiKorC0w9WJvw== + version "0.12.15" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.15.tgz#9d99cf39aeb2188265c5983e983e236829f08af0" + integrity sha512-72V4JNd2+48eOVCXx49xoSWHgC3/cCy96e7mbXKY+WOWghN00cCmlGnwVLRhRHorvv0dgCyuMYBZlM2xDM5OQw== escalade@^3.1.1: version "3.1.1" @@ -2596,9 +2581,9 @@ fast-diff@^1.1.2: integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== fast-glob@^3.1.1, fast-glob@^3.2.5, fast-glob@^3.2.6: - version "3.2.6" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.6.tgz#434dd9529845176ea049acc9343e8282765c6e1a" - integrity sha512-GnLuqj/pvQ7pX8/L4J84nijv6sAnlwvSDpMkJi9i7nPmPxGtRPkBSStfvDW5l6nMdX9VWe+pkKWFTgD+vF2QSQ== + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -2748,9 +2733,9 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.0.tgz#da07fb8808050aba6fdeac2294542e5043583f05" - integrity sha512-XprP7lDrVT+kE2c2YlfiV+IfS9zxukiIOvNamPNsImNhXadSsQEbosItdL9bUQlCZXR13SvPk20BjWSWLA7m4A== + version "3.2.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz#bbef080d95fca6709362c73044a1634f7c6e7d05" + integrity sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg== fn-name@^2.0.1: version "2.0.1" @@ -2977,9 +2962,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.6.0, globals@^13.9.0: - version "13.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" - integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== + version "13.10.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.10.0.tgz#60ba56c3ac2ca845cfbf4faeca727ad9dd204676" + integrity sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g== dependencies: type-fest "^0.20.2" @@ -3662,7 +3647,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2: +json5@^2.1.2, json5@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== @@ -3750,10 +3735,10 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -lint-staged@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.0.0.tgz#24d0a95aa316ba28e257f5c4613369a75a10c712" - integrity sha512-3rsRIoyaE8IphSUtO1RVTFl1e0SLBtxxUOPBtHxQgBHS5/i6nqvjcUfNioMa4BU9yGnPzbO+xkfLtXtxBpCzjw== +lint-staged@^11.0.1: + version "11.0.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.0.1.tgz#1b8ae8ed5a52ed87252db95fe008c2618c85f55a" + integrity sha512-RkTA1ulE6jAGFskxpGAwxfVRXjHp7D9gFg/+KMARUWMPiVFP0t28Em2u0gL8sA0w3/ck3TC57F2v2RNeQ5XPnw== dependencies: chalk "^4.1.1" cli-truncate "^2.1.0" @@ -4327,9 +4312,9 @@ object-assign@^4.0.1, object-assign@^4.1.1: integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= object-inspect@^1.10.3, object-inspect@^1.9.0: - version "1.10.3" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369" - integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw== + version "1.11.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" @@ -5280,9 +5265,9 @@ rimraf@~2.6.2: glob "^7.1.3" rollup@^2.38.5: - version "2.52.7" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.52.7.tgz#e15a8bf734f6e4c204b7cdf33521151310250cb2" - integrity sha512-55cSH4CCU6MaPr9TAOyrIC+7qFCHscL7tkNsm1MBfIJRRqRbCEY0mmeFn4Wg8FKsHtEH8r389Fz38r/o+kgXLg== + version "2.53.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.53.1.tgz#b60439efd1eb41bdb56630509bd99aae78b575d3" + integrity sha512-yiTCvcYXZEulNWNlEONOQVlhXA/hgxjelFSjNcrwAAIfYx/xqjSHwqg/cCaWOyFRKr+IQBaXwt723m8tCaIUiw== optionalDependencies: fsevents "~2.3.2" @@ -5796,7 +5781,7 @@ svg-tags@^1.0.0: resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= -systemjs@^6.10.1: +systemjs@^6.10.2: version "6.10.2" resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-6.10.2.tgz#c9870217bddf9cfd25d12d4fcd1989541ef1207c" integrity sha512-PwaC0Z6Y1E6gFekY2u38EC5+5w2M65jYVrD1aAcOptpHVhCwPIwPFJvYJyryQKUyeuQ5bKKI3PBHWNjdE9aizg== @@ -5928,12 +5913,11 @@ trough@^1.0.0: integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== tsconfig-paths@^3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" - integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + version "3.10.1" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7" + integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q== dependencies: - "@types/json5" "^0.0.29" - json5 "^1.0.1" + json5 "^2.2.0" minimist "^1.2.0" strip-bom "^3.0.0" @@ -6377,10 +6361,10 @@ vite-plugin-windicss@^1.2.4: debug "^4.3.2" windicss "^3.1.4" -vite@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/vite/-/vite-2.4.1.tgz#2e48b8dbfc69e4edbf7f4d1c0798d621585cb8da" - integrity sha512-4BpKRis9uxIqPfIEcJ18LTBsamqnDFxTx45CXwagHjNltHa6PFEvf8Pe6OpgIHb0OyWT30OXOSSQvdOaX4OBiQ== +vite@2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/vite/-/vite-2.4.2.tgz#07d00615775c808530bc9f65641062b349b67929" + integrity sha512-2MifxD2I9fjyDmmEzbULOo3kOUoqX90A58cT6mECxoVQlMYFuijZsPQBuA14mqSwvV3ydUsqnq+BRWXyO9Qa+w== dependencies: esbuild "^0.12.8" postcss "^8.3.5" @@ -6417,9 +6401,9 @@ vscode-emmet-helper@^2.6.4: vscode-uri "^2.1.2" vscode-html-languageservice@^4.0.4: - version "4.0.6" - resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-4.0.6.tgz#c0a538077eb491730f49a47ab13ed7991bd8a45a" - integrity sha512-p1VK0+7JLzBFfbUrENm3QcBNbDzJUVhVnXOxHdC9XmgcubQBUINyzNeYio93srOafjRMQcJmzugB4vfmUnbCQg== + version "4.0.7" + resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-4.0.7.tgz#94f2ed22c821965f828222d13b5aa541b358d992" + integrity sha512-P5TQMYpgxAdLs+PwpC7Lm+0lXCyQAC6kZ41YuPYNHVooC4XO7Y2+ncHBcQJVK4C9LU2cTOAl0lzq4WAxuwRHYw== dependencies: vscode-languageserver-textdocument "^1.0.1" vscode-languageserver-types "^3.16.0" @@ -6483,26 +6467,26 @@ vscode-nls@^5.0.0: resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840" integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA== -vscode-pug-languageservice@^0.25.26: - version "0.25.26" - resolved "https://registry.yarnpkg.com/vscode-pug-languageservice/-/vscode-pug-languageservice-0.25.26.tgz#cbe9b702637b94ee6ab90eac450adda5ae13b4c8" - integrity sha512-5916Fu1ZQyLcUAvTnqk3BRwbIdlasHwhjdl9ln6686ZldhoXBBW7NRNlJ//N7tJcVJ3q03W7SPPfhDTiPk4ZRQ== +vscode-pug-languageservice@^0.25.28: + version "0.25.28" + resolved "https://registry.yarnpkg.com/vscode-pug-languageservice/-/vscode-pug-languageservice-0.25.28.tgz#2e4e7d07b72ef6fc9f918e22b899d77aa54f56b2" + integrity sha512-4zt0Tn+uW9WOTu6YLl6NhYjtdRD91EbpEUtiYqquV9f+U0I1JxkScWgyTomw04ZaUK8yoPC6q/S1oGnaCNaWPg== dependencies: - "@volar/code-gen" "^0.25.26" - "@volar/shared" "^0.25.26" - "@volar/source-map" "^0.25.26" - "@volar/transforms" "^0.25.26" + "@volar/code-gen" "^0.25.28" + "@volar/shared" "^0.25.28" + "@volar/source-map" "^0.25.28" + "@volar/transforms" "^0.25.28" pug-beautify "^0.1.1" pug-lexer "^5.0.1" pug-parser "^6.0.0" vscode-languageserver "^7.1.0-next.4" -vscode-typescript-languageservice@^0.25.26: - version "0.25.26" - resolved "https://registry.yarnpkg.com/vscode-typescript-languageservice/-/vscode-typescript-languageservice-0.25.26.tgz#c9976a2df48431a133d66e518a8a4473a7cc63e8" - integrity sha512-+lLUGWq0mAZooeZfE6PRhlvKb7O3p7ouwQGEwXVy0DbIZIAb5rRmYNCbh+qHk632CJiS7ZIrMZBmFYiEg4Bqow== +vscode-typescript-languageservice@^0.25.28: + version "0.25.28" + resolved "https://registry.yarnpkg.com/vscode-typescript-languageservice/-/vscode-typescript-languageservice-0.25.28.tgz#61e0802fdfb2ff18c92f1f597981914fcad7add5" + integrity sha512-lj85GVcVKCTVtD3XJJ737PDjw343uOiQuR8qfeZlCPf9N3zVRMWJfUL5FQRhoqoDo0o46jihy+jrDGurtmq6ow== dependencies: - "@volar/shared" "^0.25.26" + "@volar/shared" "^0.25.28" typescript-vscode-sh-plugin "^0.6.14" upath "^2.0.1" vscode-languageserver "^7.1.0-next.4" @@ -6519,16 +6503,16 @@ vscode-uri@^3.0.2: integrity sha512-jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA== vscode-vue-languageservice@^0.25.22: - version "0.25.26" - resolved "https://registry.yarnpkg.com/vscode-vue-languageservice/-/vscode-vue-languageservice-0.25.26.tgz#eeb8fbe992b9a41e0c9e65f53cfcbc669e35758e" - integrity sha512-CrqsAANPZFiOoPD7fmWrr2+yJMisLIdlm43MHzXk2IgN/0K5AwPj93n3LgNeNVRI96rvZXhvWC+H9XFZvJDHnw== + version "0.25.28" + resolved "https://registry.yarnpkg.com/vscode-vue-languageservice/-/vscode-vue-languageservice-0.25.28.tgz#29f313eafae7270d2b94db2ccfe27311d822723c" + integrity sha512-7tH2TCCGxY79exA+wBRZaVdNgocSEH+1+OccP8j6g4Sx58i3Kxh5DDEiKeC85zYXQ5E9XdiB+mMcVDokR4fBmQ== dependencies: "@starptech/prettyhtml" "^0.10.0" - "@volar/code-gen" "^0.25.26" + "@volar/code-gen" "^0.25.28" "@volar/html2pug" "^0.25.4" - "@volar/shared" "^0.25.26" - "@volar/source-map" "^0.25.26" - "@volar/transforms" "^0.25.26" + "@volar/shared" "^0.25.28" + "@volar/source-map" "^0.25.28" + "@volar/transforms" "^0.25.28" "@vue/compiler-dom" "^3.0.11" "@vue/compiler-sfc" "^3.0.11" "@vue/reactivity" "^3.0.11" @@ -6543,13 +6527,13 @@ vscode-vue-languageservice@^0.25.22: vscode-json-languageservice "^4.1.4" vscode-languageserver "^7.1.0-next.4" vscode-languageserver-textdocument "^1.0.1" - vscode-pug-languageservice "^0.25.26" - vscode-typescript-languageservice "^0.25.26" + vscode-pug-languageservice "^0.25.28" + vscode-typescript-languageservice "^0.25.28" vue-demi@*: - version "0.9.1" - resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.9.1.tgz#25d6e1ebd4d4010757ff3571e2bf6a1d7bf3de82" - integrity sha512-7s1lufRD2l369eFWPjgLvhqCRk0XzGWJsQc7K4q+0mZtixyGIvsK1Cg88P4NcaRIEiBuuN4q1NN4SZKFKwQswA== + version "0.10.1" + resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.10.1.tgz#229b81395510f02f4ee255344557a12cc0120930" + integrity sha512-L6Oi+BvmMv6YXvqv5rJNCFHEKSVu7llpWWJczqmAQYOdmPPw5PNYoz1KKS//Fxhi+4QP64dsPjtmvnYGo1jemA== vue-eslint-parser@^7.8.0: version "7.8.0" @@ -6638,10 +6622,10 @@ widest-line@^2.0.0: dependencies: string-width "^2.1.1" -windicss@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/windicss/-/windicss-3.1.4.tgz#557eaf8e3c08064a309ccb5d887c82c4bce25069" - integrity sha512-3RBcANxdOy/n4dLVT8+0X409sGI+piO06ARbQ8RncxGuYgdw5Ip3hrhGIYajH67lV+tHc7xNVGxj73amOC9N0g== +windicss@^3.1.4, windicss@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/windicss/-/windicss-3.1.5.tgz#e9b6d6adcbc6f6c6e33e6625a3e5923b328f3137" + integrity sha512-sGi2YiN6Bp/vWJS0jlpJhMmh7O2TBQ+yTbL6oqoRXz32q1VKELOUMfF+5pdtVL5uoVnfKf4gOUQs2XKNgU30Lw== with@^7.0.0: version "7.0.2"