fix: 修复组态数据绑定参数设置名称回显问题

ww
1 parent e5bbc807
Showing 1 changed file with 13 additions and 6 deletions
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/grapheditor/Format.js
View file @26150ef
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @26150ef
@@ -7561,7 +7561,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             /**
              * @description 服务调用方式
              */
-            CALL_TYPE: 'callType'
+            CALL_TYPE: 'callType',
+
+            SERVICE_NAME: 'serviceName'
         }
         /**
@@ -7689,6 +7691,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 [enumConst.TCP_COMMAND]: content[enumConst.TCP_COMMAND],
                 [enumConst.TRANSPORTTYPE]: content[enumConst.TRANSPORTTYPE],
                 [enumConst.SERVICE]: content[enumConst.SERVICE],
+                [enumConst.SERVICE_NAME]: content[enumConst.SERVICE_NAME],
                 [enumConst.SERVICE_COMMAND]: content[enumConst.SERVICE_COMMAND],
                 [enumConst.SERVICE_ORIGINAL_CONFIGURATION]: content[enumConst.SERVICE_ORIGINAL_CONFIGURATION],
             }
@@ -7816,12 +7819,12 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 if (commandType === COMMAND_TYPE_ENUM.CUSTOM) {
                     fields = [...fields, enumConst.JSON_COMMAND, enumConst.TCP_COMMAND]
                 } else if (commandType === COMMAND_TYPE_ENUM.SERVICE) {
-                    fields = [...fields, enumConst.CALL_TYPE, enumConst.IDENTIFIER, enumConst.SERVICE, enumConst.SERVICE_COMMAND, enumConst.SERVICE_ORIGINAL_CONFIGURATION]
+                    fields = [...fields, enumConst.CALL_TYPE, enumConst.IDENTIFIER, enumConst.SERVICE, enumConst.SERVICE_COMMAND, enumConst.SERVICE_ORIGINAL_CONFIGURATION, enumConst.SERVICE_NAME]
                 }
                 return fields.reduce((prev, next) => ({ ...prev, [next]: formVal[next] }), {})
             }
-
+            
             const data = {
                 type: event.data.type,
                 configurationId,
@@ -7954,7 +7957,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 } else {
                     form.val(enumActionEl.FORM_FILTER, { [enumConst.SERVICE_COMMAND]: needRender.functionJson?.inputData?.[0]?.serviceCommand || '' })
                 }
-                form.val(enumActionEl.FORM_FILTER, { [enumConst.SERVICE_ORIGINAL_CONFIGURATION]: JSON.stringify(needRender.functionJson?.inputData || []), [enumConst.IDENTIFIER]: needRender?.identifier, [enumConst.CALL_TYPE]: needRender?.callType })
+
+                form.val(enumActionEl.FORM_FILTER, { [enumConst.SERVICE_ORIGINAL_CONFIGURATION]: JSON.stringify(needRender.functionJson?.inputData || []), [enumConst.IDENTIFIER]: needRender?.identifier, [enumConst.CALL_TYPE]: needRender?.callType, [enumConst.SERVICE_NAME]: needRender?.functionName })
             })
             try {
@@ -8095,6 +8099,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         </div>
                     </div>
                     <div style="display: none;">
+                        <input type="text" name="${enumConst.SERVICE_NAME}" placeholder="服务名称" />
+                    </div>
+                    <div style="display: none;">
                         <input type="text" name="${enumConst.IDENTIFIER}" placeholder="标识符" />
                     </div>
                     <div style="display: none;">
@@ -16445,8 +16452,8 @@ class HandleDataInteraction {
             if (content.commandType == '0' || content.commandType == '2') {
                 name = `${deviceName || ''} - ${attrName || ''}`
             } else {
-                name = `${deviceName || ''} - ${content?.service}`
-            }
+                name = `${deviceName || ''} - ${content?.serviceName}`
+            } 
             layer.open({
                 title: `参数设置 - ${name}`,
                 content: createContent(),