提交标绘产品属性面板

hhyu1 · hhyu1 · commit 9a759011ccc2 · 2024-07-17T18:55:00.000+08:00
diff --git a/examples/data/plot-sign/signManager.json b/examples/data/plot-sign/signManager.json
diff --git a/examples/js/plottingPanel/PublicStyleFunction.js b/examples/js/plottingPanel/PublicStyleFunction.js
@@ -1371,7 +1371,8 @@ function symbolPropertyObject(selectfeature, styleObject) {
                 var objectSubCode1 = new Object();
                 objectSubCode1.group = group[8];
                 objectSubCode1.name = displayName[3];
-                objectSubCode1.editor = { "type": 'combobox', "options": { "valueField": 'value', "textField": 'text', "data": getSubSymbolsTypeRows(selectfeature) } };
+                objectSubCode1.editor = "text";
+                //objectSubCode1.editor = { "type": 'combobox', "options": { "valueField": 'value', "textField": 'text', "data": getSubSymbolsTypeRows(selectfeature) } };
                 objectSubCode1.index = i;
                 objectSubCode1.value = subSymbolsTypeString(selectfeature.getSubSymbols().length, selectfeature,i);
                 algoSymbolRows.push(objectSubCode1);
@@ -1395,7 +1396,8 @@ function symbolPropertyObject(selectfeature, styleObject) {
                 var objectSubCode = new Object();
                 objectSubCode.group = group[8];
                 objectSubCode.name = displayName[3];
-                objectSubCode.editor = { "type": 'combobox', "options": { "valueField": 'value', "textField": 'text', "data": getSubSymbolsTypeRows(selectfeature) } };
+                objectSubCode.editor = "text";
+                //objectSubCode.editor = { "type": 'combobox', "options": { "valueField": 'value', "textField": 'text', "data": getSubSymbolsTypeRows(selectfeature) } };
                 objectSubCode.index = i;
                 objectSubCode.value = selectfeature.getSubSymbols()[i].code;
                 algoSymbolRows.push(objectSubCode);
diff --git a/examples/js/plottingPanel/SignSymbolPanel.js b/examples/js/plottingPanel/SignSymbolPanel.js
@@ -274,7 +274,11 @@ function updateSelectSignSymbol(updated, signSymbol) {
                 values = updated.value.split(";")
             } else if (updated.value.includes("；")) {
                 values = updated.value.split("；")
-            } else {
+            } else if (updated.value.includes(",")) {
+                values = updated.value.split(",")
+            }  else if (updated.value.includes("，")) {
+                values = updated.value.split("，")
+            }  else {
                 values = [updated.value];
             }
             signSymbol.setTexts(values);
@@ -525,7 +529,7 @@ function updateSelectSignSymbol(updated, signSymbol) {
             transInfo.redoParams = [updated.value];
             c = signSymbol.getIndecatorLineStyle().color;
             if (c.includes("#")) {
-                signSymbol.setIndecatorLineStyle({ lineColor: hexToRgb(c, updated.value) });
+                signSymbol.setIndecatorLineStyle({ lineColor: hexToRgb(c, updated.value), opacity: parseFloat(updated.value) });
             } else {
                 color = colorConvert(c);
                 let hexColor = rgbToHex(color.red, color.green, color.blue);
diff --git a/examples/js/plottingPanel/StylePanel.js b/examples/js/plottingPanel/StylePanel.js
@@ -170,7 +170,7 @@ function updateSelectFeature(updated, selectfeatures) {
                     if (selectfeatures[i].symbolType === SuperMap.Plot.SymbolType.LITERATESIGN) {
                         selectfeatures[i].route.applyTextStyle({ lineSymbolID: updated.value });
                     } else {
-                        if(selectfeatures[i].symbolType != 1){
+                        if(selectfeatures[i].symbolType != 1 && selectfeatures[i].setDashLine){
                             selectfeatures[i].setDashLine([]);
                             selectfeatures[i].setStyle({ lineSymbolID: 0 });
                         }
@@ -703,6 +703,9 @@ function updateSelectFeature(updated, selectfeatures) {
                     }
                     else if (code !== null) {
 
+                        var symbolLibManager = L.supermap.plotting.symbolLibManager(serverUrl);
+                        var subCode = symbolLibManager.findSymbolByCode(code);
+
                         transInfo.functionName = "setSubSymbol";
                         if (selectfeatures[i].getSubSymbols()[updated.index]) {
                             transInfo.undoParams = [selectfeatures[i].getSubSymbols()[updated.index].code, updated.index, selectfeatures[i].getSubSymbols()[updated.index].libID];
@@ -712,16 +715,18 @@ function updateSelectFeature(updated, selectfeatures) {
                         var subSymbol = selectfeatures[i].getSubSymbols()[updated.index];
 
                         transInfo.redoParams = [code, updated.index];
-                        selectfeatures[i].setSubSymbol(code, updated.index, 100);
+                        selectfeatures[i].setSubSymbol(code, updated.index, subCode[0].libID);
                     }
                 }
+                var symbolLibManager = L.supermap.plotting.symbolLibManager(serverUrl);
+                var subCode = symbolLibManager.findSymbolByCode(subSymbol.code);
                 if (updated.name == resources.text_subSymbolLineWidth) {
                     let subSymbol = selectfeatures[i].getSubSymbols()[updated.index];
-                    selectfeatures[i].setSubSymbol(subSymbol.code, updated.index, 100, subSymbol.lineColor, parseFloat(updated.value));
+                    selectfeatures[i].setSubSymbol(subSymbol.code, updated.index, subCode[0].libID, subSymbol.lineColor, parseFloat(updated.value));
                 }
                 if (updated.name == resources.text_subSymbolLineColor) {
                     let subSymbol = selectfeatures[i].getSubSymbols()[updated.index];
-                    selectfeatures[i].setSubSymbol(subSymbol.code, updated.index, 100, updated.value, subSymbol.width2D);
+                    selectfeatures[i].setSubSymbol(subSymbol.code, updated.index, subCode[0].libID, updated.value, subSymbol.width2D);
                 }
             }
             transaction.transInfos.push(transInfo);

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ function updateSelectFeature(updated, selectfeatures) {`
`170`	`170`	`if (selectfeatures[i].symbolType === SuperMap.Plot.SymbolType.LITERATESIGN) {`
`171`	`171`	`selectfeatures[i].route.applyTextStyle({ lineSymbolID: updated.value });`
`172`	`172`	`} else {`
`173`		`- if(selectfeatures[i].symbolType != 1){`
	`173`	`+ if(selectfeatures[i].symbolType != 1 && selectfeatures[i].setDashLine){`
`174`	`174`	`selectfeatures[i].setDashLine([]);`
`175`	`175`	`selectfeatures[i].setStyle({ lineSymbolID: 0 });`
`176`	`176`	`}`
`@@ -703,6 +703,9 @@ function updateSelectFeature(updated, selectfeatures) {`
`703`	`703`	`}`
`704`	`704`	`else if (code !== null) {`
`705`	`705`
	`706`	`+ var symbolLibManager = L.supermap.plotting.symbolLibManager(serverUrl);`
	`707`	`+ var subCode = symbolLibManager.findSymbolByCode(code);`
	`708`	`+`
`706`	`709`	`transInfo.functionName = "setSubSymbol";`
`707`	`710`	`if (selectfeatures[i].getSubSymbols()[updated.index]) {`
`708`	`711`	`transInfo.undoParams = [selectfeatures[i].getSubSymbols()[updated.index].code, updated.index, selectfeatures[i].getSubSymbols()[updated.index].libID];`
`@@ -712,16 +715,18 @@ function updateSelectFeature(updated, selectfeatures) {`
`712`	`715`	`var subSymbol = selectfeatures[i].getSubSymbols()[updated.index];`
`713`	`716`
`714`	`717`	`transInfo.redoParams = [code, updated.index];`
`715`		`- selectfeatures[i].setSubSymbol(code, updated.index, 100);`
	`718`	`+ selectfeatures[i].setSubSymbol(code, updated.index, subCode[0].libID);`
`716`	`719`	`}`
`717`	`720`	`}`
	`721`	`+ var symbolLibManager = L.supermap.plotting.symbolLibManager(serverUrl);`
	`722`	`+ var subCode = symbolLibManager.findSymbolByCode(subSymbol.code);`
`718`	`723`	`if (updated.name == resources.text_subSymbolLineWidth) {`
`719`	`724`	`let subSymbol = selectfeatures[i].getSubSymbols()[updated.index];`
`720`		`- selectfeatures[i].setSubSymbol(subSymbol.code, updated.index, 100, subSymbol.lineColor, parseFloat(updated.value));`
	`725`	`+ selectfeatures[i].setSubSymbol(subSymbol.code, updated.index, subCode[0].libID, subSymbol.lineColor, parseFloat(updated.value));`
`721`	`726`	`}`
`722`	`727`	`if (updated.name == resources.text_subSymbolLineColor) {`
`723`	`728`	`let subSymbol = selectfeatures[i].getSubSymbols()[updated.index];`
`724`		`- selectfeatures[i].setSubSymbol(subSymbol.code, updated.index, 100, updated.value, subSymbol.width2D);`
	`729`	`+ selectfeatures[i].setSubSymbol(subSymbol.code, updated.index, subCode[0].libID, updated.value, subSymbol.width2D);`
`725`	`730`	`}`
`726`	`731`	`}`
`727`	`732`	`transaction.transInfos.push(transInfo);`