From 9bab2fed34566e208e841a2c553528e3c797c090 Mon Sep 17 00:00:00 2001 From: haixin <1875934025@qq.com> Date: Wed, 20 Mar 2024 16:12:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 ++--- packages/editor/package.json | 2 +- packages/editor/src/components/PropsPanel.vue | 2 +- playground/components.d.ts | 43 +++++++++++++++++++ playground/package.json | 2 +- 5 files changed, 51 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 81df7f8..308d05e 100644 --- a/README.md +++ b/README.md @@ -101,11 +101,11 @@ http://localhost:1100/vue-form-design/playground/#/ Pull Request: -Fork 代码! -创建自己的分支: `git checkout -b feat/xxxx` -提交您的修改: `git commit -am 'feat(function): add xxxxx'` -推送您的分支: `git push origin feat/xxxx` -提交 `pull request` +1. Fork 代码! +2. 创建自己的分支: `git checkout -b feat/xxxx` +3. 提交您的修改: `git commit -am 'feat(function): add xxxxx'` +4. 推送您的分支: `git push origin feat/xxxx` +5. 提交 `pull request` ## 核心组件介绍 diff --git a/packages/editor/package.json b/packages/editor/package.json index f573214..fdd2aa1 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,6 +1,6 @@ { "name": "starfish-editor", - "version": "1.1.14", + "version": "1.1.15", "main": "dist/starfish-editor.umd.js", "style": "dist/style.css", "module": "dist/starfish-editor.es.js", diff --git a/packages/editor/src/components/PropsPanel.vue b/packages/editor/src/components/PropsPanel.vue index fb12769..78c27f4 100644 --- a/packages/editor/src/components/PropsPanel.vue +++ b/packages/editor/src/components/PropsPanel.vue @@ -114,7 +114,7 @@ export default defineComponent({ components: { ControllEditSize, jsonEnter: defineAsyncComponent({ - loader: () => import("@/common/Loading.vue"), + loader: () => import("./jsonEditor.vue"), loadingComponent: Loading, }), globalFormComponent: defineAsyncComponent({ diff --git a/playground/components.d.ts b/playground/components.d.ts index 0d60187..31978d4 100644 --- a/playground/components.d.ts +++ b/playground/components.d.ts @@ -7,11 +7,54 @@ export {} declare module 'vue' { export interface GlobalComponents { + ElAlert: typeof import('element-plus/es')['ElAlert'] + ElAside: typeof import('element-plus/es')['ElAside'] ElButton: typeof import('element-plus/es')['ElButton'] + ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] + ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] + ElCol: typeof import('element-plus/es')['ElCol'] + ElCollapse: typeof import('element-plus/es')['ElCollapse'] + ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] + ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] + ElContainer: typeof import('element-plus/es')['ElContainer'] + ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] + ElDivider: typeof import('element-plus/es')['ElDivider'] + ElDrawer: typeof import('element-plus/es')['ElDrawer'] + ElDropdown: typeof import('element-plus/es')['ElDropdown'] + ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] + ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] + ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElFooter: typeof import('element-plus/es')['ElFooter'] + ElForm: typeof import('element-plus/es')['ElForm'] + ElFormItem: typeof import('element-plus/es')['ElFormItem'] + ElHeader: typeof import('element-plus/es')['ElHeader'] + ElIcon: typeof import('element-plus/es')['ElIcon'] + ElInput: typeof import('element-plus/es')['ElInput'] + ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] + ElMain: typeof import('element-plus/es')['ElMain'] + ElOption: typeof import('element-plus/es')['ElOption'] + ElRadio: typeof import('element-plus/es')['ElRadio'] + ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] + ElRow: typeof import('element-plus/es')['ElRow'] + ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] + ElSelect: typeof import('element-plus/es')['ElSelect'] + ElSlider: typeof import('element-plus/es')['ElSlider'] + ElSwitch: typeof import('element-plus/es')['ElSwitch'] + ElTable: typeof import('element-plus/es')['ElTable'] + ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] + ElTabPane: typeof import('element-plus/es')['ElTabPane'] + ElTabs: typeof import('element-plus/es')['ElTabs'] + ElTimeSelect: typeof import('element-plus/es')['ElTimeSelect'] + ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTree: typeof import('element-plus/es')['ElTree'] + ElUpload: typeof import('element-plus/es')['ElUpload'] Form: typeof import('./src/components/Form.vue')['default'] Home: typeof import('./src/components/Home.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] } + export interface ComponentCustomProperties { + vLoading: typeof import('element-plus/es')['ElLoadingDirective'] + } } diff --git a/playground/package.json b/playground/package.json index aa2f922..f9daa74 100644 --- a/playground/package.json +++ b/playground/package.json @@ -11,7 +11,7 @@ "dependencies": { "@element-plus/icons-vue": "^2.0.8", "element-plus": "^2.2.12", - "starfish-editor": "^1.1.14", + "starfish-editor": "^1.1.15", "starfish-form": "^1.2.8", "vite": "^4.5.2", "vue": "^3.2.37",