@@ -275,14 +275,14 @@ function onActionTypeChange(action: Action, type: any) {
action.type ===
IotRuleSceneActionTypeEnum.ALERT_TRIGGER.toString()
"
- class="border-border bg-fill-color-blank rounded-lg border p-4"
+ class="bg-fill-color-blank rounded-lg border border-border p-4"
>
+
当触发条件满足时,系统将自动发送告警通知,可在菜单 [告警中心 ->
告警配置] 管理。
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/sections/basic-info-section.vue b/apps/web-antd/src/views/iot/rule/scene/form/sections/basic-info-section.vue
index 872a05dbb..034cb6bbe 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/sections/basic-info-section.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/sections/basic-info-section.vue
@@ -8,7 +8,8 @@ import { IconifyIcon } from '@vben/icons';
import { useVModel } from '@vueuse/core';
import { Card, Col, Form, Input, Radio, Row } from 'ant-design-vue';
-import { DictTag } from "#/components/dict-tag";
+
+import { DictTag } from '#/components/dict-tag';
/** 基础信息配置组件 */
defineOptions({ name: 'BasicInfoSection' });
@@ -26,7 +27,7 @@ const formData = useVModel(props, 'modelValue', emit); // 表单数据
-
+
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/sections/trigger-section.vue b/apps/web-antd/src/views/iot/rule/scene/form/sections/trigger-section.vue
index 2a3e3138e..2087030ce 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/sections/trigger-section.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/sections/trigger-section.vue
@@ -118,7 +118,7 @@ onMounted(() => {
-
+
@@ -201,7 +201,7 @@ onMounted(() => {
class="gap-16px flex flex-col"
>
{
{{ operator.symbol }}
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/selectors/product-selector.vue b/apps/web-antd/src/views/iot/rule/scene/form/selectors/product-selector.vue
index 52e3c9a6f..51588298e 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/selectors/product-selector.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/selectors/product-selector.vue
@@ -7,7 +7,7 @@ import { DICT_TYPE } from '@vben/constants';
import { Select } from 'ant-design-vue';
import { getSimpleProductList } from '#/api/iot/product/product';
-import { DictTag } from "#/components/dict-tag";
+import { DictTag } from '#/components/dict-tag';
/** 产品选择器组件 */
defineOptions({ name: 'ProductSelector' });
@@ -78,7 +78,7 @@ onMounted(() => {
{{ product.productKey }}
-
+
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/selectors/property-selector.vue b/apps/web-antd/src/views/iot/rule/scene/form/selectors/property-selector.vue
index e425621eb..31bf39012 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/selectors/property-selector.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/selectors/property-selector.vue
@@ -41,6 +41,7 @@ const emit = defineEmits<{
(e: 'change', value: { config: any; type: string }): void;
}>();
+// TODO 芋艿
/** 属性选择器内部使用的统一数据结构 */
interface PropertySelectorItem {
identifier: string;
@@ -296,7 +297,7 @@ watch(
:value="property.identifier"
>
-
+
{{ property.name }}
-
+
标识符:
-
+
{{ selectedProperty.identifier }}
@@ -363,28 +364,28 @@ watch(
v-if="selectedProperty.description"
class="gap-8px flex items-start"
>
-
+
描述:
-
+
{{ selectedProperty.description }}
-
+
单位:
-
+
{{ selectedProperty.unit }}
-
+
取值范围:
-
+
{{ selectedProperty.range }}
@@ -397,10 +398,10 @@ watch(
"
class="gap-8px flex items-start"
>
-
+
访问模式:
-
+
{{ getAccessModeLabel(selectedProperty.accessMode) }}
@@ -412,10 +413,10 @@ watch(
"
class="gap-8px flex items-start"
>
-
+
事件类型:
-
+
{{ getEventTypeLabel(selectedProperty.eventType) }}
@@ -427,10 +428,10 @@ watch(
"
class="gap-8px flex items-start"
>
-
+
调用类型:
-
+
{{ getThingModelServiceCallTypeLabel(selectedProperty.callType) }}
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/index.ts b/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/index.ts
index 82267c3d0..2aa250005 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/index.ts
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/index.ts
@@ -1,4 +1,4 @@
-export {default as ThingModelArrayDataSpecs} from './thing-model-array-data-specs.vue';
-export {default as ThingModelEnumDataSpecs} from './thing-model-enum-data-specs.vue';
-export {default as ThingModelNumberDataSpecs} from './thing-model-number-data-specs.vue';
-export {default as ThingModelStructDataSpecs} from './thing-model-struct-data-specs.vue';
+export { default as ThingModelArrayDataSpecs } from './thing-model-array-data-specs.vue';
+export { default as ThingModelEnumDataSpecs } from './thing-model-enum-data-specs.vue';
+export { default as ThingModelNumberDataSpecs } from './thing-model-number-data-specs.vue';
+export { default as ThingModelStructDataSpecs } from './thing-model-struct-data-specs.vue';
diff --git a/apps/web-antd/src/views/mall/product/spu/components/spu-showcase.vue b/apps/web-antd/src/views/mall/product/spu/components/spu-showcase.vue
index e1abcb255..01dcab3ae 100644
--- a/apps/web-antd/src/views/mall/product/spu/components/spu-showcase.vue
+++ b/apps/web-antd/src/views/mall/product/spu/components/spu-showcase.vue
@@ -123,7 +123,7 @@ function emitSpuChange() {
diff --git a/apps/web-antd/src/views/mall/promotion/combination/components/showcase.vue b/apps/web-antd/src/views/mall/promotion/combination/components/showcase.vue
index 1e61670d6..1c7e999a0 100644
--- a/apps/web-antd/src/views/mall/promotion/combination/components/showcase.vue
+++ b/apps/web-antd/src/views/mall/promotion/combination/components/showcase.vue
@@ -111,6 +111,7 @@ function emitActivityChange() {
>
+
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/image-bar/index.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/image-bar/index.vue
index dcdbd45e9..cae1a68e3 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/image-bar/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/image-bar/index.vue
@@ -12,7 +12,7 @@ defineProps<{ property: ImageBarProperty }>();
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-combination/index.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-combination/index.vue
index 713d226f9..bda1d61fb 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-combination/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/promotion-combination/index.vue
@@ -94,7 +94,7 @@ function calculateWidth() {
ref="containerRef"
>
-
+
点击绑定手机号
去绑定
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/index.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/index.vue
index 6ec29f49e..428f21429 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/index.vue
@@ -297,7 +297,7 @@ onMounted(() => {
-
+
@@ -350,7 +350,7 @@ onMounted(() => {
-
![]()
+
void) {
diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue b/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue
index c9484317b..174d845a3 100644
--- a/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue
+++ b/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue
@@ -159,7 +159,7 @@ onBeforeUnmount(() => {
会话记录
@@ -213,7 +213,7 @@ onBeforeUnmount(() => {
- {
// 使用展开运算符创建新数组,避免直接修改原数组
- return [...messageList.value].sort(
+ return [...messageList.value].toSorted(
(a: any, b: any) => a.createTime - b.createTime,
);
});
@@ -261,7 +261,7 @@ function showTime(item: MallKefuMessageApi.Message, index: number) {
@@ -415,7 +415,7 @@ function showTime(item: MallKefuMessageApi.Message, index: number) {
-
+
diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/message/order-item.vue b/apps/web-antd/src/views/mall/promotion/kefu/modules/message/order-item.vue
index 8e73ac8ae..ff0ecd986 100644
--- a/apps/web-antd/src/views/mall/promotion/kefu/modules/message/order-item.vue
+++ b/apps/web-antd/src/views/mall/promotion/kefu/modules/message/order-item.vue
@@ -78,7 +78,7 @@ function formatOrderStatus(order: any) {
订单号:
{{ getMessageContent.no }}
diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/emoji-select-popover.vue b/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/emoji-select-popover.vue
index a7a1027de..c1dcf8a2c 100644
--- a/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/emoji-select-popover.vue
+++ b/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/emoji-select-popover.vue
@@ -32,7 +32,7 @@ function handleSelect(item: Emoji) {
v-for="(item, index) in emojiList"
:key="index"
:title="item.name"
- class="w-1/10 border-primary m-2 flex cursor-pointer items-center justify-center border border-solid p-2"
+ class="w-1/10 m-2 flex cursor-pointer items-center justify-center border border-solid border-primary p-2"
@click="handleSelect(item)"
>
diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts
index 19c9ac5f1..f9c8823a1 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts
+++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts
@@ -12,7 +12,9 @@ import { getRangePickerDefaultProps } from '#/utils';
/** 关联数据 */
const userStore = useUserStore();
-const pickUpStoreList = ref([]);
+const pickUpStoreList = ref(
+ [],
+);
getSimpleDeliveryPickUpStoreList().then((res) => {
pickUpStoreList.value = res;
// 移除自己无法核销的门店
diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue
index 767fbc73e..bd73fb5e3 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue
+++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue
@@ -113,7 +113,8 @@ const [Modal, modalApi] = useVbenModal({
return;
}
// 加载数据
- const data = modalApi.getData();
+ const data =
+ modalApi.getData();
if (!data || !data.id) {
// 初始化地图
await initTencentLbsMap();
diff --git a/apps/web-antd/src/views/mp/message/index.vue b/apps/web-antd/src/views/mp/message/index.vue
index 1d6be08fd..832bafbb1 100644
--- a/apps/web-antd/src/views/mp/message/index.vue
+++ b/apps/web-antd/src/views/mp/message/index.vue
@@ -108,7 +108,7 @@ function showTotal(total: number) {
- |