From 5364d1eace41cf41f44df04bd80efddb5bbb8a63 Mon Sep 17 00:00:00 2001 From: wang_yp <357754663@qq.com> Date: Tue, 12 Aug 2025 20:25:39 +0800 Subject: [PATCH] fix(icc add hls) --- src/components/b_table.tsx | 42 ++++++++++++++++++++--------- src/components/form/checkbox.tsx | 2 +- src/components/form/form_style.less | 29 ++++++++++++++++++++ src/components/form/interface.ts | 3 +++ src/components/form/select.tsx | 7 ++--- src/components/form/simple_form.tsx | 33 ++++++++++++----------- src/components/form/tree_select.tsx | 4 +-- src/pages/event/config.tsx | 13 +++++++++ src/pages/event/index.tsx | 6 ++++- src/pages/user/search_config.tsx | 12 ++++----- src/pages/user/user.tsx | 5 +++- src/pages/user/user_config.tsx | 10 +++---- 12 files changed, 118 insertions(+), 48 deletions(-) create mode 100644 src/components/form/form_style.less diff --git a/src/components/b_table.tsx b/src/components/b_table.tsx index 18f978a..8d4acad 100644 --- a/src/components/b_table.tsx +++ b/src/components/b_table.tsx @@ -24,7 +24,8 @@ const BTable = (props: any) => { config, btnText, children, - searchConfig + searchConfig, + searchCallback, } = props; const [selectedRowKeys, setSelectedRowKeys] = useState([]); const formRef = React.useRef(null); @@ -104,13 +105,28 @@ const BTable = (props: any) => { const searchWidget = () => { return ( <> - {searchConfig ? { }} - formDatas={searchConfig} /> - : null} + {searchConfig ? + + { + const dats = searchFormRef.current?.getFieldsValue() + searchCallback && searchCallback(dats) + }} + formDatas={searchConfig} /> + + + + + : null} ) @@ -119,12 +135,12 @@ const BTable = (props: any) => { return ( { - config ?
+ config ?
- {searchWidget()} -
: null + {btnText ?? "添加部门"} + + {searchWidget()} +
: null } { }, [v.selectUrl, v.selectList]); return ( , 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 + } diff --git a/src/components/form/select.tsx b/src/components/form/select.tsx index 70de617..1094a12 100644 --- a/src/components/form/select.tsx +++ b/src/components/form/select.tsx @@ -16,14 +16,15 @@ export const FormSelect = (v: FormDatas) => { }, [v.selectUrl, v.selectList]); return ( - {list?.map((item: any, index) => { - return })} diff --git a/src/components/form/simple_form.tsx b/src/components/form/simple_form.tsx index e92f4c7..73a568d 100644 --- a/src/components/form/simple_form.tsx +++ b/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 ( - + ); case FormType.inputNumber: return ( { case FormType.password: return ( { case FormType.cehckbox: return case FormType.treeSelect: - return + return case FormType.cehckboxGroup: return ( { return ( { case FormType.textarea: return ( { case FormType.editor: return ( { case FormType.radio: return ( { case FormType.date: return ( { case FormType.map: return ( { case FormType.fetchList: return ( { default: return ( - + ); } diff --git a/src/components/form/tree_select.tsx b/src/components/form/tree_select.tsx index f398416..79c68fa 100644 --- a/src/components/form/tree_select.tsx +++ b/src/components/form/tree_select.tsx @@ -16,7 +16,7 @@ export const FormTreeSelect = (v: FormDatas) => { }, [v.selectUrl, v.selectList]); return ( { }} multiple={v.treeMultiple} showSearch - style={{ width: '100%' }} + style={{ width: '100%',minWidth: '200px' }} placeholder="请选择" allowClear treeDefaultExpandAll diff --git a/src/pages/event/config.tsx b/src/pages/event/config.tsx index 0e2d191..3a6cc46 100644 --- a/src/pages/event/config.tsx +++ b/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 = [ }, ]; + diff --git a/src/pages/event/index.tsx b/src/pages/event/index.tsx index 9dd0463..37b84fb 100644 --- a/src/pages/event/index.tsx +++ b/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
{ + thingStore.getlist(values); + }} >
diff --git a/src/pages/user/search_config.tsx b/src/pages/user/search_config.tsx index e9c2f44..6225fa6 100644 --- a/src/pages/user/search_config.tsx +++ b/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: "请选择角色", }, ]; diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx index 5cbdb94..13604a2 100644 --- a/src/pages/user/user.tsx +++ b/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); }} diff --git a/src/pages/user/user_config.tsx b/src/pages/user/user_config.tsx index 5699f80..694ca8c 100644 --- a/src/pages/user/user_config.tsx +++ b/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: "事件", - name: "thing_ids", - selectUrl: EventConfig.LIST, - keys:"name", + label: "事件类型", + name: "thing_type_ids", + selectUrl: EventTypeConfig.LIST, + keys:"type_name", value: [], rules: [{ required: true, message: "请选择默认数据" }], },