feat: data component list add search conditions

@@ -14,9 +14,9 @@ VITE_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # 线上测试环境
 # 线上测试环境
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-VITE_PROXY = [["/api","https://dev.thingskit.com/api"],["/thingskit-drawio","http://localhost:3000/"]]
+# VITE_PROXY = [["/api","https://dev.thingskit.com/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-# VITE_PROXY = [["/api","http://192.168.10.111:8080/api"],["/thingskit-drawio","http://192.168.10.106:8080/api"]]
+VITE_PROXY = [["/api","http://192.168.10.111:8080/api"],["/thingskit-drawio","http://192.168.10.106:8080/api"]]
 
 
 # 实时数据的ws地址
 # 实时数据的ws地址
 # VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
 # VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=

+import { getOrganizationList } from '/@/api/system/system';
 import { FormSchema } from '/@/components/Form';
 import { FormSchema } from '/@/components/Form';
+import { copyTransFun } from '/@/utils/fnUtils';
 export enum ViewType {
 export enum ViewType {
   PRIVATE_VIEW = 'PRIVATE_VIEW',
   PRIVATE_VIEW = 'PRIVATE_VIEW',
   PUBLIC_VIEW = 'PUBLIC_VIEW',
   PUBLIC_VIEW = 'PUBLIC_VIEW',
@@ -9,12 +11,29 @@ export const formSchema: FormSchema[] = [
     field: 'name',
     field: 'name',
     label: '名称',
     label: '名称',
     component: 'Input',
     component: 'Input',
-    required: true,
+    rules: [{ required: true, message: '请输入看板名称' }],
     componentProps: {
     componentProps: {
       placeholder: '请输入看板名称',
       placeholder: '请输入看板名称',
     },
     },
   },
   },
   {
   {
+    field: 'organizationId',
+    component: 'ApiTreeSelect',
+    label: '组织',
+    rules: [{ required: true, message: '组织为必填项' }],
+    componentProps() {
+      return {
+        placeholder: '请选择组织',
+        api: async () => {
+          const data = await getOrganizationList();
+          copyTransFun(data as any as any[]);
+          return data;
+        },
+        getPopupContainer: () => document.body,
+      };
+    },
+  },
+  {
     field: 'viewType',
     field: 'viewType',
     label: '名称',
     label: '名称',
     component: 'RadioGroup',
     component: 'RadioGroup',

+import { getOrganizationList } from '/@/api/system/system';
+import { FormSchema } from '/@/components/Form';
+import { ColEx } from '/@/components/Form/src/types';
+import { useGridLayout } from '/@/hooks/component/useGridLayout';
+import { copyTransFun } from '/@/utils/fnUtils';
+
+export const formSchema: FormSchema[] = [
+  {
+    field: 'name',
+    label: '看板名称',
+    component: 'Input',
+    // colProps: { span: 10 },
+    colProps: useGridLayout(2, 3, 4) as unknown as ColEx,
+  },
+  {
+    field: 'organizationId',
+    component: 'ApiTreeSelect',
+    label: '组织',
+    // colProps: { span: 10 },
+    colProps: useGridLayout(2, 3, 4) as unknown as ColEx,
+    componentProps() {
+      return {
+        placeholder: '请选择组织',
+        api: async () => {
+          const data = await getOrganizationList();
+          copyTransFun(data as any as any[]);
+          return data;
+        },
+        getPopupContainer: () => document.body,
+      };
+    },
+  },
+];

@@ -19,6 +19,8 @@
   import { computed } from '@vue/reactivity';
   import { computed } from '@vue/reactivity';
   import { usePermission } from '/@/hooks/web/usePermission';
   import { usePermission } from '/@/hooks/web/usePermission';
   import { encode } from './config/config';
   import { encode } from './config/config';
+  import { useForm, BasicForm } from '/@/components/Form';
+  import { formSchema } from './config/searchForm';
 
 
   const ListItem = List.Item;
   const ListItem = List.Item;
   const router = useRouter();
   const router = useRouter();
@@ -28,6 +30,21 @@
   const listEL = ref();
   const listEL = ref();
   const loading = ref(false);
   const loading = ref(false);
   const dataBoardList = ref<DataBoardRecord[]>([]);
   const dataBoardList = ref<DataBoardRecord[]>([]);
+
+  const [searchFormRegister, searchFormMethod] = useForm({
+    schemas: formSchema,
+    labelWidth: 80,
+    layout: 'inline',
+    submitButtonOptions: {
+      loading: loading,
+    },
+    submitFunc: async () => {
+      try {
+        await getDatasource();
+      } catch (error) {}
+    },
+  });
+
   //分页相关
   //分页相关
   const page = ref(1);
   const page = ref(1);
   const pageSize = ref(10);
   const pageSize = ref(10);
@@ -87,9 +104,11 @@
   const getDatasource = async () => {
   const getDatasource = async () => {
     try {
     try {
       loading.value = true;
       loading.value = true;
+      const params = searchFormMethod.getFieldsValue() || {};
       const { total, items } = await getDataBoardList({
       const { total, items } = await getDataBoardList({
         page: unref(paginationProp).current,
         page: unref(paginationProp).current,
         pageSize: unref(paginationProp).pageSize,
         pageSize: unref(paginationProp).pageSize,
+        ...params,
       });
       });
       dataBoardList.value = items;
       dataBoardList.value = items;
       paginationProp.value.total = total;
       paginationProp.value.total = total;
@@ -176,12 +195,16 @@
 
 
 <template>
 <template>
   <PageWrapper>
   <PageWrapper>
-    <div class="flex mb-6 items-center bg-light-100 h-78px">
+    <div class="flex items-center mb-3 bg-light-100 h-78px">
       <div class="text-lg ml-30px mr-9px font-bold">自定义看板</div>
       <div class="text-lg ml-30px mr-9px font-bold">自定义看板</div>
       <Authority value="api:yt:data_board:add:post">
       <Authority value="api:yt:data_board:add:post">
         <Button type="primary" @click="handleOpenDetailModal">创建看板</Button>
         <Button type="primary" @click="handleOpenDetailModal">创建看板</Button>
       </Authority>
       </Authority>
     </div>
     </div>
+    <div class="bg-light-100 mb-6 w-full p-3 search-form">
+      <BasicForm class="flex-auto w-full" @register="searchFormRegister" />
+    </div>
+    <!-- <div> </div> -->
     <Spin :spinning="loading">
     <Spin :spinning="loading">
       <List
       <List
         ref="listEL"
         ref="listEL"
@@ -266,4 +289,19 @@
       background-image: url('/@/assets/svg/component.svg');
       background-image: url('/@/assets/svg/component.svg');
     }
     }
   }
   }
+
+  .search-form {
+    width: 100%;
+    form {
+      width: 100%;
+      :deep(.ant-row) {
+        width: 100%;
+      }
+
+      :deep(.ant-row > div:last-child) {
+        flex: 1;
+        max-width: 100%;
+      }
+    }
+  }
 </style>
 </style>