完善功能

package-lock.json

@@ -1,15 +1,15 @@
 {
   "name": "ddei-editor",
-  "version": "1.2.41-54",
+  "version": "1.2.41-66",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ddei-editor",
-      "version": "1.2.41-54",
+      "version": "1.2.41-66",
       "license": "Apache License 2.0",
       "dependencies": {
-        "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.41-54.tgz"
+        "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.41-66.tgz"
       },
       "devDependencies": {
         "@tsconfig/node18": "^18.2.0",
@@ -518,9 +518,9 @@
       "integrity": "sha512-tdMuLdcJyreope1BWfnYqTQaIkSIrU/KtY9yX5mNGd+tYeJ0Y99ARHDuYnEABPX/8yh/r0Kl169v5ODg2vr98g=="
     },
     "node_modules/ddei-framework": {
-      "version": "1.2.41-54",
+      "version": "1.2.41-66",
-      "resolved": "file:../ddei-framework/ddei-framework-1.2.41-54.tgz",
+      "resolved": "file:../ddei-framework/ddei-framework-1.2.41-66.tgz",
-      "integrity": "sha512-VIMSVAtsftX93lCLtxMyOmCQHWCnw8cpEDkuFeZ+h4DyREX/zrxxfKa0Yy9rYyhqYgS3XTFJg5pF1yo144+dxQ==",
+      "integrity": "sha512-o/qcB+r/aw8pRtjnBN8CyDMP8ouc6FBBPRgOOnS9LVP4wyJpzojon8Iz67cfHTPWEuC+4ksMGPrb5IbO6pGtaw==",
       "license": "Apache License 2.0",
       "dependencies": {
         "ddei-autolink": "^1.1.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddei-editor",
-  "version": "1.2.41-54",
+  "version": "1.2.41-66",
   "private": false,
   "type": "module",
   "author": "hoslay <3697355039@qq.com>",
@@ -49,7 +49,7 @@
     "type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false"
   },
   "dependencies": {
-     "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.41-54.tgz"
+     "ddei-framework": "file:///Users/hoslay/work/ddei/ddei-framework/ddei-framework-1.2.41-66.tgz"
   },
   "devDependencies": {
     "@tsconfig/node18": "^18.2.0",

plugins/core/controls/control/base/line.ts

@@ -246,5 +246,11 @@ export default {
     },
 
 
-  ]
+  ],
+
+  filters:{
+    LINE_OBI_FILTER: (model, params)=>{
+      return false
+    }
+  }
 }

plugins/core/hotkeys/actions/key-action-remove-models.ts

@@ -86,7 +86,6 @@ class DDeiKeyActionRemoveModels extends DDeiKeyAction {
           ddInstance.bus.push(DDeiEnumBusCommandType.RefreshShape);
 
           ddInstance.bus.executeAll();
-          DDeiUtil.invokeCallbackFunc("EVENT_CONTROL_DEL_AFTER", DDeiEnumOperateType.DEL, { models: Array.from(selectedModels.values()) }, ddInstance, evt)
         }
       }
     }

src/editor/grouputil.ts

@@ -1,6 +1,7 @@
 import {DDeiEditorArrtibute} from 'ddei-framework';
 import { cloneDeep } from 'lodash'
 import {DDeiUtil} from 'ddei-framework';
+import { markRaw } from "vue"
 
 const ToDefaultPropertys = ["fill.type", "fill.color", "fill.image", "fill.opacity", "border.type", "border.color", "borderOpacity", "borderWidth", "borderDash", "borderRound",
   "font.family", "font.size", "font.color", "fontAlign", "textStyle.feed"
@@ -48,6 +49,7 @@ const parseAttrsToGroup = function (control) {
 }
 
 const loadControlByFrom = function (controlOriginDefinies: Map<string, object>, control: object) {
+  
   if (control.from && !control.def) {
     
     let fromControl = controlOriginDefinies.get(control.from)
@@ -58,6 +60,7 @@ const loadControlByFrom = function (controlOriginDefinies: Map<string, object>,
     control.groups = cloneDeep(fromControl.groups)
     let fromMenus = cloneDeep(fromControl.menus)
     let fromDefine = cloneDeep(fromControl.define)
+    let fromFilters = cloneDeep(fromControl.filters)
     //合并控件自身与from组件的define、menu
     if (fromDefine) {
       if (!control.define) {
@@ -68,6 +71,18 @@ const loadControlByFrom = function (controlOriginDefinies: Map<string, object>,
           control.define[i] = fromDefine[i]
         }
       }
+      
+    }
+    if (fromFilters){
+      if (!control.filters) {
+        control.filters = fromFilters
+      }else{
+        for (let k in fromFilters){
+          if (!control.filters[k]){
+            control.filters[k] = fromFilters[k]
+          }
+        }
+      }
     }
     //处理ext
     if (control.define?.ext) {
@@ -199,10 +214,15 @@ const loadControlByFrom = function (controlOriginDefinies: Map<string, object>,
     }
     
     
+   
 
+    
 
     controlOriginDefinies.set(control.id, control);
   }
+  if (control.viewer) {
+    control.viewer = markRaw(control.viewer)
+  }
   parseAttrsToGroup(control)
   control.def = true;
 };