Merge branch 'dev' into dev-dictionary

src/utils/encodeQuery.ts

@@ -24,12 +24,42 @@ export const encodeParams = (params: Record<string, any>) => {
   return _params.toString()
 }
 
+const handleTermsArr = (queryTerms: any, data: any[], parentKey?: string) => {
+  data.forEach((item, index) => {
+    const key = `${parentKey}[${index}]`
+
+    if (isArray(item)){
+      handleTermsArr(queryTerms, item, `${key}`)
+    } else if (isObject(item)) {
+      handleTermsObject(queryTerms, item, `${key}`)
+    } else  {
+      queryTerms[key] = item
+    }
+  })
+}
+const handleTermsObject = (queryTerms: any, data: any, parentKey?: string) => {
+  Object.keys(data).forEach(k => {
+    const key = `${parentKey}.${k}`
+    console.log(key, data[k], isObject(data[k]), isArray(data[k]))
+    if (isArray(data[k])) {
+      handleTermsArr(queryTerms, data[k], `${key}`)
+    } else if (isObject(data[k])) {
+      handleTermsObject(queryTerms, data[k], `${key}`)
+    } else  {
+      queryTerms[key] = data[k]
+    }
+  })
+}
+
 const handleTermsToString = (queryTerms: any, terms: Array<TermsType>, parentKey?: string) => {
+  console.log(terms)
   terms.forEach((a, aIndex) => {
     Object.keys(a).forEach((b) => {
       const key = `${parentKey}[${aIndex}].${b}`
-      if (b === 'terms') {
+      if (isArray(a[b])) {
-        handleTermsToString(queryTerms, a[b], `${key}`)
+        handleTermsArr(queryTerms, a[b], `${key}`)
+      } else if (isObject(a[b])) {
+        handleTermsObject(queryTerms, a[b], `${key}`)
       } else {
         queryTerms[key] = a[b]
       }

src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue

@@ -185,7 +185,8 @@ const getOptions = (arr: any[]) => {
         tooltip: {
             trigger: 'axis',
             position: function (pt: any) {
-                return [pt[0], '10%'];
+                const left = pt[0] - 80
+                return [left, '10%'];
             },
         },
         series: [

src/views/device/Instance/index.vue

@@ -503,6 +503,17 @@ const columns = [
         hideInTable: true,
         search: {
             type: 'treeSelect',
+            // handleValue(v) {
+            //   return {
+            //     assetType: 'device',
+            //     targets: [
+            //       {
+            //         type: 'org',
+            //         id: v,
+            //       },
+            //     ],
+            //   }
+            // },
             options: () =>
                 new Promise((resolve) => {
                     queryOrgThree({}).then((resp: any) => {
@@ -515,13 +526,13 @@ const columns = [
                                 _list.push({
                                     ...item,
                                     id: JSON.stringify({
-                                        assetType: 'device',
+                                      assetType: 'device',
-                                        targets: [
+                                      targets: [
-                                            {
+                                        {
-                                                type: 'org',
+                                          type: 'org',
-                                                id: item.id,
+                                          id: item.id,
-                                            },
+                                        },
-                                        ],
+                                      ],
                                     }),
                                 });
                             });
@@ -732,13 +743,13 @@ const selectAll = (selected: Boolean, selectedRows: any,changeRows:any) => {
             const arr = changeRows.map((item: any) => item.id)
             const _ids: string[] = [];
             _selectedRowKeys.value.map((i: any) => {
-                if (!arr.includes(i)) {   
+                if (!arr.includes(i)) {
                     _ids.push(i)
                 }
             })
             _selectedRowKeys.value = _ids
-            
+
-        }     
+        }
 }
 
 const handleClick = (dt: any) => {
@@ -918,15 +929,26 @@ const handleSearch = (_params: any) => {
     // params.value = _params;
     const newParams = (_params?.terms as any[])?.map((item1) => {
         item1.terms = item1.terms.map((item2: any) => {
-            if (
+          if (item2.column === 'id$dim-assets') {
+            if (item2.termType === 'not') {
+              const oldValue = JSON.parse(item2.value)
+              oldValue.not = true
+              item2.value = JSON.stringify(oldValue)
+            }
+            delete item2.termType
+          }
+
+          if (
                 item2.column &&
                 ['classifiedId', 'accessId', 'accessProvider'].includes(
                     item2.column,
                 )
             ) {
+                const oldTermType = item2.termType
+                delete item2.termType
                 return {
                     ...item2,
-                    column: 'productId$product-info',
+                    column: `productId$product-info$${oldTermType}`,
                 };
             }
             return item2;