Commit 5f3674fbbaf0bf544ce2a6a077332b3da923a0c9

Authored by 温伟
2 parents 5dcc9a60 e7296af7

Merge branch 'fix/teambition/07-18' into 'main_dev'

perf: 云端环境中,物模型键值查询,输入的键或值不存在,应该界面回显为空,而不是全部物模型

See merge request yunteng/thingskit-front!1411
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
104 switchLoading.value = true; 104 switchLoading.value = true;
105 await deviceProfileCategory({ ...record, status: e }); 105 await deviceProfileCategory({ ...record, status: e });
106 switchLoading.value = false; 106 switchLoading.value = false;
107 - createMessage.success('操作成功'); 107 + createMessage.success(`${!e ? '禁用' : '启用'}成功`);
108 handleReload(); 108 handleReload();
109 }; 109 };
110 110
@@ -119,6 +119,7 @@ @@ -119,6 +119,7 @@
119 ], 119 ],
120 }; 120 };
121 }); 121 });
  122 + const cacheSearchValue = ref('');
122 123
123 const [registerForm, { getFieldsValue }] = useForm({ 124 const [registerForm, { getFieldsValue }] = useForm({
124 schemas: [ 125 schemas: [
@@ -141,6 +142,8 @@ @@ -141,6 +142,8 @@
141 142
142 pagination.current = 1; 143 pagination.current = 1;
143 144
  145 + cacheSearchValue.value = value;
  146 +
144 socketInfo.filterAttrKeys = value 147 socketInfo.filterAttrKeys = value
145 ? unref(socketInfo.rawDataSource) 148 ? unref(socketInfo.rawDataSource)
146 .filter( 149 .filter(
@@ -161,6 +164,7 @@ @@ -161,6 +164,7 @@
161 resetFunc: async () => { 164 resetFunc: async () => {
162 try { 165 try {
163 socketInfo.filterAttrKeys = []; 166 socketInfo.filterAttrKeys = [];
  167 + cacheSearchValue.value = '';
164 handleFilterChange(); 168 handleFilterChange();
165 unref(mode) === EnumTableCardMode.TABLE && setTableModeData(); 169 unref(mode) === EnumTableCardMode.TABLE && setTableModeData();
166 } catch (error) {} 170 } catch (error) {}
@@ -201,8 +205,15 @@ @@ -201,8 +205,15 @@
201 const { createMessage } = useMessage(); 205 const { createMessage } = useMessage();
202 206
203 const setDataSource = () => { 207 const setDataSource = () => {
  208 + const filterValueByCacheSearchValue = socketInfo.rawDataSource.filter(
  209 + (item) =>
  210 + item.key?.toUpperCase().includes(cacheSearchValue.value.toUpperCase()) ||
  211 + item.name?.toUpperCase().includes(cacheSearchValue.value.toUpperCase())
  212 + );
204 socketInfo.dataSource = socketInfo.filterAttrKeys.length 213 socketInfo.dataSource = socketInfo.filterAttrKeys.length
205 ? socketInfo.rawDataSource.filter((item) => socketInfo.filterAttrKeys.includes(item.key)) 214 ? socketInfo.rawDataSource.filter((item) => socketInfo.filterAttrKeys.includes(item.key))
  215 + : filterValueByCacheSearchValue.length === 0
  216 + ? []
206 : socketInfo.rawDataSource; 217 : socketInfo.rawDataSource;
207 }; 218 };
208 219
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 unref(getRecord).id, 65 unref(getRecord).id,
66 !unref(getRecord).state ? StateEnum.ENABLE : StateEnum.CLOSE 66 !unref(getRecord).state ? StateEnum.ENABLE : StateEnum.CLOSE
67 ); 67 );
68 - createMessage.success('更新状态成功'); 68 + createMessage.success(`${unref(getRecord).state ? '禁用' : '启用'}成功`);
69 props.reload?.(); 69 props.reload?.();
70 } catch (error) { 70 } catch (error) {
71 throw error; 71 throw error;