From 701a0ecfddeaedf7588ce830430c5a60e1dfa99c Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Mon, 13 Mar 2023 14:59:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index eb3c78e3..c1d0ad47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3695,8 +3695,8 @@ jetlinks-store@^0.0.3: jetlinks-ui-components@^1.0.5: version "1.0.5" - resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#de995a654e2613c988fac2e800b156285265c9be" - integrity sha512-rZtqFmxhU9nplFqqp45bHJAoiH4zzLM8juMGQV6eCCkzquXLmDqATiAK2D/fquAcLMIY0fPgw/Dzc9odQDKmVg== + resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#30de07a15481f13ea86ebc817baaab3c99034403" + integrity sha512-ULgSPU0xY6xUky3beeHVvpHyAHmT6xHsO5eS5m7a3h7AmCoxA3oTWyF20vC+K1zTJBQ7LFCouySqRRz6GimAPg== dependencies: "@vueuse/core" "^9.12.0" ant-design-vue "^3.2.15" From fc53dae72464114aef6764462e73ffe52562e22b Mon Sep 17 00:00:00 2001 From: wangshuaiswim Date: Mon, 13 Mar 2023 15:11:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FRuleEditor/Advance/index.vue | 1 - src/components/FRuleEditor/Debug/index.vue | 1 - src/components/FRuleEditor/Operator/index.vue | 1 - src/components/Metadata/JsonParam/index.vue | 1 - src/views/device/components/Metadata/Base/Edit/index.vue | 2 -- src/views/device/components/Metadata/Base/Edit/validator.ts | 1 - src/views/device/components/Metadata/Import/index.vue | 1 - 7 files changed, 8 deletions(-) diff --git a/src/components/FRuleEditor/Advance/index.vue b/src/components/FRuleEditor/Advance/index.vue index d938c37a..5fa8e908 100644 --- a/src/components/FRuleEditor/Advance/index.vue +++ b/src/components/FRuleEditor/Advance/index.vue @@ -45,7 +45,6 @@ const handleCancel = () => { emit('change', 'simple') } const handleOk = () => { - console.log(_value.value) emit('update:value', _value.value) emit('change', 'simple') } diff --git a/src/components/FRuleEditor/Debug/index.vue b/src/components/FRuleEditor/Debug/index.vue index 0cc843e0..86531687 100644 --- a/src/components/FRuleEditor/Debug/index.vue +++ b/src/components/FRuleEditor/Debug/index.vue @@ -185,7 +185,6 @@ const getProperty = () => { label: item.name, value: item.id, })); - console.log(options.value) } getProperty() diff --git a/src/components/FRuleEditor/Operator/index.vue b/src/components/FRuleEditor/Operator/index.vue index 21ae192a..c9adaec7 100644 --- a/src/components/FRuleEditor/Operator/index.vue +++ b/src/components/FRuleEditor/Operator/index.vue @@ -87,7 +87,6 @@ const productStore = useProductStore() const getData = async (id?: string) => { const metadata = productStore.current.metadata || '{}'; - console.log('metadata', metadata) const _properties = JSON.parse(metadata).properties || [] as PropertyMetadata[] const properties = { id: 'property', diff --git a/src/components/Metadata/JsonParam/index.vue b/src/components/Metadata/JsonParam/index.vue index b11640d3..7c0f29ba 100644 --- a/src/components/Metadata/JsonParam/index.vue +++ b/src/components/Metadata/JsonParam/index.vue @@ -96,7 +96,6 @@ const handleDelete = (index: number) => { _value.value.splice(index, 1) } const handleClose = () => { - console.log(editIndex.value) editIndex.value = -1 } const handleAdd = () => { diff --git a/src/views/device/components/Metadata/Base/Edit/index.vue b/src/views/device/components/Metadata/Base/Edit/index.vue index b24bb37b..ff5e08ef 100644 --- a/src/views/device/components/Metadata/Base/Edit/index.vue +++ b/src/views/device/components/Metadata/Base/Edit/index.vue @@ -76,8 +76,6 @@ const save = reactive({ const type = metadataStore.model.type const _detail: ProductItem | DeviceInstance = props.type === 'device' ? instanceStore.detail : productStore.current const _metadata = JSON.parse(_detail?.metadata || '{}') - console.log(_metadata) - console.log(type) const list = (_metadata[type] as any[]) || [] if (formValue.id) { if (metadataStore.model.action === 'add' && list.some(item => item.id === formValue.id)) { diff --git a/src/views/device/components/Metadata/Base/Edit/validator.ts b/src/views/device/components/Metadata/Base/Edit/validator.ts index 15724c6b..d0ab32fb 100644 --- a/src/views/device/components/Metadata/Base/Edit/validator.ts +++ b/src/views/device/components/Metadata/Base/Edit/validator.ts @@ -39,7 +39,6 @@ export const validateIdName = async (_rule: Rule, val: Record) => { } export const validateValueType = async (_rule: Rule, val: Record, title = '数据类型') => { - console.log(val) if (!val) return Promise.reject(new Error('请输入元素配置')); if (!val?.type) { return Promise.reject(new Error(`请选择${title}`)) diff --git a/src/views/device/components/Metadata/Import/index.vue b/src/views/device/components/Metadata/Import/index.vue index e0c8ef15..2b87f294 100644 --- a/src/views/device/components/Metadata/Import/index.vue +++ b/src/views/device/components/Metadata/Import/index.vue @@ -164,7 +164,6 @@ const beforeUpload: UploadProps['beforeUpload'] = file => { } const fileChange = (info: UploadChangeParam) => { if (info.file.status === 'done') { - console.log(info) const { response } = info.file if (response.status === 200) { formModel.upload = response.result