diff --git a/src/components/b_table.tsx b/src/components/b_table.tsx
index f067101..866cf11 100644
--- a/src/components/b_table.tsx
+++ b/src/components/b_table.tsx
@@ -139,6 +139,7 @@ const BTable = (props: any) => {
formRef={formRef}
colProps={25}
onFinish={() => {
+ console.log(record)
if (!record) {
store.add(formRef.current?.getFieldsValue()).then((res) => {
if (res) {
diff --git a/src/components/form/checkbox.tsx b/src/components/form/checkbox.tsx
index 86ce1a4..92fc31e 100644
--- a/src/components/form/checkbox.tsx
+++ b/src/components/form/checkbox.tsx
@@ -15,10 +15,15 @@ export const FormCheckBox = (v: FormDatas) => {
}
}, [v.selectUrl, v.selectList]);
return (
-
+
{list.map((item, index) => {
- return
+ return
{item.data_name}
})}
diff --git a/src/components/form/interface.ts b/src/components/form/interface.ts
index f576de8..7321981 100644
--- a/src/components/form/interface.ts
+++ b/src/components/form/interface.ts
@@ -24,7 +24,7 @@ export interface FormDatas {
name: string,
value: any,
selectUrl?: string,
- key?: string,
+ keys?: string,
treeCheckbox:boolean,
selectList?: Array
checkboxData?: Array,
diff --git a/src/components/form/select.tsx b/src/components/form/select.tsx
index 5672d6e..668c30c 100644
--- a/src/components/form/select.tsx
+++ b/src/components/form/select.tsx
@@ -15,14 +15,17 @@ export const FormSelect = (v: FormDatas) => {
}
}, [v.selectUrl, v.selectList]);
return (
-
+
diff --git a/src/components/form/simple_form.tsx b/src/components/form/simple_form.tsx
index bea4edb..c5e1ab0 100644
--- a/src/components/form/simple_form.tsx
+++ b/src/components/form/simple_form.tsx
@@ -69,9 +69,9 @@ const SimpleForm = (props: SimpleFormData) => {
);
case FormType.cehckbox:
- return FormCheckBox(v)
+ return
case FormType.treeSelect:
- return FormTreeSelect(v);
+ return
case FormType.cehckboxGroup:
return (
{
);
case FormType.select:
- return FormSelect(v);
+ return
case FormType.upload:
return (
{
const [list, setList] = useState([]);
@@ -16,7 +15,12 @@ export const FormTreeSelect = (v: FormDatas) => {
}
}, [v.selectUrl, v.selectList]);
return (
-
+
{
+ const { usrStore } = props;
+ useEffect(() => {
+ usrStore.getMenu()
+ }, [])
const options = {
grid: { top: 8, right: 8, bottom: 24, left: 36 },
xAxis: {
diff --git a/src/pages/dep/config.tsx b/src/pages/dep/config.tsx
index eecb235..bcd0226 100644
--- a/src/pages/dep/config.tsx
+++ b/src/pages/dep/config.tsx
@@ -43,17 +43,17 @@ export const defaultConfig = [
label: "上级部门",
name: "p_id",
value: 0,
- selectUrl:DepConfig.LIST,
- key:"dep_name",
+ selectUrl: DepConfig.LIST,
+ keys: "dep_name",
rules: [],
},
- {
+ {
type: FormType.treeSelect,
label: "所属企业",
name: "company_id",
value: 0,
- selectUrl:CompanyConfig.LIST,
- key:"name",
+ selectUrl: CompanyConfig.LIST,
+ keys: "name",
rules: [],
},
];
diff --git a/src/pages/menu/menu_config.tsx b/src/pages/menu/menu_config.tsx
index b85d273..2d8b0f9 100644
--- a/src/pages/menu/menu_config.tsx
+++ b/src/pages/menu/menu_config.tsx
@@ -38,7 +38,7 @@ export const defaultConfig = [
name: "p_id",
value: "",
selectUrl:MenuConfig.LIST,
- key:"name",
+ keys:"name",
rules: [],
},
{
diff --git a/src/pages/role/role_config.tsx b/src/pages/role/role_config.tsx
index 53e22db..4b596b1 100644
--- a/src/pages/role/role_config.tsx
+++ b/src/pages/role/role_config.tsx
@@ -23,9 +23,9 @@ export const defaultConfig = [
{
type: FormType.select,
label: "所属部门",
- name: "dep_id",
+ name: "dep_identity",
selectUrl: DepConfig.LIST,
- key: "dep_name",
+ keys: "dep_name",
value: "",
rules: [{ required: true, message: "所属部门不能为空" }],
},
diff --git a/src/pages/source/source.tsx b/src/pages/source/source.tsx
index 3d18afb..ed2a5ba 100644
--- a/src/pages/source/source.tsx
+++ b/src/pages/source/source.tsx
@@ -25,15 +25,7 @@ const Source = (props: Store) => {
const [selectKey, setSelectKey] = useState>([
"01JM4XMY2N9KN23XSZJSQQM3HY",
"01JM4XMY2N9KN23XSZJSWQHHKA",
- "01JM4XMY2N9KN23XSZJW02PRCF",
- "01JM4XMY2N9KN23XSZJYCKT6XQ",
- "01JM4XMY2N9KN23XSZK0AJ6QEZ",
- "01JM4XMY2N9KN23XSZK10KM59Y",
- "01JM4XMY2N9KN23XSZK479Y59M",
- "01JM4XMY2N9KN23XSZK5F8Z2J8",
- "01JM4XMY2N9KN23XSZK6W7Q25F",
- "01JM4XMY2N9KN23XSZK7ET1GEB",
- "01JM4XMY2N9KN23XSZK9DNRCZZ",
+
]);
const [page, setPage] = useState(1);
const [editingKey, setEditingKey] = useState("");
diff --git a/src/pages/user/user_config.tsx b/src/pages/user/user_config.tsx
index 557229e..0bb80a4 100644
--- a/src/pages/user/user_config.tsx
+++ b/src/pages/user/user_config.tsx
@@ -3,6 +3,7 @@ import { UserDataType } from "@/model/userModel";
import { ColumnsType } from "antd/lib/table";
import { Image } from "antd";
import { getBirthDateAndGender } from "@/util/util";
+import { CompanyConfig, DepConfig, RoleConfig } from "@/service/user_config";
export const defaultConfig = [
{
type: FormType.input,
@@ -37,12 +38,40 @@ export const defaultConfig = [
name: "email",
value: "",
},
+ {
+ type: FormType.select,
+ label: "所属部门",
+ name: "dep_identity",
+ selectUrl: DepConfig.LIST,
+ keys: "dep_name",
+ value: "",
+ rules: [{ required: true, message: "所属部门不能为空" }],
+ },
+ {
+ type: FormType.treeSelect,
+ label: "所属单位",
+ name: "company_identity",
+ treeCheckbox: false,
+ selectUrl: CompanyConfig.LIST,
+ value: "",
+ keys: "company_id",
+ rules: [{ required: true, message: "所属单位不能为空" }],
+ },
+ {
+ type: FormType.select,
+ label: "角色",
+ name: "role_identity",
+ selectUrl: RoleConfig.LIST,
+ value: "",
+ rules: [{ required: true, message: "角色不能为空" }],
+ },
{
type: FormType.upload,
label: "头像",
name: "head_img",
value: [],
},
+
];
export const columns: ColumnsType = [
diff --git a/src/service/base.ts b/src/service/base.ts
index d3acc62..035eb9d 100644
--- a/src/service/base.ts
+++ b/src/service/base.ts
@@ -1,7 +1,6 @@
import store from "@/store";
import Config from "@/util/config";
import axios, { AxiosResponse } from "axios";
-// import { baseHttp } from '@/service/base';
// 添加请求拦截器
axios.defaults.headers.common["Content-Type"] = "application/json; charset=utf8";
axios.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";
@@ -33,18 +32,6 @@ axios.interceptors.response.use((res: AxiosResponse) => {
return Promise.reject(err);
});
class BaseHttps {
- async gets(url: string, params: any) {
- let res = await axios({
- method: 'get',
- url: url,
- headers: {
- "token": window.localStorage.getItem("video-token"),
- 'Content-Type': 'application/json; charset=utf-8'
- },
- params
- });
- return res.data;
- };
async get(url: string, params: any) {
let res = await axios({
method: 'get',
@@ -62,14 +49,6 @@ class BaseHttps {
return res.data;
};
- async forms(url: string, params: any) {
- let res = await axios({
- method: 'post',
- url: url,
- params: params
- });
- return res.data;
- };
async upload(url: string, params: any) {
let res = await axios({
headers: {
diff --git a/src/service/user_config.ts b/src/service/user_config.ts
index 36c2bae..f9df56a 100644
--- a/src/service/user_config.ts
+++ b/src/service/user_config.ts
@@ -4,6 +4,7 @@ class UserConfig {
static EDIT: string = "/user";
static LIST: string = "/user/list";
static DELETE: string = "/user";
+ static menu: string = "/user/menu";
}
class RoleConfig {
diff --git a/src/store/user.ts b/src/store/user.ts
index 06c05fc..de4cb87 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -9,17 +9,20 @@ class UserStore extends BaseStore {
_userinfo: UserInfos = {}; // 用户信息
userDetail = {}
isNeedLogin: boolean = false; // 是否需要登录
+ menu = []
constructor() {
super(UserConfig)
makeObservable(this, {
logOut: action,
login: action,
+ getMenu: action,
_userinfo: observable,
isNeedLogin: observable,
userDetail: observable,
openLoginDilog: action,
userInfo: computed,
+ menu: observable,
})
}
@@ -48,8 +51,8 @@ class UserStore extends BaseStore {
message.error(data.msg)
return false
}
- console.log(data.data.token)
window.localStorage.setItem("token", data.data.token ?? "");
+ this.getMenu()
return true
} catch (error) {
console.log(error)
@@ -67,6 +70,10 @@ class UserStore extends BaseStore {
setUserDetaul(data) {
this.userDetail = data
}
+ async getMenu() {
+ let data = await base.get(UserConfig.menu, {})
+ console.log(data)
+ }
}
const userStore = new UserStore();
export default userStore;
\ No newline at end of file