Merge branch 'ww' into 'main'

fix: fix use theme layui style override

See merge request huang/thingskit-drawio!13

@@ -19,6 +19,9 @@
 	<!-- 全局变量 -->
 	<script src="./js/const/const.js"></script>
 
+	<!-- echarts	-->
+	<script src="./js/plugin/echarts/echarts.js"></script>
+
 	<script src="./plugins/axios.min.js"></script>
 <!--	<script src="./js/jquery/jquery-3.3.1.min.js"></script>-->
 <!--	<script src="./js/jquery.easyui.min.js"></script>-->
@@ -37,7 +40,7 @@
 
 	<!-- Axios	-->
 	<script src="./plugins/defHttp.js"></script>
-	
+
 	<script src="./js/api/index.js"></script>
 
 	<!-- act editor -->

+(function () {
+    // Adds Atlassian shapes
+    Sidebar.prototype.addChartsPalette = function () {
+        var s = 'html=1;shadow=0;dashed=0;shape=mxgraph.atlassian.';
+        var s2 = 'html=1;shadow=0;dashed=0;fillColor=none;strokeColor=none;shape=mxgraph.bootstrap.rect;';
+        var s3 = mxConstants.STYLE_STROKEWIDTH + '=1;shadow=0;dashed=0;align=center;html=1;' + mxConstants.STYLE_SHAPE + "=mxgraph.mockup.";
+        var gn = 'mxgraph.charts';
+        var dt = 'charts ';
+        var sb = this;
+        this.setCurrentSearchEntryLibrary('charts');
+
+        const now = Date.now
+        const nodeId = `echarts__${ now() }`
+
+        var fns = [
+            this.addEntry('charts', mxUtils.bind(this, function () {
+                var cell = new mxCell(`<div style="color: red" id="${ nodeId }">${ now() }</div>`, new mxGeometry(0, 0, 160, 20), 'text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;');
+                cell.setVertex(true)
+                cell.setId(nodeId)
+                return this.createVertexTemplateFromCells([cell], cell.geometry.width, cell.geometry.height, 'charts');
+            })),
+        ];
+
+        this.addPalette('charts', '图表', false, mxUtils.bind(this, function (content) {
+            for (var i = 0; i < fns.length; i++) {
+                content.appendChild(fns[i](content));
+            }
+        }));
+
+        this.setCurrentSearchEntryLibrary();
+    };
+})();

@@ -4882,6 +4882,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
     console.log(this.editorUi)
     console.log(vertices)
 
+
     // console.log(vertices[0]?.get('bindType'))
     /**
      * @description 不是单一节点则不进入数据绑定
@@ -6200,7 +6201,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             if (res) {
                 const template = UseLayUi.generateOptionTemplate({ dataSource: res })
                 $(`#${ enumActionEl.ATTR_EL } select`).html(template)
-                // form.render('select') 
+                // form.render('select')
                 form.render('select', enumActionEl.FORM_FILTER)
             }
         }