Commit b1b136d5a3ad7fb090aa7ec4945e3beb64363beb
1 parent
1951f17a
fix: fix use theme layui style override
Showing
3 changed files
with
38 additions
and
2 deletions
Too many changes to show.
To preserve performance only 3 of 5 files are displayed.
@@ -19,6 +19,9 @@ | @@ -19,6 +19,9 @@ | ||
19 | <!-- 全局变量 --> | 19 | <!-- 全局变量 --> |
20 | <script src="./js/const/const.js"></script> | 20 | <script src="./js/const/const.js"></script> |
21 | 21 | ||
22 | + <!-- echarts --> | ||
23 | + <script src="./js/plugin/echarts/echarts.js"></script> | ||
24 | + | ||
22 | <script src="./plugins/axios.min.js"></script> | 25 | <script src="./plugins/axios.min.js"></script> |
23 | <!-- <script src="./js/jquery/jquery-3.3.1.min.js"></script>--> | 26 | <!-- <script src="./js/jquery/jquery-3.3.1.min.js"></script>--> |
24 | <!-- <script src="./js/jquery.easyui.min.js"></script>--> | 27 | <!-- <script src="./js/jquery.easyui.min.js"></script>--> |
@@ -37,7 +40,7 @@ | @@ -37,7 +40,7 @@ | ||
37 | 40 | ||
38 | <!-- Axios --> | 41 | <!-- Axios --> |
39 | <script src="./plugins/defHttp.js"></script> | 42 | <script src="./plugins/defHttp.js"></script> |
40 | - | 43 | + |
41 | <script src="./js/api/index.js"></script> | 44 | <script src="./js/api/index.js"></script> |
42 | 45 | ||
43 | <!-- act editor --> | 46 | <!-- act editor --> |
1 | +(function () { | ||
2 | + // Adds Atlassian shapes | ||
3 | + Sidebar.prototype.addChartsPalette = function () { | ||
4 | + var s = 'html=1;shadow=0;dashed=0;shape=mxgraph.atlassian.'; | ||
5 | + var s2 = 'html=1;shadow=0;dashed=0;fillColor=none;strokeColor=none;shape=mxgraph.bootstrap.rect;'; | ||
6 | + var s3 = mxConstants.STYLE_STROKEWIDTH + '=1;shadow=0;dashed=0;align=center;html=1;' + mxConstants.STYLE_SHAPE + "=mxgraph.mockup."; | ||
7 | + var gn = 'mxgraph.charts'; | ||
8 | + var dt = 'charts '; | ||
9 | + var sb = this; | ||
10 | + this.setCurrentSearchEntryLibrary('charts'); | ||
11 | + | ||
12 | + const now = Date.now | ||
13 | + const nodeId = `echarts__${ now() }` | ||
14 | + | ||
15 | + var fns = [ | ||
16 | + this.addEntry('charts', mxUtils.bind(this, function () { | ||
17 | + 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;'); | ||
18 | + cell.setVertex(true) | ||
19 | + cell.setId(nodeId) | ||
20 | + return this.createVertexTemplateFromCells([cell], cell.geometry.width, cell.geometry.height, 'charts'); | ||
21 | + })), | ||
22 | + ]; | ||
23 | + | ||
24 | + this.addPalette('charts', '图表', false, mxUtils.bind(this, function (content) { | ||
25 | + for (var i = 0; i < fns.length; i++) { | ||
26 | + content.appendChild(fns[i](content)); | ||
27 | + } | ||
28 | + })); | ||
29 | + | ||
30 | + this.setCurrentSearchEntryLibrary(); | ||
31 | + }; | ||
32 | +})(); |
@@ -4882,6 +4882,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | @@ -4882,6 +4882,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | ||
4882 | console.log(this.editorUi) | 4882 | console.log(this.editorUi) |
4883 | console.log(vertices) | 4883 | console.log(vertices) |
4884 | 4884 | ||
4885 | + | ||
4885 | // console.log(vertices[0]?.get('bindType')) | 4886 | // console.log(vertices[0]?.get('bindType')) |
4886 | /** | 4887 | /** |
4887 | * @description 不是单一节点则不进入数据绑定 | 4888 | * @description 不是单一节点则不进入数据绑定 |
@@ -6200,7 +6201,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | @@ -6200,7 +6201,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { | ||
6200 | if (res) { | 6201 | if (res) { |
6201 | const template = UseLayUi.generateOptionTemplate({ dataSource: res }) | 6202 | const template = UseLayUi.generateOptionTemplate({ dataSource: res }) |
6202 | $(`#${ enumActionEl.ATTR_EL } select`).html(template) | 6203 | $(`#${ enumActionEl.ATTR_EL } select`).html(template) |
6203 | - // form.render('select') | 6204 | + // form.render('select') |
6204 | form.render('select', enumActionEl.FORM_FILTER) | 6205 | form.render('select', enumActionEl.FORM_FILTER) |
6205 | } | 6206 | } |
6206 | } | 6207 | } |