Merge branch 'fix/DEFECT-1492' into 'main_dev'

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

See merge request yunteng/thingskit-scada!119

@@ -7140,7 +7140,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          */
         async function getAllGatewayDeviceAndConnectionDevice() {
             if (!recordData.orgId) return
-            const [err, res] = await to(ConfigurationNodeApi.getAllGatewayDeviceAndConnectionDevice(recordData.orgId))
+            const [err, res] = await to(ConfigurationNodeApi.getMeetConditionsDevice({ organizationId: recordData.orgId }))
             allDeviceOptions = res
             mountAllDeviceToSelect()
         }
@@ -7149,7 +7149,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description 将设备选项挂载到节点中
          */
         function mountAllDeviceToSelect() {
-            const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions, alias: 'alias' })
+            const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions, labelField: 'name', valueField: 'tbDeviceId', alias: 'alias' })
+
             $(`#${enumActionEl.DEVICE_DATA_BODY_EL}`).find(`select[name="${enumConst.DEVICE}"]`).html(generateOption)
             UseLayUi.nextTick(() => form.render('select'))
         }
@@ -7257,7 +7258,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         function createAddRowListenEvent() {
             $(`#${enumActionEl.ADD_ROW_EL}`).on('click', () => {
                 addRecord()
-                const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions, alias: 'alias' })
+                const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions, labelField: 'name', valueField: 'tbDeviceId', alias: 'alias' })
                 $(`#${enumActionEl.DEVICE_DATA_BODY_EL} tr`).last().find(`select[name="${enumConst.DEVICE}"]`).html(generateOption)
                 form.render('select')
             })
@@ -7267,7 +7268,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description 设置设备选项
          */
         function setDeviceOptions(row) {
-            const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions, alias: 'alias' })
+            const generateOption = UseLayUi.generateOptionTemplate({ dataSource: allDeviceOptions, labelField: 'name', valueField: 'tbDeviceId', alias: 'alias' })
             $(`#${enumActionEl.DEVICE_DATA_BODY_EL} tr[lay-filter="${getRowFilter(row)}"]`).find(`select[name="${enumConst.DEVICE}"]`).html(generateOption)
         }
 
@@ -7348,7 +7349,6 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 
             const formModel = form.val(enumActionEl.FORM_FILTER)
             if (!formModel[enumConst.ORG_ID]) return false
-
             for (let i = 0; i < tableData.length; i++) {
                 const { value } = tableData[i]
                 if (!isJson(value)) {
@@ -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,7 +7819,7 @@ 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] }), {})
@@ -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;">
@@ -15954,8 +15961,9 @@ class HandleDataInteraction {
             const [err, res = []] = way === 'twoway' ? await to(ConfigurationNodeApi.deviceIsOnLine(deviceId)) : [null, [{ value: true }]]
             const { value } = res[0] || {}
             if (value) {
-                await to(ConfigurationNodeApi.sendInstruction(way, deviceId, data))
-                UseLayUi.topSuccessMsg('下发成功～')
+                const [err, response] = await to(ConfigurationNodeApi.sendInstruction(way, deviceId, data))
+                if (response?.rpcId) UseLayUi.topSuccessMsg('下发成功～')
+                else UseLayUi.topErrorMsg('下发失败~')
             } else {
                 UseLayUi.errorMsg('设备不在线!')
             }
@@ -16298,7 +16306,7 @@ class HandleDataInteraction {
                     { value: method, required: true, message: '未找到Modbus命令操作类型' },
                     { value, message: '下发值不是一个数字', validator(value) { return value.toString().trim() && !isNaN(value) } },
                     ...(method == '05' ? [{ value, message: '下发类型必须为0或1', validator(value) { return value == 0 || value == 1 } }] : []),
-                    ...(method == '06' ? [{ value, message: `下发类型必须为整型,缩放因子为${zoomFactor}`, validator(value) { return !isNaN(value) && getNumberFloatPart(Number(value)) * zoomFactor % 1 === 0 } }, { value: Number(value) * zoomFactor, message: `最大值不能超过65535,缩放因子为${zoomFactor}`, validator(value) { return Number(value) <= parseInt('ffff', 16) } }] : []),
+                    ...(method == '06' ? [{ value, message: `下发类型必须为正整型,缩放因子为${zoomFactor}`, validator(value) { return !isNaN(value) && value >= 0 && getNumberFloatPart(Number(value)) * zoomFactor % 1 === 0 } }, { value: Number(value) * zoomFactor, message: `最大值不能超过65535,缩放因子为${zoomFactor}`, validator(value) { return Number(value) <= parseInt('ffff', 16) } }] : []),
                     ...(method == '16' ? [{ value, message: '下发类型精确到两位小数', validator(value) { return /^-?\d+(\.\d{0,2})?$/.test(Math.floor(Number(value)) * zoomFactor + getNumberFloatPart(Number(value)) * zoomFactor) } }] : [])
                 ])
 
@@ -16445,7 +16453,7 @@ 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}`,