@@ -41,6 +43,8 @@ const columns = [
},
{
title: '操作',
+ dataIndex: 'action',
+ width: 80
},
];
@@ -72,6 +76,16 @@ const change = (v: string) => {
emit('change', v);
};
+const confirm = () => {
+ emit('update:value', {
+ ...props.value,
+ valueType: {
+ properties: value.value,
+ type: props.value.valueType.type,
+ }
+ })
+}
+
watch(
() => props.value,
(newV) => {
@@ -80,15 +94,17 @@ watch(
{ immediate: true },
);
-watch(() => value.value, () => {
- emit('update:value', {
- ...props.value,
- valueType: {
- properties: value.value,
- type: props.value.valueType.type,
- }
- })
-})
-
+
diff --git a/src/views/device/components/Metadata/Base/components/Function/InputParams.vue b/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
index a5353135..4d56b1a5 100644
--- a/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
+++ b/src/views/device/components/Metadata/Base/components/Function/InputParams.vue
@@ -1,13 +1,19 @@
- {{ value?.map((item) => item.name).join(',') }}
+
+
+
-
+
diff --git a/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue b/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue
index 8cd2c778..f1b1eaf8 100644
--- a/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue
+++ b/src/views/device/components/Metadata/Base/components/Function/OutputParams.vue
@@ -1,9 +1,12 @@
@@ -80,8 +87,8 @@ const props = defineProps({
const options = ref<{ label: string; value: string }[]>([]);
const emit = defineEmits(['update:value']);
-const type = ref(props.value?.output.type);
-const data = ref(cloneDeep(props.value.output));
+const type = ref(props.value?.output?.type);
+const data = ref(cloneDeep(props.value?.output));
const typeChange = () => {
emit('update:value', {
@@ -93,7 +100,8 @@ const typeChange = () => {
watch(
() => props.value,
() => {
- type.value = props.value?.output.type;
+ type.value = props.value?.output?.type;
+ data.value = props.value?.output
if (['float', 'double', 'int', 'long'].includes(type.value)) {
const res = getUnit().then((res) => {
if (res.success) {
@@ -108,22 +116,28 @@ watch(
{ immediate: true, deep: true },
);
-watch(
- () => data.value,
- (newVal) => {
- emit('update:value', {
- ...props.value,
- output: {...newVal, type: type.value},
- });
- },
- { deep: true },
-);
+const valueChange = () => {
+ emit('update:value', {
+ ...props.value,
+ output: {...data.value, type: type.value},
+ });
+}
+
-
diff --git a/src/views/device/components/Metadata/Base/components/Tags/Type.vue b/src/views/device/components/Metadata/Base/components/Tags/Type.vue
new file mode 100644
index 00000000..5de16344
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/components/Tags/Type.vue
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/Base/components/index.ts b/src/views/device/components/Metadata/Base/components/index.ts
index fe968889..e52ae4fa 100644
--- a/src/views/device/components/Metadata/Base/components/index.ts
+++ b/src/views/device/components/Metadata/Base/components/index.ts
@@ -7,3 +7,4 @@ export { default as OutputParams } from './Function/OutputParams.vue';
export { default as ValueObject } from './Events/ValueObject.vue';
export { default as OtherConfigInfo } from './Events/OtherConfigInfo.vue';
export { default as ConfigParams } from './Events/ConfigParams.vue';
+export { default as TagsType } from './Tags/Type.vue'
diff --git a/yarn.lock b/yarn.lock
index c64804d0..4d690b27 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3825,8 +3825,8 @@ jetlinks-store@^0.0.3:
jetlinks-ui-components@^1.0.24:
version "1.0.24"
- resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#ff46844f8f1b9f6e4358b099014cbe5cc80b9630"
- integrity sha512-oc9MeVwJqar4LIICQWfNHFtD76h/Yl5v+xaj4u5xjIhDpvs1vwz/em9eHwToQ/yVCUShaexmweOOzhAN7od1cw==
+ resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#ca6ce161bc1ee4d0f6ecaa27a5dbc337b7405b4c"
+ integrity sha512-FILHvwT5ndedwRuL1vxqpj6X+0P/MIfegWRoz46hdjpJvnWbhfTHIJ+5bvLH49Bgh8RJ9khXXevYO073NSlyUw==
dependencies:
"@vueuse/core" "^9.12.0"
"@vueuse/router" "^9.13.0"