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

src/views/device/components/Metadata/Base/Edit/ValueTypeForm.vue

@@ -108,6 +108,9 @@ watchEffect(() => {
   _value.value = props.value || {
     expands: {}
   }
+  if (props.onlyObject) {
+    _value.value.type = 'object'
+  }
 })
 
 watch(_value,
@@ -116,14 +119,14 @@ watch(_value,
   },
   { deep: true, immediate: true })
 
-onMounted(() => {
-  if (props.onlyObject) {
-    _value.value = {
-      type: 'object',
-      expands: {}
-    }
-  }
-})
+// onMounted(() => {
+//   if (props.onlyObject) {
+//     _value.value = props.value || {
+//       type: 'object',
+//       expands: {}
+//     }
+//   }
+// })
 
 const unit = reactive({
   unitOptions: [] as DefaultOptionType[],

src/views/media/Device/index.vue

@@ -30,11 +30,9 @@
                     :actions="getActions(slotProps, 'card')"
                     v-bind="slotProps"
                     :showStatus="true"
-                    :status="
-                        slotProps.state.value === 'online' ? 'success' : 'error'
-                    "
+                    :status="slotProps.state.value"
                     :statusText="slotProps.state.text"
-                    :statusNames="{ success: 'success', error: 'error' }"
+                    :statusNames="{ online: 'processing', offline: 'error' }"
                 >
                     <template #img>
                         <slot name="img">

src/views/notice/Config/SyncUser/index.vue

@@ -422,6 +422,7 @@ const formData = ref({
     userId: '',
     thirdPartyUserId: '',
     thirdPartyUserName: '',
+    bindId: '',
 });
 const formRules = ref({
     userId: [{ required: true, message: '请选择用户', trigger: 'change' }],
@@ -463,6 +464,7 @@ const handleBindSubmit = () => {
             providerName: formData.value.thirdPartyUserName,
             thirdPartyUserId: formData.value.thirdPartyUserId,
             userId: formData.value.userId,
+            id: formData.value.bindId,
         };
         confirmLoading.value = true;
         if (props.data.type === 'dingTalk') {

src/views/system/Menu/index.vue

@@ -4,7 +4,7 @@
             <pro-search
                 :columns="columns"
                 target="category"
-                @search="(params:any)=>queryParams = {...params}"
+                @search="handleSearch"
             />
 
             <j-pro-table
@@ -14,6 +14,7 @@
                 model="TABLE"
                 :params="queryParams"
                 noPagination
+                v-model:expandedRowKeys="expandedRowKeys"
             >
                 <template #headerTitle>
                     <PermissionButton
@@ -152,6 +153,11 @@ const columns = [
     },
 ];
 const queryParams = ref({ terms: [] });
+const expandedRowKeys = ref<string[]>([]);
+const handleSearch = (e: any) => {
+    queryParams.value = e;
+    if (!e.terms.length) expandedRowKeys.value = [];
+};
 
 const tableRef = ref<Record<string, any>>({}); // 表格实例
 const table = reactive({