diff --git a/index.html b/index.html index 71e777c..e2cd81b 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - DDei-在线设计器V1.2.44 + DDei-在线设计器V1.2.45
diff --git a/package-lock.json b/package-lock.json index 17812bd..8f3c42a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,19 +1,21 @@ { "name": "ddei-editor", - "version": "1.2.45-14", + "version": "1.2.45-alpha", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ddei-editor", - "version": "1.2.45-14", + "version": "1.2.45-alpha", "license": "Apache License 2.0", + "dependencies": { + "ddei-framework": "^1.2.45-alpha" + }, "devDependencies": { "@tsconfig/node18": "^18.2.0", "@types/node": "^18.17.6", "@vitejs/plugin-vue": "^4.2.3", "@vue/tsconfig": "^0.4.0", - "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.45-14.tgz", "less": "^4.2.0", "npm-run-all": "^4.1.5", "typescript": "~5.1.6", @@ -496,11 +498,9 @@ } }, "node_modules/ddei-framework": { - "version": "1.2.45-14", - "resolved": "file:../ddei-framework/ddei-framework-1.2.45-14.tgz", - "integrity": "sha512-sumYFhlaVt/3NunO0i1h5aLzfCgMgF/YaUsNh/P2b5hg0dYIEY69O2O2LDD+IXRfFfPND0belKrwcfm1vzs3UA==", - "dev": true, - "license": "Apache License 2.0", + "version": "1.2.45-alpha", + "resolved": "https://registry.npmjs.org/ddei-framework/-/ddei-framework-1.2.45-alpha.tgz", + "integrity": "sha512-/HVK3syV4jZXciW5UcOGVNEj+5Q8pXMeLtn+M05HRMoNGdYF5waJiI5cZTIc9cQ4rJyU0qfCbwo5LPdJuvw2wQ==", "engines": { "node": ">=16.0.0" } diff --git a/package.json b/package.json index 2c24175..f6c5e3b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ddei-editor", - "version": "1.2.45-14", + "version": "1.2.45-alpha", "private": false, "type": "module", "author": "hoslay <3697355039@qq.com>", @@ -48,9 +48,6 @@ "preview": "vite preview", "build-only": "vite build", "type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false" - }, - "dependencies": { - }, "devDependencies": { "@tsconfig/node18": "^18.2.0", @@ -63,6 +60,6 @@ "vite": "^4.4.6", "vite-plugin-compression": "^0.5.1", "vue-tsc": "^1.8.6", - "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.45-14.tgz" + "ddei-framework": "^1.2.45-alpha" } } diff --git a/plugins/quickstyle/CanvasQuickDialog.vue b/plugins/quickstyle/CanvasQuickDialog.vue index 2872b4f..5164645 100644 --- a/plugins/quickstyle/CanvasQuickDialog.vue +++ b/plugins/quickstyle/CanvasQuickDialog.vue @@ -2,7 +2,7 @@
-
+
@@ -60,8 +60,12 @@
- -
+ + +
{{ editor.i18n('ddei.brush') }}
+ +
-
+
@@ -90,7 +98,12 @@
{{ editor.i18n('ddei.endPoint') }}
-
+ + +
@@ -117,7 +130,12 @@
{{ editor.i18n('ddei.lineDash') }}
-
+ + +
{{ editor.i18n('ddei.brush') }}
+ +
-
+
@@ -165,7 +187,12 @@
-
+ + +
{{ editor.i18n('ddei.brush') }}
-
+ + +
{{ editor.i18n('ddei.border') }}
-
+ + +
{{ editor.i18n('ddei.pushBottom') }}
-
-
+ + +
{{ editor.i18n('ddei.align') }}
+ +
@@ -277,6 +318,16 @@ export default { }, methods: { + validItemCondition(item) { + if (!item || !item.condition) { + return true; + } else { + let func = new Function("models", "item", "editor", "component", "return " + item.condition) + let rs = func(this.selectedModels, item, this.editor, this) + return rs + } + }, + forceRefreshView: function () { this.forceRefresh = false this.$nextTick(() => { diff --git a/plugins/quickstyle/canvasquickdialog.ts b/plugins/quickstyle/canvasquickdialog.ts index be7223d..5a8e0d2 100644 --- a/plugins/quickstyle/canvasquickdialog.ts +++ b/plugins/quickstyle/canvasquickdialog.ts @@ -7,7 +7,7 @@ class DDeiCoreCanvasQuickDialog extends DDeiPluginBase { /** * 缺省实例 */ - static defaultIns: DDeiCoreCanvasQuickDialog = new DDeiCoreCanvasQuickDialog(null); + static defaultIns: DDeiCoreCanvasQuickDialog = new DDeiCoreCanvasQuickDialog(); plugins: object[] = [CanvasQuickDialog] @@ -44,4 +44,5 @@ class DDeiCoreCanvasQuickDialog extends DDeiPluginBase { } } +export { DDeiCoreCanvasQuickDialog } export default DDeiCoreCanvasQuickDialog \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 7781174..c5df060 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,7 +4,7 @@ import { DDeiCoreToolboxSimplePanel, DDeiCoreTopMenuSimplePanel, DDeiCoreThemeBl import { DDeiExtUML } from "@ddei/uml" import { DDeiExtSearch } from "@ddei/search" import { DDeiFuncCallResult, DDeiUtil, DDeiEditorUtil } from "ddei-framework"; -import DDeiExtQuickStyle from "@ddei/quickstyle" +import {DDeiExtQuickStyle,DDeiCoreCanvasQuickDialog} from "@ddei/quickstyle" import DDeiExtTooltip from "@ddei/tooltip" import { DDeiExtQuickControl, QuickChooseControlDialog } from "@ddei/quickcontrol" import { defineComponent, markRaw } from "vue"; @@ -13,6 +13,7 @@ import ReplaceDivDemo from "./ReplaceDivDemo.vue"; import HtmlTooltipDemo from "./HtmlTooltipDemo.vue"; import {controls as ControlDefinesDemo,groups as GroupDefinesDemo} from "./controldefinesdemo" import TopMenuViewerDemo from "./TopMenuViewerDemo.vue" +import QuickStyleDemo from "./QuickStyleDemo.vue" // import i18nJP from "./langs/ja_JP" export default defineComponent({ @@ -28,12 +29,18 @@ export default defineComponent({ currentLayout = "ddei-core-layout-mobile" }else{ exts = [DDeiExtTooltip, - DDeiExtQuickStyle] + DDeiExtQuickStyle, + DDeiCoreCanvasQuickDialog.configuration({ + changeLevel:{ + viewer:QuickStyleDemo + } + }), + ] } const options = markRaw({ currentLayout: currentLayout, config: { - // ratio: 1.2, //默认缩放比例为120% + ratio: 0.6, //默认缩放比例为120% pixel:2, //调整渲染质量 // readonly:true, // readonly:1, @@ -77,7 +84,13 @@ export default defineComponent({ // } ] - } + }, + + }, + onMounted: (editor) => { + + let file = editor.files[editor.currentFileIndex] + file.sheets[file.currentSheetIndex].stage.mark = {type:1,data:'新值' } }, // i18n: { //国际化配置 // lang: "ja_JP", //强制设定语言，如果不设置则读取浏览器的语言设置 diff --git a/src/QuickStyleDemo.vue b/src/QuickStyleDemo.vue new file mode 100644 index 0000000..8376cc7 --- /dev/null +++ b/src/QuickStyleDemo.vue @@ -0,0 +1,21 @@ + +