Showing
1 changed file
with
13 additions
and
6 deletions
... | ... | @@ -7561,7 +7561,9 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
7561 | 7561 | /** |
7562 | 7562 | * @description 服务调用方式 |
7563 | 7563 | */ |
7564 | - CALL_TYPE: 'callType' | |
7564 | + CALL_TYPE: 'callType', | |
7565 | + | |
7566 | + SERVICE_NAME: 'serviceName' | |
7565 | 7567 | } |
7566 | 7568 | |
7567 | 7569 | /** |
... | ... | @@ -7689,6 +7691,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
7689 | 7691 | [enumConst.TCP_COMMAND]: content[enumConst.TCP_COMMAND], |
7690 | 7692 | [enumConst.TRANSPORTTYPE]: content[enumConst.TRANSPORTTYPE], |
7691 | 7693 | [enumConst.SERVICE]: content[enumConst.SERVICE], |
7694 | + [enumConst.SERVICE_NAME]: content[enumConst.SERVICE_NAME], | |
7692 | 7695 | [enumConst.SERVICE_COMMAND]: content[enumConst.SERVICE_COMMAND], |
7693 | 7696 | [enumConst.SERVICE_ORIGINAL_CONFIGURATION]: content[enumConst.SERVICE_ORIGINAL_CONFIGURATION], |
7694 | 7697 | } |
... | ... | @@ -7816,12 +7819,12 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
7816 | 7819 | if (commandType === COMMAND_TYPE_ENUM.CUSTOM) { |
7817 | 7820 | fields = [...fields, enumConst.JSON_COMMAND, enumConst.TCP_COMMAND] |
7818 | 7821 | } else if (commandType === COMMAND_TYPE_ENUM.SERVICE) { |
7819 | - fields = [...fields, enumConst.CALL_TYPE, enumConst.IDENTIFIER, enumConst.SERVICE, enumConst.SERVICE_COMMAND, enumConst.SERVICE_ORIGINAL_CONFIGURATION] | |
7822 | + fields = [...fields, enumConst.CALL_TYPE, enumConst.IDENTIFIER, enumConst.SERVICE, enumConst.SERVICE_COMMAND, enumConst.SERVICE_ORIGINAL_CONFIGURATION, enumConst.SERVICE_NAME] | |
7820 | 7823 | } |
7821 | 7824 | |
7822 | 7825 | return fields.reduce((prev, next) => ({ ...prev, [next]: formVal[next] }), {}) |
7823 | 7826 | } |
7824 | - | |
7827 | + | |
7825 | 7828 | const data = { |
7826 | 7829 | type: event.data.type, |
7827 | 7830 | configurationId, |
... | ... | @@ -7954,7 +7957,8 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
7954 | 7957 | } else { |
7955 | 7958 | form.val(enumActionEl.FORM_FILTER, { [enumConst.SERVICE_COMMAND]: needRender.functionJson?.inputData?.[0]?.serviceCommand || '' }) |
7956 | 7959 | } |
7957 | - form.val(enumActionEl.FORM_FILTER, { [enumConst.SERVICE_ORIGINAL_CONFIGURATION]: JSON.stringify(needRender.functionJson?.inputData || []), [enumConst.IDENTIFIER]: needRender?.identifier, [enumConst.CALL_TYPE]: needRender?.callType }) | |
7960 | + | |
7961 | + 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 }) | |
7958 | 7962 | }) |
7959 | 7963 | |
7960 | 7964 | try { |
... | ... | @@ -8095,6 +8099,9 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
8095 | 8099 | </div> |
8096 | 8100 | </div> |
8097 | 8101 | <div style="display: none;"> |
8102 | + <input type="text" name="${enumConst.SERVICE_NAME}" placeholder="服务名称" /> | |
8103 | + </div> | |
8104 | + <div style="display: none;"> | |
8098 | 8105 | <input type="text" name="${enumConst.IDENTIFIER}" placeholder="标识符" /> |
8099 | 8106 | </div> |
8100 | 8107 | <div style="display: none;"> |
... | ... | @@ -16445,8 +16452,8 @@ class HandleDataInteraction { |
16445 | 16452 | if (content.commandType == '0' || content.commandType == '2') { |
16446 | 16453 | name = `${deviceName || ''} - ${attrName || ''}` |
16447 | 16454 | } else { |
16448 | - name = `${deviceName || ''} - ${content?.service}` | |
16449 | - } | |
16455 | + name = `${deviceName || ''} - ${content?.serviceName}` | |
16456 | + } | |
16450 | 16457 | layer.open({ |
16451 | 16458 | title: `参数设置 - ${name}`, |
16452 | 16459 | content: createContent(), | ... | ... |