Merge branch 'dev' into build

# Conflicts: # package.json # project/dv/apps/AppGridDV.vue
2022-08-22 18:07:04 +08:00
parent 4bb6e3be77 f0edad2b97
commit 59542c73b3
8 changed files with 242 additions and 455 deletions
--- a/package.json
+++ b/package.json
@@ -28,7 +28,6 @@
    "sortablejs": "^1.12.0",
    "vue-draggable-resizable": "^2.3.0",
    "vue-json-editor": "^1.4.3",
-    "vue-okr-tree": "~1.0.10",
    "vue-ruler-tool": "^1.2.4",
    "vuedraggable": "^2.24.3"
  },