fix(icc add hls)

src/components/b_table.tsx

@@ -24,7 +24,8 @@ const BTable = (props: any) => {
     config,
     btnText,
     children,
-    searchConfig
+    searchConfig,
+    searchCallback,
   } = props;
   const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
   const formRef = React.useRef<FormInstance>(null);
@@ -104,13 +105,28 @@ const BTable = (props: any) => {
   const searchWidget = () => {
     return (
       <>
-        {searchConfig ? <SimpleForm
+        {searchConfig ?
-          formName={"search_form"}
+          <Space size="middle" style={{ display: "flex", alignItems: "start" }}>
-          formRef={searchFormRef}
+            <SimpleForm
-          colProps={30}
+              formName={"search_form"}
-          onFinish={() => { }}
+              rowStyle={"form_style4"}
-          formDatas={searchConfig} />
+              formRef={searchFormRef}
-        : null}
+              colProps={30}
+              onFinish={() => {
+                const dats = searchFormRef.current?.getFieldsValue()
+                searchCallback && searchCallback(dats)
+              }}
+              formDatas={searchConfig} />
+            <Button onClick={() => {
+              searchFormRef.current?.submit()
+            }}>查询</Button>
+            <Button onClick={() => {
+              searchFormRef.current?.resetFields()
+              searchFormRef.current?.submit()
+            }}>重置</Button>
+          </Space>
+
+          : null}
       </>
     )
 
@@ -119,12 +135,12 @@ const BTable = (props: any) => {
   return (
     <Space direction="vertical" size="middle" style={{ display: "flex" }}>
       {
-        config ? <div>
+        config ? <div className="groups">
           <Button type="default" onClick={() => addHandler()}>
-          {btnText ?? "添加部门"}
+            {btnText ?? "添加部门"}
-        </Button> 
+          </Button>
-        {searchWidget()}
+          {searchWidget()}
-        </div>: null
+        </div> : null
       }
       <Table
         style={{ height: "100%", overflow: "auto" }}

src/components/form/checkbox.tsx

@@ -16,7 +16,7 @@ export const FormCheckBox = (v: FormDatas) => {
     }, [v.selectUrl, v.selectList]);
     return (
         <Form.Item
-            key={v.label}
+            key={v.name}
             label={v.label}
             name={v.name}
             rules={v.rules}

src/components/form/form_style.less

@@ -0,0 +1,29 @@
+.form_style1 {
+  display: grid;
+  grid-template-columns: repeat(1, 1fr);
+  gap: 10px;
+}
+
+.form_style2 {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 10px;
+}
+
+
+.form_style3 {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 10px;
+}
+
+.form_style4 {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+
+.groups {
+  display: flex;
+  justify-content: space-between;
+}

src/components/form/interface.ts

@@ -33,6 +33,7 @@ export interface FormDatas {
     rules: Array<rules>,
     model: "multiple" | "tags" | undefined
     treeMultiple?: boolean
+    placeholder?:string
 }
 
 export interface SimpleFormData {
@@ -48,6 +49,8 @@ export interface SimpleFormData {
     createCallback?: Function
     children?: React.ReactElement
     childrenPosi?: boolean
+    rowStyle?:string
+    
 }
 
 

src/components/form/select.tsx

@@ -16,14 +16,15 @@ export const FormSelect = (v: FormDatas) => {
   }, [v.selectUrl, v.selectList]);
   return (
     <Form.Item
-      key={v.label}
+      key={v.name}
       label={v.label}
       name={v.name}
       rules={v.rules}
     >
-      <Select placeholder="" mode={v.model}>
+      <Select placeholder={v.placeholder} mode={v.model} 
+        style={{ width: "100%" ,minWidth:"200px"}} >
         {list?.map((item: any, index) => {
-          return <Option key={index} value={item.identity}>
+          return <Option key={item.identity} value={item.identity}>
             {item[v.keys ?? "name"]}
           </Option>
         })}

src/components/form/simple_form.tsx

@@ -8,7 +8,7 @@ import MapFrom from "../map/MapFrom";
 import { FormTreeSelect } from "./tree_select";
 import { FormCheckBox } from "./checkbox";
 import DumpSeleft from "./dump_seleft";
-
+import "./form_style.less"
 
 // import VideoSelect from "../video_select";
 const { TextArea } = Input;
@@ -28,6 +28,7 @@ const SimpleForm = (props: SimpleFormData) => {
       name={props.formName}
       ref={props.formRef}
       autoComplete="on"
+      className={props.rowStyle}
       form={form}
       labelCol={{ span: props.span ?? 4 }}
       wrapperCol={{ span: props.colProps }}
@@ -40,18 +41,18 @@ const SimpleForm = (props: SimpleFormData) => {
           case FormType.input:
             return (
               <Form.Item
-                key={v.label}
+                key={v.name}
                 label={v.label}
                 name={v.name}
                 rules={v.rules}
               >
-                <Input />
+                <Input placeholder={v.placeholder} />
               </Form.Item>
             );
           case FormType.inputNumber:
             return (
               <Form.Item
-                key={v.label}
+                key={v.name}
                 label={v.label}
                 name={v.name}
                 rules={v.rules}
@@ -62,7 +63,7 @@ const SimpleForm = (props: SimpleFormData) => {
           case FormType.password:
             return (
               <Form.Item
-                key={v.label}
+                key={v.name}
                 label={v.label}
                 name={v.name}
                 rules={v.rules}
@@ -73,11 +74,11 @@ const SimpleForm = (props: SimpleFormData) => {
           case FormType.cehckbox:
             return <FormCheckBox {...v} />
           case FormType.treeSelect:
-            return <FormTreeSelect {...v} key={v.label} />
+            return <FormTreeSelect {...v} key={v.name} />
           case FormType.cehckboxGroup:
             return (
               <Form.Item
-                key={v.label}
+                key={v.name}
                 label={v.label}
                 name={v.name}
                 rules={v.rules}
@@ -96,7 +97,7 @@ const SimpleForm = (props: SimpleFormData) => {
             return (
               <Form.Item
                 {...v}
-                key={v.label}
+                key={v.name}
                 label={v.label}
                 valuePropName="fileList"
                 name={v.name}
@@ -120,7 +121,7 @@ const SimpleForm = (props: SimpleFormData) => {
           case FormType.textarea:
             return (
               <Form.Item
-                key={v.label}
+                key={v.name}
                 label={v.label}
                 name={v.name}
                 rules={v.rules}
@@ -135,7 +136,7 @@ const SimpleForm = (props: SimpleFormData) => {
           case FormType.editor:
             return (
               <Form.Item
-                key={v.label}
+                key={v.name}
                 label={v.label}
                 name={v.name}
                 rules={v.rules}
@@ -151,7 +152,7 @@ const SimpleForm = (props: SimpleFormData) => {
           case FormType.radio:
             return (
               <Form.Item
-                key={v.label}
+                key={v.name}
                 label={v.label}
                 name={v.name}
                 rules={v.rules}
@@ -168,7 +169,7 @@ const SimpleForm = (props: SimpleFormData) => {
           case FormType.date:
             return (
               <Form.Item
-                key={v.label}
+                key={v.name}
                 label={v.label}
                 name={v.name}
                 rules={v.rules}
@@ -179,7 +180,7 @@ const SimpleForm = (props: SimpleFormData) => {
           case FormType.map:
             return (
               <Form.Item
-                key={v.label}
+                key={v.name}
                 label={v.label}
                 name={v.name}
                 rules={v.rules}
@@ -196,7 +197,7 @@ const SimpleForm = (props: SimpleFormData) => {
           case FormType.fetchList:
             return (
               <Form.Item
-                key={v.label}
+                key={v.name}
                 label={v.label}
                 name={v.name}
                 rules={v.rules}
@@ -207,12 +208,12 @@ const SimpleForm = (props: SimpleFormData) => {
           default:
             return (
               <Form.Item
-                key={v.label}
+                key={v.name}
                 label={v.label}
                 name={v.name}
                 rules={v.rules}
               >
-                <Input defaultValue={v.value} value={v.value} />
+                <Input defaultValue={v.value} value={v.value} placeholder={v.placeholder} />
               </Form.Item>
             );
         }

src/components/form/tree_select.tsx

@@ -16,7 +16,7 @@ export const FormTreeSelect = (v: FormDatas) => {
     }, [v.selectUrl, v.selectList]);
     return (
         <Form.Item
-            key={v.label}
+            key={v.name}
             label={v.label}
             name={v.name}
             rules={v.rules}
@@ -30,7 +30,7 @@ export const FormTreeSelect = (v: FormDatas) => {
                 }}
                 multiple={v.treeMultiple}
                 showSearch
-                style={{ width: '100%' }}
+                style={{ width: '100%',minWidth: '200px' }}
                 placeholder="请选择"
                 allowClear
                 treeDefaultExpandAll

src/pages/event/config.tsx

@@ -4,6 +4,18 @@ import SourceConfig from "@/service/source_config";
 import { EventTypeConfig } from "@/service/user_config";
 import { ColumnsType } from "antd/es/table";
 
+export const searchConfig = [
+    {
+    type: FormType.select,
+    label: "",
+    name: "type_identity",
+    placeHolder:"事件类型",
+    keys:"type_name",
+    value: "",
+    selectUrl: EventTypeConfig.LIST,
+  },
+]
+
 export const defaultConfig = [
   {
     type: FormType.input,
@@ -159,3 +171,4 @@ export const columns: ColumnsType<UserDataType> = [
   },
 
 ];
+

src/pages/event/index.tsx

@@ -2,7 +2,7 @@ import BTable from "@/components/b_table";
 import { Store } from "antd/es/form/interface";
 import { inject, observer } from "mobx-react";
 import { useEffect } from "react";
-import { columns, defaultConfig } from "./config";
+import { columns, defaultConfig, searchConfig } from "./config";
 
 const Event = (props: Store) => {
     const { thingStore } = props;
@@ -13,11 +13,15 @@ const Event = (props: Store) => {
     return <div className="contentBox">
         <BTable
             btnText="添加事件"
+            searchConfig={searchConfig}
             store={thingStore}
             scroll={{ x: "max-content" }}
             columns={columns}
             dataSource={thingStore.list ?? []}
             config={defaultConfig}
+            searchCallback={(values) => {
+                thingStore.getlist(values);
+            }}
         >
         </BTable>
     </div>

src/pages/user/search_config.tsx

@@ -3,27 +3,27 @@ import { CompanyConfig, RoleConfig } from "@/service/user_config";
 export const searchConfig = [
   {
     type: FormType.input,
-    label: "用户名",
+    label: "",
     name: "user_name",
     value: "",
-    rules: [{ required: true, message: "请输入用户名称!" }],
+    placeholder: "请输入用户名",
   },
   {
     type: FormType.treeSelect,
-    label: "所属单位",
+    label: "",
     name: "company_identity",
     treeCheckbox: false,
+    placeholder: "请选择所属单位",
     selectUrl: CompanyConfig.LIST,
     value: "",
     keys: "company_id",
-    rules: [{ required: true, message: "所属单位不能为空" }],
   },
   {
     type: FormType.select,
-    label: "角色",
+    label: "",
     name: "role_identity",
     selectUrl: RoleConfig.LIST,
     value: "",
-    rules: [{ required: true, message: "角色不能为空" }],
+     placeholder: "请选择角色",
   },
 ];

src/pages/user/user.tsx

@@ -16,7 +16,7 @@ const User = (props: Store) => {
         const element = list[index];
         element.menu_id = element.menu.map((item) => item.menu_identity)
         element.column_ids = element.column.map((item) => item.data_name_id)
-        element.thing_ids = element.thing.map((item) => item.thing_identity)
+        element.thing_type_ids = element.thing_type.map((item) => item.type_identity)
       }
     });
   }, [usrStore, usrStore.isRefresh]);
@@ -30,6 +30,9 @@ const User = (props: Store) => {
         btnText="添加人员"
         dataSource={usrStore.list}
         searchConfig={searchConfig}
+        searchCallback={(values) => {
+          usrStore.getlist(values);
+        }}
         deleteCallback={(record) => {
           usrStore.deleteItem(record);
         }}

src/pages/user/user_config.tsx

@@ -3,7 +3,7 @@ import { UserDataType } from "@/model/userModel";
 import { ColumnsType } from "antd/lib/table";
 import { Image } from "antd";
 import { getBirthDateAndGender } from "@/util/util";
-import { CompanyConfig,  EventConfig, MenuConfig, RoleConfig } from "@/service/user_config";
+import { CompanyConfig, EventTypeConfig, MenuConfig, RoleConfig } from "@/service/user_config";
 import SourceConfig from "@/service/source_config";
 export const defaultConfig = [
   {
@@ -47,10 +47,10 @@ export const defaultConfig = [
   },
   {
     type: FormType.cehckbox,
-    label: "事件",
+    label: "事件类型",
-    name: "thing_ids",
+    name: "thing_type_ids",
-    selectUrl: EventConfig.LIST,
+    selectUrl: EventTypeConfig.LIST,
-    keys:"name",
+    keys:"type_name",
     value: [],
     rules: [{ required: true, message: "请选择默认数据" }],
   },