diff --git a/DVE/.idea/workspace.xml b/DVE/.idea/workspace.xml index cdab6c6..db7415e 100644 --- a/DVE/.idea/workspace.xml +++ b/DVE/.idea/workspace.xml @@ -61,44 +61,58 @@ - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - + @@ -114,23 +128,67 @@ - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + + + + + + + + + + + + + @@ -198,9 +256,6 @@ - UI_action.show_message_input("layer_selector", "图层名称替换", [{name: "记录名称", type: "note"}], null) - UI_action.show_message_input("layer - UI_action.show_message_input("laye UI_action.show_message_input("la UI_action.show_message_input note @@ -228,6 +283,9 @@ .quick_mult_editor .quick_mult_editor input[id^="advance"] + label + 虚线 + dashSet + setLayerInfo_shape_byId Kinase @@ -263,7 +321,6 @@ @@ -838,12 +896,12 @@ - + - @@ -927,11 +985,6 @@ 51 - - - - - - - @@ -1167,16 +1213,6 @@ - - - - - - - - - - @@ -1185,41 +1221,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1320,16 +1321,6 @@ - - - - - - - - - - @@ -1450,14 +1441,6 @@ - - - - - - - - @@ -1469,7 +1452,7 @@ - + @@ -1484,6 +1467,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DVE/Enzymes/Enzymes_lib.jsx b/DVE/Enzymes/Enzymes_lib.jsx index cb2454c..2a0df20 100644 --- a/DVE/Enzymes/Enzymes_lib.jsx +++ b/DVE/Enzymes/Enzymes_lib.jsx @@ -792,6 +792,18 @@ EnzJSX.setLayerInfo_shape_byId = function (shapeInfo, id, doSelect) strokeStyle.fillColor.g = shapeInfo.fillColor.g strokeStyle.fillColor.b = shapeInfo.fillColor.b } + if (shapeInfo.dashSet != undefined) + { + if(shapeInfo.dashSet.split!=undefined) + { + strokeStyle.dashSet = shapeInfo.dashSet.split(",") + } + + + } + + + //todo:判定是否都为 null 值,减少无效99渲染次数 $.writeln(JSON.stringify(shapeInfo)) $.writeln(JSON.stringify(strokeStyle)) diff --git a/DVE/bin/JS/main.js b/DVE/bin/JS/main.js index 053feda..efe3306 100644 --- a/DVE/bin/JS/main.js +++ b/DVE/bin/JS/main.js @@ -21631,6 +21631,12 @@ exports.default = { } } } + }, + dashset_42: function dashset_42() { + this.edit_value = "4,2"; + }, + dashset_02: function dashset_02() { + this.edit_value = "0,2"; } }, computed: { diff --git a/DVE/bin/JSX/Enzymes_lib.jsx b/DVE/bin/JSX/Enzymes_lib.jsx index cb2454c..2a0df20 100644 --- a/DVE/bin/JSX/Enzymes_lib.jsx +++ b/DVE/bin/JSX/Enzymes_lib.jsx @@ -792,6 +792,18 @@ EnzJSX.setLayerInfo_shape_byId = function (shapeInfo, id, doSelect) strokeStyle.fillColor.g = shapeInfo.fillColor.g strokeStyle.fillColor.b = shapeInfo.fillColor.b } + if (shapeInfo.dashSet != undefined) + { + if(shapeInfo.dashSet.split!=undefined) + { + strokeStyle.dashSet = shapeInfo.dashSet.split(",") + } + + + } + + + //todo:判定是否都为 null 值,减少无效99渲染次数 $.writeln(JSON.stringify(shapeInfo)) $.writeln(JSON.stringify(strokeStyle)) diff --git a/DVE/components/InputAssist.vue b/DVE/components/InputAssist.vue index 542db83..693e214 100644 --- a/DVE/components/InputAssist.vue +++ b/DVE/components/InputAssist.vue @@ -804,6 +804,14 @@ } } + }, + dashset_42:function () + { + this.edit_value ="4,2" + }, + dashset_02:function () + { + this.edit_value ="0,2" } }, computed: {