From 1f52b5da2112c36a9e20766e0544bcea26966889 Mon Sep 17 00:00:00 2001 From: shangbin Date: Mon, 6 Dec 2021 14:13:00 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E6=B6=88=E9=99=A4=E5=BD=93=E4=B8=8B?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 160 +++++++++++++------------- src/components-v2/VCC.vue | 14 +-- src/components/CodeStructure.vue | 11 +- src/components/JSCodeEditorDialog.vue | 1 + src/components/VueCodeParseDialog.vue | 1 + src/libs/main-panel.js | 7 +- 6 files changed, 94 insertions(+), 100 deletions(-) diff --git a/package-lock.json b/package-lock.json index 635f451..868dde8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1949,6 +1949,44 @@ "webpack-merge": "^4.2.2" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://r.cnpmjs.org/ansi-styles/download/ansi-styles-4.3.0.tgz", + "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://r.cnpmjs.org/chalk/download/chalk-4.1.2.tgz", + "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://r.cnpmjs.org/color-convert/download/color-convert-2.0.1.tgz", + "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://r.cnpmjs.org/color-name/download/color-name-1.1.4.tgz", + "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", + "dev": true, + "optional": true + }, "fs-extra": { "version": "7.0.1", "resolved": "https://r.cnpmjs.org/fs-extra/download/fs-extra-7.0.1.tgz", @@ -1960,6 +1998,13 @@ "universalify": "^0.1.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://r.cnpmjs.org/has-flag/download/has-flag-4.0.0.tgz", + "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", + "dev": true, + "optional": true + }, "jsonfile": { "version": "4.0.0", "resolved": "https://r.cnpmjs.org/jsonfile/download/jsonfile-4.0.0.tgz", @@ -1969,6 +2014,18 @@ "graceful-fs": "^4.1.6" } }, + "loader-utils": { + "version": "2.0.2", + "resolved": "https://r.cnpmjs.org/loader-utils/download/loader-utils-2.0.2.tgz", + "integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "ssri": { "version": "8.0.1", "resolved": "https://r.cnpmjs.org/ssri/download/ssri-8.0.1.tgz", @@ -1978,11 +2035,33 @@ "minipass": "^3.1.1" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://r.cnpmjs.org/supports-color/download/supports-color-7.2.0.tgz", + "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "universalify": { "version": "0.1.2", "resolved": "https://r.cnpmjs.org/universalify/download/universalify-0.1.2.tgz", "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=", "dev": true + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://r.cnpmjs.org/vue-loader/download/vue-loader-16.8.3.tgz", + "integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } } } }, @@ -13213,87 +13292,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://r.cnpmjs.org/vue-loader/download/vue-loader-16.8.3.tgz", - "integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://r.cnpmjs.org/ansi-styles/download/ansi-styles-4.3.0.tgz", - "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://r.cnpmjs.org/chalk/download/chalk-4.1.2.tgz", - "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://r.cnpmjs.org/color-convert/download/color-convert-2.0.1.tgz", - "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://r.cnpmjs.org/color-name/download/color-name-1.1.4.tgz", - "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://r.cnpmjs.org/has-flag/download/has-flag-4.0.0.tgz", - "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.2", - "resolved": "https://r.cnpmjs.org/loader-utils/download/loader-utils-2.0.2.tgz", - "integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://r.cnpmjs.org/supports-color/download/supports-color-7.2.0.tgz", - "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-nestable": { "version": "2.6.0", "resolved": "https://r.cnpmjs.org/vue-nestable/download/vue-nestable-2.6.0.tgz", diff --git a/src/components-v2/VCC.vue b/src/components-v2/VCC.vue index ebe28bb..32f4273 100644 --- a/src/components-v2/VCC.vue +++ b/src/components-v2/VCC.vue @@ -38,14 +38,12 @@ - - - - - + + +
diff --git a/src/components/CodeStructure.vue b/src/components/CodeStructure.vue index da4dc20..9d1f103 100644 --- a/src/components/CodeStructure.vue +++ b/src/components/CodeStructure.vue @@ -12,7 +12,7 @@
- +
@@ -44,14 +44,15 @@ import "./halower-tree.min.css"; import "@/assets/nestable.css" import { isObject, getRawComponentKey, getRawComponentContent } from "@/utils/common"; -import { VueNestable, VueNestableHandle } from 'vue-nestable'; +// import { VueNestable, VueNestableHandle } from 'vue-nestable'; export default { props: ['visible'], + emits: ['codeRefresh', 'onLevelChange', 'remove', 'save', 'update:visible'], components: { AttributeInput: resolve => { require(["./AttributeInput"], resolve) }, - VueNestable, - VueNestableHandle + // VueNestable, + // VueNestableHandle }, data() { diff --git a/src/components/JSCodeEditorDialog.vue b/src/components/JSCodeEditorDialog.vue index d935c88..7d326d0 100644 --- a/src/components/JSCodeEditorDialog.vue +++ b/src/components/JSCodeEditorDialog.vue @@ -18,6 +18,7 @@ import dedent from 'dedent' export default { props: ['codeDialogVisible'], + emits: ['saveJSCode'], components: { // CodeEditor }, diff --git a/src/components/VueCodeParseDialog.vue b/src/components/VueCodeParseDialog.vue index 3a66cc1..1946426 100644 --- a/src/components/VueCodeParseDialog.vue +++ b/src/components/VueCodeParseDialog.vue @@ -20,6 +20,7 @@ import { ergodic, findAObject } from '../utils/common'; export default { props: ['vueDialogVisible'], + emits: ['codeParseSucess', 'update:vueDialogVisible'], components: { CodeEditor }, diff --git a/src/libs/main-panel.js b/src/libs/main-panel.js index d6c56c7..d43e2ea 100644 --- a/src/libs/main-panel.js +++ b/src/libs/main-panel.js @@ -64,13 +64,8 @@ export class MainPanelProvider { let newScript = script.content.replace(/\s*export default\s*/, "") const componentOptions = (new Function(`return ${newScript}`))(); - const render = compile(template.content); - componentOptions.render = function () { - const rootVNode = render.apply(this, arguments); - return rootVNode; - }; - // componentOptions.staticRenderFns = render.staticRenderFns; + componentOptions.template = template.content; // 渲染当前代码 createBaseApp(componentOptions).mount(readyForMoutedElement);