diff --git a/README.md b/README.md index f45922b6..8c23ef59 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,16 @@ yarn add jetlinks-ui-components@latest yarn dev:force ``` +## Node +* node >= 18.14.0 + +## 浏览器兼容 +* Chrome >= 100 +* Firefox >= 100 +* Edge >= 100 +不支持IE ### 备注 -项目在开发模式下，首页加载慢属于正常现象； \ No newline at end of file +* 项目在开发模式下，首页加载慢属于正常现象； +* 打开F12后页面卡顿是`vuetools`引起，[https://github.com/vuejs/devtools/issues/1987](https://github.com/vuejs/devtools/issues/1987) \ No newline at end of file diff --git a/package.json b/package.json index 4fbbf389..283b4a22 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "event-source-polyfill": "^1.0.31", "global": "^4.4.0", "jetlinks-store": "^0.0.3", - "jetlinks-ui-components": "^1.0.8", + "jetlinks-ui-components": "^1.0.9", "js-cookie": "^3.0.1", "less": "^4.1.3", "less-loader": "^11.1.0", diff --git a/public/images/home/Group3793.png b/public/images/home/Group3793.png deleted file mode 100644 index 87d2c43c..00000000 Binary files a/public/images/home/Group3793.png and /dev/null differ diff --git a/public/images/home/home-1.png b/public/images/home/home-1.png deleted file mode 100644 index c37407b9..00000000 Binary files a/public/images/home/home-1.png and /dev/null differ diff --git a/public/images/home/home-2.png b/public/images/home/home-2.png deleted file mode 100644 index b57c0e26..00000000 Binary files a/public/images/home/home-2.png and /dev/null differ diff --git a/public/images/home/home-3.png b/public/images/home/home-3.png deleted file mode 100644 index 22bbf600..00000000 Binary files a/public/images/home/home-3.png and /dev/null differ diff --git a/public/images/home/top-1.png b/public/images/home/top-1.png index e4c6f33c..87d2c43c 100644 Binary files a/public/images/home/top-1.png and b/public/images/home/top-1.png differ diff --git a/public/images/media/dashboard-1.png b/public/images/media/dashboard-1.png index aaf59f47..97ee149b 100644 Binary files a/public/images/media/dashboard-1.png and b/public/images/media/dashboard-1.png differ diff --git a/public/images/media/dashboard-2.png b/public/images/media/dashboard-2.png index 3e6d07df..059a9ff3 100644 Binary files a/public/images/media/dashboard-2.png and b/public/images/media/dashboard-2.png differ diff --git a/public/images/media/dashboard-3.png b/public/images/media/dashboard-3.png index eec8cb02..db209e8c 100644 Binary files a/public/images/media/dashboard-3.png and b/public/images/media/dashboard-3.png differ diff --git a/public/images/media/dashboard-4.png b/public/images/media/dashboard-4.png index d9dfcff7..eb480b29 100644 Binary files a/public/images/media/dashboard-4.png and b/public/images/media/dashboard-4.png differ diff --git a/src/components/CardBox/index.vue b/src/components/CardBox/index.vue index 99a71da1..b00eda59 100644 --- a/src/components/CardBox/index.vue +++ b/src/components/CardBox/index.vue @@ -146,8 +146,8 @@ const getBackgroundColor = (code: string | number) => { const _color = color[code] || color.default; return `linear-gradient( 188.4deg, - rgba(${_color}, 0.03) 22.94%, - rgba(${_color}, 0) 94.62% + rgba(${_color}, 0.03) 30%, + rgba(${_color}, 0) 80% )`; }; diff --git a/src/components/FRuleEditor/Debug/index.vue b/src/components/FRuleEditor/Debug/index.vue index 8f381a60..a1767adb 100644 --- a/src/components/FRuleEditor/Debug/index.vue +++ b/src/components/FRuleEditor/Debug/index.vue @@ -201,6 +201,7 @@ onUnmounted(() => { if (ws.value) { ws.value.unsubscribe?.(); } + clearAction() }) const options = ref<{ label: string, value: string }[]>() diff --git a/src/store/scene.ts b/src/store/scene.ts index 0a3e4733..8fa138de 100644 --- a/src/store/scene.ts +++ b/src/store/scene.ts @@ -32,20 +32,14 @@ export const defaultBranches = [ { terms: [ { - terms: [ - { - column: undefined, - value: { - source: 'fixed', - value: undefined - }, - termType: undefined, - key: 'params_1', - type: 'and', - }, - ], + column: undefined, + value: { + source: 'fixed', + value: undefined + }, + termType: undefined, + key: 'params_1', type: 'and', - key: 'terms_1_terms_1', }, ], type: 'and', @@ -124,6 +118,7 @@ export const useSceneStore = defineStore('scene', () => { branches.push(null); } } + console.log(branches) data.value = { ...result, trigger: result.trigger || {}, diff --git a/src/views/device/Firmware/Task/Detail/index.vue b/src/views/device/Firmware/Task/Detail/index.vue index 8baa8347..638e5a14 100644 --- a/src/views/device/Firmware/Task/Detail/index.vue +++ b/src/views/device/Firmware/Task/Detail/index.vue @@ -72,6 +72,13 @@ }" :params="params" > + diff --git a/src/views/link/AccessConfig/components/Cloud/OneNet.vue b/src/views/link/AccessConfig/components/Cloud/OneNet.vue index 5530b7ee..6e06e45f 100644 --- a/src/views/link/AccessConfig/components/Cloud/OneNet.vue +++ b/src/views/link/AccessConfig/components/Cloud/OneNet.vue @@ -372,14 +372,7 @@
- - 下一步 - + 上一步 保存 - 上一步 + + 下一步 + +
diff --git a/src/views/link/AccessConfig/components/Edge/index.vue b/src/views/link/AccessConfig/components/Edge/index.vue index c6eee197..ecf61831 100644 --- a/src/views/link/AccessConfig/components/Edge/index.vue +++ b/src/views/link/AccessConfig/components/Edge/index.vue @@ -178,13 +178,7 @@ v-if="channel !== 'edge-child-device'" :class="current !== 1 ? 'steps-action' : 'steps-action-save'" > - - 下一步 - + 上一步 保存 - 上一步 + + 下一步 + diff --git a/src/views/link/AccessConfig/components/Network/index.vue b/src/views/link/AccessConfig/components/Network/index.vue index 21c435be..d35822b4 100644 --- a/src/views/link/AccessConfig/components/Network/index.vue +++ b/src/views/link/AccessConfig/components/Network/index.vue @@ -279,12 +279,11 @@
- 下一步 + 上一步 - 上一步 + 下一步
diff --git a/src/views/link/AccessConfig/components/Plugin/index.vue b/src/views/link/AccessConfig/components/Plugin/index.vue index e2d32131..de06dd8a 100644 --- a/src/views/link/AccessConfig/components/Plugin/index.vue +++ b/src/views/link/AccessConfig/components/Plugin/index.vue @@ -134,13 +134,13 @@
- 下一步 + 上一步 + - 上一步 + 下一步
diff --git a/src/views/media/DashBoard/components/TopCard.vue b/src/views/media/DashBoard/components/TopCard.vue index e0c2c1eb..ab6f6e34 100644 --- a/src/views/media/DashBoard/components/TopCard.vue +++ b/src/views/media/DashBoard/components/TopCard.vue @@ -76,8 +76,9 @@ const props = defineProps({ align-items: flex-end; justify-content: flex-end; img { - width: 100%; + width: 100px; height: 100%; + transform: translateY(2px); } } } diff --git a/src/views/media/Home/components/BasicCountCard.vue b/src/views/media/Home/components/BasicCountCard.vue index d066070f..820d4bbb 100644 --- a/src/views/media/Home/components/BasicCountCard.vue +++ b/src/views/media/Home/components/BasicCountCard.vue @@ -15,7 +15,7 @@
通道数量
{{ channelCount }}
- +
diff --git a/src/views/notice/Template/Detail/index.vue b/src/views/notice/Template/Detail/index.vue index b958019a..da25114b 100644 --- a/src/views/notice/Template/Detail/index.vue +++ b/src/views/notice/Template/Detail/index.vue @@ -1219,8 +1219,13 @@ const handleSubmit = () => { delete formData.value.template.ttsmessage; } - if (formData.value.provider === 'dingTalkRobotWebHook' && formData.value.template?.messageType === 'text') { - formData.value.template.text!.content = formData.value.template.message as string + if (formData.value.provider === 'dingTalkRobotWebHook') { + if (formData.value.template?.messageType === 'text') { + formData.value.template.text!.content = formData.value.template.message as string + } + if (formData.value.template.messageType === 'markdown') { + formData.value.template.markdown!.text = formData.value.template.message + } } formRef.value?.validate() diff --git a/src/views/rule-engine/Alarm/Log/Record/index.vue b/src/views/rule-engine/Alarm/Log/Record/index.vue index 158b20f6..990c312b 100644 --- a/src/views/rule-engine/Alarm/Log/Record/index.vue +++ b/src/views/rule-engine/Alarm/Log/Record/index.vue @@ -65,6 +65,7 @@ const columns = [ dataIndex: 'handleTime', key: 'handleTime', scopedSlots: true, + width: 180, search: { type: 'date', }, @@ -74,6 +75,7 @@ const columns = [ title: '处理类型', key: 'handleType', scopedSlots: true, + width: 120, search: { type: 'select', options: [ @@ -96,11 +98,13 @@ const columns = [ search: { type: 'date', }, + width:180, }, { title: '告警处理', dataIndex: 'description', key: 'description', + ellipsis: true, search: { type: 'string', }, diff --git a/src/views/rule-engine/DashBoard/components/NewAlarm.vue b/src/views/rule-engine/DashBoard/components/NewAlarm.vue index c830063f..81b0fb6c 100644 --- a/src/views/rule-engine/DashBoard/components/NewAlarm.vue +++ b/src/views/rule-engine/DashBoard/components/NewAlarm.vue @@ -120,7 +120,7 @@ const jumpDetail = (item:any) =>{ } } .new-alarm-item-level { - width: 52px; + width: 70px; padding: 2px 8px; color: #fff; text-align: center; diff --git a/src/views/rule-engine/DashBoard/components/TopCard.vue b/src/views/rule-engine/DashBoard/components/TopCard.vue index a8d07992..7bf5138c 100644 --- a/src/views/rule-engine/DashBoard/components/TopCard.vue +++ b/src/views/rule-engine/DashBoard/components/TopCard.vue @@ -78,8 +78,8 @@ const props = defineProps({ align-items: flex-end; justify-content: flex-end; img { - width: 100%; - height: 100%; + width: 100px; + height: 100px; } } .content-right-echart{ 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 167f84c1..b744e408 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 @@ -52,7 +52,7 @@ \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index b446c4d5..916777a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3836,10 +3836,10 @@ jetlinks-ui-components@1.0.5: lodash-es "^4.17.21" monaco-editor "^0.35.0" -jetlinks-ui-components@^1.0.8: - version "1.0.8" - resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.8.tgz#bcbdbbdc6c0011207f15cbb51fadcc8389803f53" - integrity sha512-FdXSS4Wdnq5cCUKP5f6Z/3FHu3XHFkRIzSAvkUQdneHbYO6iHkEjMJyHChttlP9cp4s6ydRpeqY2jjtoftYhtA== +jetlinks-ui-components@^1.0.9: + version "1.0.9" + resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.9.tgz#c71e593e65b9e8dd16c746cebf16d45339a0d340" + integrity sha512-NRKA20IYMvaGabJTnt180ahjL6ERJz8rDohAMtaP4bWQeSAq89hBB5s6XMRJK4VexliEEo4+V3E/edK2iNsGWg== dependencies: "@vueuse/core" "^9.12.0" "@vueuse/router" "^9.13.0"