diff --git a/package-lock.json b/package-lock.json index 031c13c8..321bd7c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5180,7 +5180,7 @@ "node_modules/jetlinks-ui-components": { "version": "1.0.5", "resolved": "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz", - "integrity": "sha512-u1jqTyBWHB+b/NOKimucxNMYxet6g9Hi/I30T1VNWGq+x/Gf2zjz8dJoxjUcLW+9t/yjG6opWUE8Z8NWQRp3Eg==", + "integrity": "sha512-zrMe/4PjtWNCQtlP6kNLA7hVyQ7ftPSgivQZp8TGcpbUMOU/IYyCLQ0+VoWcqEopTSt1zEzEazodR4EjEzv7pQ==", "dependencies": { "@vueuse/core": "^9.12.0", "ant-design-vue": "^3.2.15", @@ -8343,6 +8343,8 @@ }, "node_modules/npm/node_modules/debug/node_modules/ms": { "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "inBundle": true, "license": "MIT" }, @@ -9913,6 +9915,8 @@ }, "node_modules/npm/node_modules/request/node_modules/form-data": { "version": "2.3.3", + "resolved": "https://registry.jetlinks.cn/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "inBundle": true, "license": "MIT", "dependencies": { @@ -9926,6 +9930,8 @@ }, "node_modules/npm/node_modules/request/node_modules/tough-cookie": { "version": "2.5.0", + "resolved": "https://registry.jetlinks.cn/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "inBundle": true, "license": "BSD-3-Clause", "dependencies": { @@ -10156,6 +10162,8 @@ }, "node_modules/npm/node_modules/string-width/node_modules/strip-ansi": { "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", "inBundle": true, "license": "MIT", "dependencies": { @@ -17272,7 +17280,7 @@ "jetlinks-ui-components": { "version": "1.0.5", "resolved": "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz", - "integrity": "sha512-u1jqTyBWHB+b/NOKimucxNMYxet6g9Hi/I30T1VNWGq+x/Gf2zjz8dJoxjUcLW+9t/yjG6opWUE8Z8NWQRp3Eg==", + "integrity": "sha512-zrMe/4PjtWNCQtlP6kNLA7hVyQ7ftPSgivQZp8TGcpbUMOU/IYyCLQ0+VoWcqEopTSt1zEzEazodR4EjEzv7pQ==", "requires": { "@vueuse/core": "^9.12.0", "ant-design-vue": "^3.2.15", @@ -19672,6 +19680,8 @@ "dependencies": { "ms": { "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "bundled": true } } @@ -20833,6 +20843,8 @@ "dependencies": { "form-data": { "version": "2.3.3", + "resolved": "https://registry.jetlinks.cn/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "bundled": true, "requires": { "asynckit": "^0.4.0", @@ -20842,6 +20854,8 @@ }, "tough-cookie": { "version": "2.5.0", + "resolved": "https://registry.jetlinks.cn/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "bundled": true, "requires": { "psl": "^1.1.28", @@ -20994,6 +21008,8 @@ }, "strip-ansi": { "version": "4.0.0", + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==", "bundled": true, "requires": { "ansi-regex": "^3.0.0" diff --git a/src/api/notice/config.ts b/src/api/notice/config.ts index d3e4854a..31432454 100644 --- a/src/api/notice/config.ts +++ b/src/api/notice/config.ts @@ -42,7 +42,7 @@ export default { // 不分页-列表 queryListNoPaging: (data: any) => post(`/notifier/config/_query/no-paging?paging=false`, data), // - queryDingTalkUsers: (id: string) => get(`/notifier/dingtalk/corp/${id}/users?sorts[0].name='name'&sorts[0].order=asc`), + queryDingTalkUsers: (id: string) => get(`/notifier/dingtalk/corp/${id}/users?sorts[0].name="name"&sorts[0].order=asc`), // - queryWechatUsers: (id: string) => get(`/notifier/wechat/corp/${id}/users?sorts[0].name='name'&sorts[0].order=asc`), + queryWechatUsers: (id: string) => get(`/notifier/wechat/corp/${id}/users?sorts[0].name="name"&sorts[0].order=asc`), } \ No newline at end of file diff --git a/src/components/ValueItem/index.vue b/src/components/ValueItem/index.vue index b335cff5..49da06d3 100644 --- a/src/components/ValueItem/index.vue +++ b/src/components/ValueItem/index.vue @@ -53,6 +53,7 @@ v-model:value="myValue" placeholder="请输入图片链接" allowClear + @change='inputChange' > - - diff --git a/src/views/notice/Template/Log/index.vue b/src/views/notice/Template/Log/index.vue index bd2f4a38..038e41ed 100644 --- a/src/views/notice/Template/Log/index.vue +++ b/src/views/notice/Template/Log/index.vue @@ -1,21 +1,22 @@ + diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue index e0774a9b..1481ff82 100644 --- a/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue +++ b/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue @@ -15,13 +15,16 @@ diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue index b1ed87ed..d4ac0fba 100644 --- a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue +++ b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue @@ -1,6 +1,6 @@ diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue index 5697da00..c4f27a45 100644 --- a/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue +++ b/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue @@ -1,6 +1,6 @@ - + @@ -211,6 +211,7 @@ watch( watch( () => props.values?.message, (newVal) => { + console.log(newVal) if (newVal?.messageType) { modelRef.message = newVal; if (newVal.messageType === 'INVOKE_FUNCTION' && newVal.functionId) { diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue b/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue index 0dd67d5a..00eb1e33 100644 --- a/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue +++ b/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue @@ -1,12 +1,12 @@ - 点击配置执行动作 + 点击配置执行动作
{{ name + 1 }}
- +
-
+ diff --git a/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue b/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue index c1bfb504..400070dc 100644 --- a/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue +++ b/src/views/rule-engine/Scene/Save/action/Notify/NotifyConfig.vue @@ -1,5 +1,5 @@ @@ -100,7 +85,7 @@ const props = defineProps({ }, }); -const emit = defineEmits(['update:value']); +const emit = defineEmits(['update:value', 'change']); const getLogo = (type: string, provider: string) => { return MSG_TYPE[type].find((f: any) => f.value === provider)?.logo; @@ -140,17 +125,39 @@ const columns = [ }, ]; +const query = (e: Record) => + ConfigApi.list({ + ...e, + terms: [ + ...e?.terms, + { + terms: [ + { + termType: 'eq', + column: 'type', + value: props.notifyType, + }, + ], + }, + ], + sorts: [ + { name: 'id', value: props.value }, + { name: 'createTime', order: 'desc' }, + ], + }); + const handleSearch = (_params: any) => { params.value = _params; }; -const cancelSelect = () => { - _selectedRowKeys.value = []; +const onSelectChange = (keys: string[]) => { + _selectedRowKeys.value = [...keys]; }; const handleClick = (dt: any) => { _selectedRowKeys.value = [dt.id]; emit('update:value', dt.id); + emit('change', { provider: dt?.provider }); }; watch( @@ -176,7 +183,7 @@ watch( padding-left: 0px; } -.logo{ +.logo { width: 88px; height: 88px; } diff --git a/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue b/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue index be71b31c..3905faf3 100644 --- a/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue +++ b/src/views/rule-engine/Scene/Save/action/Notify/NotifyTemplate.vue @@ -1,5 +1,5 @@ @@ -85,7 +85,7 @@ const props = defineProps({ }, }); -const emit = defineEmits(['update:value']); +const emit = defineEmits(['update:value', 'change']); const getLogo = (type: string, provider: string) => { return MSG_TYPE[type].find((f: any) => f.value === provider)?.logo; @@ -129,13 +129,14 @@ const handleSearch = (_params: any) => { params.value = _params; }; -const cancelSelect = () => { - _selectedRowKeys.value = []; -}; - const handleClick = (dt: any) => { _selectedRowKeys.value = [dt.id]; emit('update:value', dt.id); + emit('change', { templateName: dt?.name }); +}; + +const onSelectChange = (keys: string[]) => { + _selectedRowKeys.value = [...keys]; }; const handleData = async (e: any) => { @@ -178,8 +179,7 @@ watch(