diff --git a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/message.vue b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/message.vue index aee71e18f..0a8f971a3 100644 --- a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/message.vue +++ b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/message.vue @@ -15,7 +15,7 @@ import { DICT_TYPE, IotDeviceMessageMethodEnum } from '@vben/constants'; import { IconifyIcon } from '@vben/icons'; import { formatDateTime } from '@vben/utils'; -import { Button, Select, Space, Switch, Tag } from 'antdv-next'; +import { Button, Select, SelectOption, Space, Switch, Tag } from 'antdv-next'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getDeviceMessagePage } from '#/api/iot/device/device'; @@ -196,14 +196,14 @@ defineExpose({ placeholder="所有方法" style="width: 160px" > - {{ item.label }} - + - 上行 - 下行 + 上行 + 下行 diff --git a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-event.vue b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-event.vue index 97d50cdba..39cc4cb54 100644 --- a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-event.vue +++ b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-event.vue @@ -14,7 +14,7 @@ import { import { IconifyIcon } from '@vben/icons'; import { formatDateTime } from '@vben/utils'; -import { Button, DatePicker, Select, Space, Tag } from 'antdv-next'; +import { Button, DatePicker, Select, SelectOption, Space, Tag } from 'antdv-next'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getDeviceMessagePairPage } from '#/api/iot/device/device'; @@ -213,13 +213,13 @@ defineExpose({ placeholder="请选择事件标识符" style="width: 240px" > - {{ event.name }}({{ event.identifier }}) - + diff --git a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-service.vue b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-service.vue index fbab67035..5837e244e 100644 --- a/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-service.vue +++ b/apps/web-antdv-next/src/views/iot/device/device/detail/modules/thing-model-service.vue @@ -14,7 +14,7 @@ import { import { IconifyIcon } from '@vben/icons'; import { formatDateTime } from '@vben/utils'; -import { Button, DatePicker, Select, Space, Tag } from 'antdv-next'; +import { Button, DatePicker, Select, SelectOption, Space, Tag } from 'antdv-next'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { getDeviceMessagePairPage } from '#/api/iot/device/device'; @@ -227,13 +227,13 @@ defineExpose({ placeholder="请选择服务标识符" style="width: 240px" > - {{ service.name }}({{ service.identifier }}) - + diff --git a/apps/web-antdv-next/src/views/iot/device/device/index.vue b/apps/web-antdv-next/src/views/iot/device/device/index.vue index f28362608..2a6fe10ae 100644 --- a/apps/web-antdv-next/src/views/iot/device/device/index.vue +++ b/apps/web-antdv-next/src/views/iot/device/device/index.vue @@ -21,6 +21,7 @@ import { Input, message, Select, + SelectOption, Space, Tag, } from 'antdv-next'; @@ -292,13 +293,13 @@ onMounted(async () => { allow-clear style="width: 200px" > - {{ product.name }} - + { allow-clear style="width: 200px" > - {{ dict.label }} - + { allow-clear style="width: 200px" > - {{ dict.label }} - + { allow-clear style="width: 200px" > - {{ group.name }} - + diff --git a/apps/web-antdv-next/src/views/iot/rule/data/sink/config/http-config-form.vue b/apps/web-antdv-next/src/views/iot/rule/data/sink/config/http-config-form.vue index cf0a2b76b..7f4e5a786 100644 --- a/apps/web-antdv-next/src/views/iot/rule/data/sink/config/http-config-form.vue +++ b/apps/web-antdv-next/src/views/iot/rule/data/sink/config/http-config-form.vue @@ -5,7 +5,7 @@ import { computed, onMounted, ref, watch } from 'vue'; import { isEmpty } from '@vben/utils'; import { useVModel } from '@vueuse/core'; -import { FormItem, Input, Select } from 'antdv-next'; +import { FormItem, Input, Select, SelectOption } from 'antdv-next'; import { IotDataSinkTypeEnum } from '#/api/iot/rule/data/sink'; @@ -68,8 +68,8 @@ onMounted(() => { - http:// - https:// + http:// + https:// @@ -82,10 +82,10 @@ onMounted(() => { label="请求方法" > - GET - POST - PUT - DELETE + GET + POST + PUT + DELETE diff --git a/apps/web-antdv-next/src/views/iot/rule/data/sink/config/tcp-config-form.vue b/apps/web-antdv-next/src/views/iot/rule/data/sink/config/tcp-config-form.vue index 347dd682c..00b5eae77 100644 --- a/apps/web-antdv-next/src/views/iot/rule/data/sink/config/tcp-config-form.vue +++ b/apps/web-antdv-next/src/views/iot/rule/data/sink/config/tcp-config-form.vue @@ -4,7 +4,7 @@ import { onMounted } from 'vue'; import { isEmpty } from '@vben/utils'; import { useVModel } from '@vueuse/core'; -import { FormItem, Input, InputNumber, Select, Switch } from 'antdv-next'; +import { FormItem, Input, InputNumber, Select, SelectOption, Switch } from 'antdv-next'; import { IotDataSinkTypeEnum } from '#/api/iot/rule/data/sink'; @@ -114,8 +114,8 @@ onMounted(() => { label="数据格式" > - JSON - BINARY + JSON + BINARY diff --git a/apps/web-antdv-next/src/views/iot/rule/data/sink/config/websocket-config-form.vue b/apps/web-antdv-next/src/views/iot/rule/data/sink/config/websocket-config-form.vue index 8789412d3..d0868401e 100644 --- a/apps/web-antdv-next/src/views/iot/rule/data/sink/config/websocket-config-form.vue +++ b/apps/web-antdv-next/src/views/iot/rule/data/sink/config/websocket-config-form.vue @@ -4,7 +4,7 @@ import { onMounted } from 'vue'; import { isEmpty } from '@vben/utils'; import { useVModel } from '@vueuse/core'; -import { FormItem, Input, InputNumber, Select, Switch } from 'antdv-next'; +import { FormItem, Input, InputNumber, Select, SelectOption, Switch } from 'antdv-next'; import { IotDataSinkTypeEnum } from '#/api/iot/rule/data/sink'; @@ -120,8 +120,8 @@ onMounted(() => { label="数据格式" > - JSON - TEXT + JSON + TEXT diff --git a/apps/web-antdv-next/src/views/iot/rule/data/sink/modules/form.vue b/apps/web-antdv-next/src/views/iot/rule/data/sink/modules/form.vue index a74094fca..508f30f80 100644 --- a/apps/web-antdv-next/src/views/iot/rule/data/sink/modules/form.vue +++ b/apps/web-antdv-next/src/views/iot/rule/data/sink/modules/form.vue @@ -7,7 +7,7 @@ import { useVbenModal } from '@vben/common-ui'; import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; -import { Form, FormItem, Input, message, Radio, Select } from 'antdv-next'; +import { Form, FormItem, Input, message, Radio, RadioGroup, Select } from 'antdv-next'; import { createDataSink, @@ -178,7 +178,7 @@ function handleTypeChange(type: number) { label="目的状态" name="status" > - + {{ dict.label }} - + diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/alert-config.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/alert-config.vue index 49ef1e9ae..c4823d22a 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/alert-config.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/alert-config.vue @@ -3,7 +3,7 @@ import { onMounted, ref } from 'vue'; import { useVModel } from '@vueuse/core'; -import { FormItem, Select } from 'antdv-next'; +import { FormItem, Select, SelectOption } from 'antdv-next'; import { getSimpleAlertConfigList } from '#/api/iot/alert/config'; @@ -56,7 +56,7 @@ onMounted(() => { class="w-full" :loading="loading" > - - {{ option.label }} - + @@ -229,13 +229,13 @@ function handleOperatorChange() { placeholder="请选择操作符" class="w-full" > - {{ option.label }} - + @@ -249,13 +249,13 @@ function handleOperatorChange() { placeholder="请选择设备状态" class="w-full" > - {{ option.label }} - + diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/current-time-condition-config.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/current-time-condition-config.vue index d2252cf23..fb100b148 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/current-time-condition-config.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/current-time-condition-config.vue @@ -17,6 +17,7 @@ import { FormItem, Row, Select, + SelectOption, Tag, TimePicker, } from 'antdv-next'; @@ -187,7 +188,7 @@ watch( placeholder="请选择时间条件" class="w-full" > - - + diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/device-control-config.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/device-control-config.vue index 201784066..f6832b7fb 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/device-control-config.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/device-control-config.vue @@ -13,7 +13,7 @@ import { import { isObject } from '@vben/utils'; import { useVModel } from '@vueuse/core'; -import { Col, FormItem, Row, Select, Tag } from 'antdv-next'; +import { Col, FormItem, Row, Select, SelectOption, Tag } from 'antdv-next'; import { getThingModelTSLByProductId } from '#/api/iot/thingmodel'; @@ -348,7 +348,7 @@ watch( :loading="loadingServices" @change="handleServiceChange" > - - + diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue index 427d19694..684af42ad 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/configs/main-condition-inner-config.vue @@ -12,7 +12,7 @@ import { } from '@vben/constants'; import { useVModel } from '@vueuse/core'; -import { Col, FormItem, Input, Row, Select } from 'antdv-next'; +import { Col, FormItem, Input, Row, Select, SelectOption } from 'antdv-next'; import JsonParamsInput from '../inputs/json-params-input.vue'; import ValueInput from '../inputs/value-input.vue'; @@ -175,13 +175,13 @@ function handlePropertyChange(propertyInfo: any) { placeholder="请选择触发事件类型" class="w-full" > - {{ option.label }} - + @@ -321,7 +321,7 @@ function handlePropertyChange(propertyInfo: any) { placeholder="请选择操作符" class="w-full" > - + @@ -341,13 +341,13 @@ function handlePropertyChange(propertyInfo: any) { placeholder="请选择操作符" class="w-full" > - {{ option.label }} - + diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/inputs/value-input.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/inputs/value-input.vue index 0605aef55..d6ef66a0d 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/inputs/value-input.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/inputs/value-input.vue @@ -14,6 +14,7 @@ import { Input, InputNumber, Select, + SelectOption, Tag, Tooltip, } from 'antdv-next'; @@ -209,8 +210,8 @@ watch( placeholder="请选择布尔值" class="w-full!" > - 真 (true) - 假 (false) + 真 (true) + 假 (false) @@ -222,13 +223,13 @@ watch( placeholder="请选择枚举值" class="w-full!" > - {{ option.label }} - + diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/action-section.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/action-section.vue index aacfa0562..2a9c5f559 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/action-section.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/action-section.vue @@ -11,7 +11,7 @@ import { IconifyIcon } from '@vben/icons'; import { getStableObjectKey } from '@vben/utils'; import { useVModel } from '@vueuse/core'; -import { Button, Card, Empty, FormItem, Select, Tag } from 'antdv-next'; +import { Button, Card, Empty, FormItem, Select, SelectOption, Tag } from 'antdv-next'; import AlertConfig from '../configs/alert-config.vue'; import DeviceControlConfig from '../configs/device-control-config.vue'; @@ -235,13 +235,13 @@ function onActionTypeChange(action: RuleSceneApi.Action, type: number) { placeholder="请选择执行类型" class="w-full" > - {{ option.label }} - + diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/basic-info-section.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/basic-info-section.vue index 2efa0f48c..de1f848e8 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/basic-info-section.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/sections/basic-info-section.vue @@ -7,7 +7,7 @@ import { getDictOptions } from '@vben/hooks'; import { IconifyIcon } from '@vben/icons'; import { useVModel } from '@vueuse/core'; -import { Card, Col, FormItem, Input, Radio, Row } from 'antdv-next'; +import { Card, Col, FormItem, Input, Radio, RadioGroup, Row } from 'antdv-next'; import { DictTag } from '#/components/dict-tag'; @@ -56,7 +56,7 @@ const formData = useVModel(props, 'modelValue', emit); // 表单数据 - + - - + diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/operator-selector.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/operator-selector.vue index 2e97aaee9..3f6441cda 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/operator-selector.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/operator-selector.vue @@ -8,7 +8,7 @@ import { } from '@vben/constants'; import { useVModel } from '@vueuse/core'; -import { Select } from 'antdv-next'; +import { Select, SelectOption } from 'antdv-next'; /** 操作符选择器组件 */ defineOptions({ name: 'OperatorSelector' }); @@ -245,7 +245,7 @@ watch( class="w-full" option-label-prop="label" > - - + diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/product-selector.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/product-selector.vue index ee7177d16..e750c1557 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/product-selector.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/product-selector.vue @@ -4,7 +4,7 @@ import { onMounted, ref } from 'vue'; import { DICT_TYPE } from '@vben/constants'; -import { Select } from 'antdv-next'; +import { Select, SelectOption } from 'antdv-next'; import { getSimpleProductList } from '#/api/iot/product/product'; import { DictTag } from '#/components/dict-tag'; @@ -64,7 +64,7 @@ onMounted(() => { option-label-prop="label" :loading="productLoading" > - { - + diff --git a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/property-selector.vue b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/property-selector.vue index e16c1de5f..fc6b49624 100644 --- a/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/property-selector.vue +++ b/apps/web-antdv-next/src/views/iot/rule/scene/form/selectors/property-selector.vue @@ -16,7 +16,7 @@ import { import { IconifyIcon } from '@vben/icons'; import { useVModel } from '@vueuse/core'; -import { Button, Popover, Select, Tag } from 'antdv-next'; +import { Button, Popover, Select, SelectOptGroup, SelectOption, Tag } from 'antdv-next'; import { getThingModelTSLByProductId } from '#/api/iot/thingmodel'; @@ -219,12 +219,12 @@ watch( option-label-prop="label" :loading="loading" > - - - - + + diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/data-specs/array.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/data-specs/array.vue index 23660e9b9..b3efb903f 100644 --- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/data-specs/array.vue +++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/data-specs/array.vue @@ -5,7 +5,7 @@ import type { Ref } from 'vue'; import { getDataTypeOptions, IoTDataSpecsDataTypeEnum } from '@vben/constants'; import { useVModel } from '@vueuse/core'; -import { FormItem, Input, Radio } from 'antdv-next'; +import { FormItem, Input, Radio, RadioGroup } from 'antdv-next'; import { ThingModelFormRules } from '#/api/iot/thingmodel'; @@ -39,7 +39,7 @@ function handleChange(e: any) { :rules="ThingModelFormRules.childDataType" label="元素类型" > - + {{ `${item.value}(${item.label})` }} - + (); const emits = defineEmits(['update:modelValue']); @@ -134,13 +134,13 @@ function validateStep(_rule: any, _value: any, callback: any) { class="w-full" @change="unitChange" > - {{ `${item.label}-${item.value}` }} - + diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/event.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/event.vue index 81a0f5284..d374d8f2f 100644 --- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/event.vue +++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/event.vue @@ -11,7 +11,7 @@ import { import { isEmpty } from '@vben/utils'; import { useVModel } from '@vueuse/core'; -import { FormItem, Radio } from 'antdv-next'; +import { FormItem, Radio, RadioGroup } from 'antdv-next'; import { ThingModelFormRules } from '#/api/iot/thingmodel'; @@ -37,7 +37,7 @@ watch( :rules="ThingModelFormRules.eventType" label="事件类型" > - + {{ eventType.label }} - + - - + {{ dict.label }} - - + + diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/property.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/property.vue index a5dbc2b9f..ad06d60f9 100644 --- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/property.vue +++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/property.vue @@ -14,7 +14,7 @@ import { import { isEmpty } from '@vben/utils'; import { useVModel } from '@vueuse/core'; -import { FormItem, Input, Radio, Select } from 'antdv-next'; +import { FormItem, Input, Radio, RadioGroup, Select, SelectOption } from 'antdv-next'; import { ThingModelFormRules, validateBoolName } from '#/api/iot/thingmodel'; @@ -113,13 +113,13 @@ if (!props.isStructDataSpecs && !props.isParams) { @change="handleChange" > - {{ `${option.value}(${option.label})` }} - + @@ -201,7 +201,7 @@ if (!props.isStructDataSpecs && !props.isParams) { :rules="ThingModelFormRules.accessMode" label="读写类型" > - + {{ accessMode.label }} - + diff --git a/apps/web-antdv-next/src/views/iot/thingmodel/modules/service.vue b/apps/web-antdv-next/src/views/iot/thingmodel/modules/service.vue index f1ca5415e..417d95f20 100644 --- a/apps/web-antdv-next/src/views/iot/thingmodel/modules/service.vue +++ b/apps/web-antdv-next/src/views/iot/thingmodel/modules/service.vue @@ -11,7 +11,7 @@ import { import { isEmpty } from '@vben/utils'; import { useVModel } from '@vueuse/core'; -import { FormItem, Radio } from 'antdv-next'; +import { FormItem, Radio, RadioGroup } from 'antdv-next'; import { ThingModelFormRules } from '#/api/iot/thingmodel'; @@ -48,7 +48,7 @@ function getParamIdentifiers(params?: any[]) { :rules="ThingModelFormRules.callType" label="调用方式" > - + {{ callType.label }} - + { - - 代码视图 - 编辑器视图 - + + 代码视图 + 编辑器视图 + { show-search @change="handleChange" > - { {{ item.name }} 编号: {{ item.code }} - + diff --git a/apps/web-antdv-next/src/views/mes/md/workstation/components/workshop-select.vue b/apps/web-antdv-next/src/views/mes/md/workstation/components/workshop-select.vue index e31786014..6c2edc5c9 100644 --- a/apps/web-antdv-next/src/views/mes/md/workstation/components/workshop-select.vue +++ b/apps/web-antdv-next/src/views/mes/md/workstation/components/workshop-select.vue @@ -3,7 +3,7 @@ import type { MesMdWorkshopApi } from '#/api/mes/md/workstation/workshop'; import { computed, onMounted, ref, watch } from 'vue'; -import { Select, Tag, Tooltip } from 'antdv-next'; +import { Select, SelectOption, Tag, Tooltip } from 'antdv-next'; import { getWorkshopSimpleList } from '#/api/mes/md/workstation/workshop'; @@ -101,7 +101,7 @@ onMounted(async () => { show-search @change="handleChange" > - { {{ item.name }} {{ item.code }} - + diff --git a/apps/web-antdv-next/src/views/mes/pro/andon/config/components/select.vue b/apps/web-antdv-next/src/views/mes/pro/andon/config/components/select.vue index f397c6a75..b7c820f74 100644 --- a/apps/web-antdv-next/src/views/mes/pro/andon/config/components/select.vue +++ b/apps/web-antdv-next/src/views/mes/pro/andon/config/components/select.vue @@ -5,7 +5,7 @@ import { computed, onMounted, ref } from 'vue'; import { DICT_TYPE } from '@vben/constants'; -import { Select } from 'antdv-next'; +import { Select, SelectOption } from 'antdv-next'; import { getAndonConfigList } from '#/api/mes/pro/andon/config'; import DictTag from '#/components/dict-tag/dict-tag.vue'; @@ -73,7 +73,7 @@ onMounted(async () => { show-search @change="handleChange" > - { {{ item.reason }} - + diff --git a/apps/web-antdv-next/src/views/mes/pro/process/components/select.vue b/apps/web-antdv-next/src/views/mes/pro/process/components/select.vue index 44b7f36ec..53e55c646 100644 --- a/apps/web-antdv-next/src/views/mes/pro/process/components/select.vue +++ b/apps/web-antdv-next/src/views/mes/pro/process/components/select.vue @@ -3,7 +3,7 @@ import type { MesProProcessApi } from '#/api/mes/pro/process'; import { computed, onMounted, ref, watch } from 'vue'; -import { Select, Tag, Tooltip } from 'antdv-next'; +import { Select, SelectOption, Tag, Tooltip } from 'antdv-next'; import { getProcessSimpleList } from '#/api/mes/pro/process'; @@ -98,7 +98,7 @@ onMounted(async () => { show-search @change="handleChange" > - { {{ item.name }} {{ item.code }} - +