0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

This commit is contained in:
leiqiaochu 2023-03-13 15:15:23 +08:00
parent 3c16469ea4 58ba145a0e
commit ebaf89a8f0
8 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/FRuleEditor/Advance/index.vue
View File

@ -45,7 +45,6 @@ const handleCancel = () => {
emit('change', 'simple') emit('change', 'simple')
} }
const handleOk = () => { const handleOk = () => {
console.log(_value.value)
emit('update:value', _value.value) emit('update:value', _value.value)
emit('change', 'simple') emit('change', 'simple')
} }

1
src/components/FRuleEditor/Debug/index.vue
View File

@ -185,7 +185,6 @@ const getProperty = () => {
label: item.name, label: item.name,
value: item.id, value: item.id,
})); }));
console.log(options.value)
} }
getProperty() getProperty()
</script> </script>

1
src/components/FRuleEditor/Operator/index.vue
View File

@ -87,7 +87,6 @@ const productStore = useProductStore()
const getData = async (id?: string) => { const getData = async (id?: string) => {
const metadata = productStore.current.metadata || '{}'; const metadata = productStore.current.metadata || '{}';
console.log('metadata', metadata)
const _properties = JSON.parse(metadata).properties || [] as PropertyMetadata[] const _properties = JSON.parse(metadata).properties || [] as PropertyMetadata[]
const properties = { const properties = {
id: 'property', id: 'property',

1
src/components/Metadata/JsonParam/index.vue
View File

@ -96,7 +96,6 @@ const handleDelete = (index: number) => {
_value.value.splice(index, 1) _value.value.splice(index, 1)
} }
const handleClose = () => { const handleClose = () => {
console.log(editIndex.value)
editIndex.value = -1 editIndex.value = -1
} }
const handleAdd = () => { const handleAdd = () => {

2
src/views/device/components/Metadata/Base/Edit/index.vue
View File

@ -76,8 +76,6 @@ const save = reactive({
const type = metadataStore.model.type const type = metadataStore.model.type
const _detail: ProductItem | DeviceInstance = props.type === 'device' ? instanceStore.detail : productStore.current const _detail: ProductItem | DeviceInstance = props.type === 'device' ? instanceStore.detail : productStore.current
const _metadata = JSON.parse(_detail?.metadata || '{}') const _metadata = JSON.parse(_detail?.metadata || '{}')
console.log(_metadata)
console.log(type)
const list = (_metadata[type] as any[]) || [] const list = (_metadata[type] as any[]) || []
if (formValue.id) { if (formValue.id) {
if (metadataStore.model.action === 'add' && list.some(item => item.id === formValue.id)) { if (metadataStore.model.action === 'add' && list.some(item => item.id === formValue.id)) {

1
src/views/device/components/Metadata/Base/Edit/validator.ts
View File

@ -39,7 +39,6 @@ export const validateIdName = async (_rule: Rule, val: Record<any, any>) => {
} }
export const validateValueType = async (_rule: Rule, val: Record<any, any>, title = '数据类型') => { export const validateValueType = async (_rule: Rule, val: Record<any, any>, title = '数据类型') => {
console.log(val)
if (!val) return Promise.reject(new Error('请输入元素配置')); if (!val) return Promise.reject(new Error('请输入元素配置'));
if (!val?.type) { if (!val?.type) {
return Promise.reject(new Error(`请选择${title}`)) return Promise.reject(new Error(`请选择${title}`))

1
src/views/device/components/Metadata/Import/index.vue
View File

@ -164,7 +164,6 @@ const beforeUpload: UploadProps['beforeUpload'] = file => {
} }
const fileChange = (info: UploadChangeParam) => { const fileChange = (info: UploadChangeParam) => {
if (info.file.status === 'done') { if (info.file.status === 'done') {
console.log(info)
const { response } = info.file const { response } = info.file
if (response.status === 200) { if (response.status === 200) {
formModel.upload = response.result formModel.upload = response.result

4
yarn.lock
View File

@ -3695,8 +3695,8 @@ jetlinks-store@^0.0.3:
jetlinks-ui-components@^1.0.5: jetlinks-ui-components@^1.0.5:
version "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" resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#30de07a15481f13ea86ebc817baaab3c99034403"
integrity sha512-rZtqFmxhU9nplFqqp45bHJAoiH4zzLM8juMGQV6eCCkzquXLmDqATiAK2D/fquAcLMIY0fPgw/Dzc9odQDKmVg== integrity sha512-ULgSPU0xY6xUky3beeHVvpHyAHmT6xHsO5eS5m7a3h7AmCoxA3oTWyF20vC+K1zTJBQ7LFCouySqRRz6GimAPg==
dependencies: dependencies:
"@vueuse/core" "^9.12.0" "@vueuse/core" "^9.12.0"
ant-design-vue "^3.2.15" ant-design-vue "^3.2.15"