Просмотр исходного кода

fix: 修复DuerOS属性无法回显问题

xieyonghong 3 лет назад
Родитель
Сommit
bee9648d2c

+ 4 - 4
config/proxy.ts

@@ -9,11 +9,11 @@
 export default {
   dev: {
     '/jetlinks': {
-      target: 'http://192.168.32.8:8844/',
-      ws: 'ws://192.168.32.8:8844/',
+      // target: 'http://192.168.32.8:8844/',
+      // ws: 'ws://192.168.32.8:8844/',
       // 开发环境
-      // target: 'http://120.79.18.123:8844/',
-      // ws: 'ws://120.79.18.123:8844/',
+      target: 'http://120.79.18.123:8844/',
+      ws: 'ws://120.79.18.123:8844/',
       // 测试环境
       // target: 'http://120.77.179.54:8844/',
       // ws: 'ws://120.77.179.54:8844/',

+ 1 - 0
src/components/ProTableCard/index.tsx

@@ -162,6 +162,7 @@ const ProTableCard = <
         request={async (param, sort, filter) => {
           if (request) {
             const resp = await request(param, sort, filter);
+            setLoading(false);
             setTotal(resp.result ? resp.result.total : 0);
             return {
               code: resp.message,

+ 7 - 2
src/pages/Northbound/DuerOS/Detail/index.tsx

@@ -63,7 +63,12 @@ const Save = () => {
 
   const getProduct = (f?: Field) => {
     return service.getProduct(f?.value).then((resp) => {
-      const _temp = resp.result.map((item: any) => ({ label: item.name, value: item.id }));
+      const _temp = resp.result.map((item: any) => ({
+        label: item.name,
+        value: item.id,
+        id: item.id,
+        metadata: item.metadata,
+      }));
       Store.set('product-list', _temp);
       return _temp;
     });
@@ -273,7 +278,7 @@ const Save = () => {
               showSearch: true,
               showArrow: true,
               filterOption: (input: string, option: any) =>
-                option.name.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+                option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0,
             },
             'x-reactions': '{{useAsyncDataSource(getProduct)}}',
             required: true,