Merge branch 'perf/preview-mode-params-setting' into 'main_dev'

perf: 优化参数设置下发弹窗新增设备名称/属性/服务名称显示

See merge request yunteng/thingskit-scada!106

@@ -5075,7 +5075,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 
 
     /**
     /**
      * @description 用于在其他位置获取数据源绑定的数据，在生成数据源面板中进行了改写
      * @description 用于在其他位置获取数据源绑定的数据，在生成数据源面板中进行了改写
-     * @return  {{orgId: string, attr: string, deviceId: string, deviceType: string, deviceProfileId: string, deviceCode: string, registerAddress: string, method: string, thingsModelDataType: string}}
+     * @return  {{orgId: string, attr: string, deviceId: string, deviceType: string, deviceProfileId: string, deviceCode: string, registerAddress: string, method: string, thingsModelDataType: string, deviceName: string, attrName: string}}
      */
      */
     function getDataSourceBindValue() {
     function getDataSourceBindValue() {
 
 
@@ -5235,7 +5235,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 
 
 
 
         async function mount() {
         async function mount() {
-            const { component, echoDataSource, getValue } = generateDataSourceComponent({ validate: true })
+            const cell = vertices[0]
+            const isSwitch = cell.getAttribute('componentType') == 'switch'
+            const { component, echoDataSource, getValue } = generateDataSourceComponent({ validate: true, extractAttribute: isSwitch ? 'BOOL' : null })
             $(fragment).append(title).append(component)
             $(fragment).append(title).append(component)
             $(container).append(fragment)
             $(container).append(fragment)
 
 
@@ -6586,7 +6588,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         function getSwitchSubmitValue(field) {
         function getSwitchSubmitValue(field) {
             const dataSources = getDataSourceBindValue()
             const dataSources = getDataSourceBindValue()
             const enableStatus = getEnableStatus(field)
             const enableStatus = getEnableStatus(field)
-            return { configurationId, contentId: currentPageId.id, nodeId: graphId, dataSources: { ...dataSources, additional: { deviceCode: dataSources?.deviceCode, method: dataSources?.method, registerAddress: dataSources?.registerAddress, thingsModelDataType: dataSources?.thingsModelDataType } }, ...enableStatus }
+            return { configurationId, contentId: currentPageId.id, nodeId: graphId, dataSources: { ...dataSources, additional: { deviceCode: dataSources?.deviceCode, method: dataSources?.method, registerAddress: dataSources?.registerAddress, thingsModelDataType: dataSources?.thingsModelDataType, deviceName: dataSources?.deviceName, attrName: dataSources?.attrName } }, ...enableStatus }
         }
         }
 
 
 
 
@@ -8703,9 +8705,10 @@ DataFormatPanel.prototype.addDataFont = function (container) {
      * @param {object} options
      * @param {object} options
      * @param {string} [options.overrideClass = ''] options.overrideClass
      * @param {string} [options.overrideClass = ''] options.overrideClass
      * @param {boolean} [options.validate = true ] options.validate
      * @param {boolean} [options.validate = true ] options.validate
+     * @param {boolean} [options.extractAttribute ] options.extractAttribute
      */
      */
     function generateDataSourceComponent(options = {}) {
     function generateDataSourceComponent(options = {}) {
-        const { overrideClass = '', validate = true } = options
+        const { overrideClass = '', validate = true, extractAttribute } = options
         const componentFilter = `data-source__component-filter-${Date.now()}`
         const componentFilter = `data-source__component-filter-${Date.now()}`
         const componentId = `data-source__component-${Date.now()}`
         const componentId = `data-source__component-${Date.now()}`
 
 
@@ -8885,7 +8888,10 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             if (deviceProfileId) {
             if (deviceProfileId) {
                 const [err, res] = await to(ConfigurationNodeApi.getDeviceAttribute(deviceProfileId))
                 const [err, res] = await to(ConfigurationNodeApi.getDeviceAttribute(deviceProfileId))
                 thingsModel = res
                 thingsModel = res
-                $(`#${componentId} `).find(`select[name="${enumDataSourceConst.ATTR}"]`).html(UseLayUi.generateOptionTemplate({ dataSource: Array.isArray(res) ? res : [], labelField: 'name', valueField: 'identifier' }))
+                if (extractAttribute) {
+                    thingsModel = thingsModel.filter(item => item.detail?.dataType?.type == extractAttribute)
+                }
+                $(`#${componentId} `).find(`select[name="${enumDataSourceConst.ATTR}"]`).html(UseLayUi.generateOptionTemplate({ dataSource: Array.isArray(thingsModel) ? thingsModel : [], labelField: 'name', valueField: 'identifier' }))
                 form.render('select', componentFilter)
                 form.render('select', componentFilter)
             }
             }
         }
         }
@@ -9016,6 +9022,12 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 
 
                     $(`#${componentId} input[name="${enumDataSourceConst.ORG_ID}"]`).val(orgNode?.id).parent().find('span').html(orgNode?.name)
                     $(`#${componentId} input[name="${enumDataSourceConst.ORG_ID}"]`).val(orgNode?.id).parent().find('span').html(orgNode?.name)
 
 
+                    const currentDevice = deviceList.find(item => item.tbDeviceId == deviceId)
+                    const deviceName = currentDevice?.alias || currentDevice?.name
+
+                    const currentAttr = thingsModel.find(item => item.identifier == attr)
+                    const attrName = currentAttr?.name
+
                     form.val(componentFilter, {
                     form.val(componentFilter, {
                         orgId,
                         orgId,
                         deviceId,
                         deviceId,
@@ -9026,7 +9038,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         deviceCode,
                         deviceCode,
                         registerAddress,
                         registerAddress,
                         thingsModelDataType,
                         thingsModelDataType,
-                        actionType
+                        actionType,
+                        deviceName,
+                        attrName,
                     })
                     })
 
 
                 })
                 })
@@ -16379,8 +16393,17 @@ class HandleDataInteraction {
         }
         }
 
 
         function createLayer() {
         function createLayer() {
+            const currentData = contentData.dataSources.find(item => item.nodeId == nodeId)
+            const { deviceName, attrName } = currentData?.additional || {}
+
+            let name
+            if (content.commandType == '0' || content.commandType == '2') {
+                name = `${deviceName || ''} - ${attrName || ''}`
+            } else {
+                name = `${deviceName || ''} - ${content?.service}`
+            }
             layer.open({
             layer.open({
-                title: '参数设置',
+                title: `参数设置 - ${name}`,
                 content: createContent(),
                 content: createContent(),
                 area: '400px',
                 area: '400px',
                 btn: ["应用", "取消"],
                 btn: ["应用", "取消"],