Skip to content

X
xiaomai-cloud-class-web
Commit 8b8a956b by zhangleyuan
Options

feat:解决合并代码后的冲突

parents 559d02c0 16af0617
Showing with 372 additions and 384 deletions
src/common/js/platform.js
......@@ -2,7 +2,7 @@
module.exports = {
isWeiXin() {
const ua = navigator.userAgent.toLowerCase();
return ua.indexOf('micromessenger') > 0;
return (ua.indexOf('micromessenger') > 0) && !(/wxwork/i.test(navigator.userAgent));
},
isWorkWx (){
return /wxwork/i.test(navigator.userAgent)
......
src/common/js/wechatApi.js
......@@ -2,7 +2,7 @@
* @Author: wufan
* @Date: 2021-05-11 10:21:37
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-08-11 17:27:32
* @LastEditTime: 2021-08-12 15:02:18
* @Description: 企业微信api
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*
......@@ -12,72 +12,35 @@ import Platform from '@/common/js/platform';
import User from '@/common/js/user';
import Service from '@/common/js/service';
console.log(wx.agentConfig,' console.log(wx.agentConfig) ')
export default class WechatApi {
static async initConfig(params = { isAgentConfig: false, url: '' }) {
static initConfig(params = { isAgentConfig: false, url: '' }) {
if (Platform.isWorkWx()) {
return new Promise(async (resolve, reject) => {
console.log(1111111111111111111111111111111111)
Service.Hades('anon/hades/getWxCorpJSAPISignature', {
storeId: User.getStoreId(),
url: params.url,
url: window.location.href.split('#')[0],
}).then((result) => {
const res = result.result;
this.config({
wx.config({
beta: true, // 必须这么写，否则wx.invoke调用形式的jsapi会有问题
debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
appId: res.appId, // 必填，企业微信的corpID
timestamp: res.timestamp, // 必填，生成签名的时间戳
nonceStr: res.nonceStr, // 必填，生成签名的随机串
signature: res.signature, // 必填，签名，见 附录-JS-SDK使用权限签名算法
jsApiList: ['chooseImage', 'shareToExternalContact', 'selectExternalContact', 'selectEnterpriseContact'],
}).then(() => {
console.log(2222222222222222222222222222222222222222)
Service.Hades('anon/hades/getWxWorkJSAPISignature', {
storeId: User.getStoreId(),
url: params.url,
}).then((result2) => {
console.log(333333333333333333333333333333333)
const res2 = result2.result;
this.agentConfig({
corpid: res2.corpid, // 必填，企业微信的corpid，必须与当前登录的企业一致
agentid: res2.agentid, // 必填，企业微信的应用id （e.g. 1000247）
timestamp: res2.timestamp, // 必填，生成签名的时间戳
nonceStr: res2.nonceStr, // 必填，生成签名的随机串
signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat', 'startLiving', 'replayLiving'],
success: (res) => {
console.log(res, 'res-agentconfig');
console.info('window.WWOpenData', window.WWOpenData);
resolve(res);
},
fail: (err) => {
console.log(1213545344545)
console.log(err, 'err-agentconfig');
reject(err);
},
});
});
})
.catch((err)=> {
console.log("GGGGGGGGGGGGG",err)
})
});
})
} else {
if (params.isAgentConfig) {
console.log(32132132, 'cesgu')
return new Promise(async (resolve, reject) => {
jsApiList: ['scanQRCode'],
});
})
wx.ready(() => {
Service.Hades('anon/hades/getWxWorkJSAPISignature', {
storeId: User.getStoreId(),
url: params.url,
url: window.location.href.split('#')[0],
}).then((result2) => {
const res2 = result2.result;
this.agentConfig({
wx.agentConfig({
corpid: res2.corpid, // 必填，企业微信的corpid，必须与当前登录的企业一致
agentid: res2.agentid, // 必填，企业微信的应用id （e.g. 1000247）
timestamp: res2.timestamp, // 必填，生成签名的时间戳
......@@ -85,58 +48,55 @@ export default class WechatApi {
signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat', 'startLiving', 'replayLiving'],
success: (res) => {
console.log(res, 'res-agentconfig');
console.info('window.WWOpenData', window.WWOpenData);
console.log(res, 'agentConfig 成功', 'res-agentconfig');
resolve(res);
},
fail: (err) => {
console.log(1213545344545)
console.log(err, 'err-agentconfig');
reject(err);
},
});
});
});
}
}
wx.error((err) => {
console.log('getWxCorpJSAPISignature', err)
});
}
})
static async config(config) {
return new Promise((resolve, reject) => {
console.info('wx.config', config);
wx.config(config);
wx.ready(resolve);
wx.error(reject);
}).then(
() => {
console.info('wx.ready');
},
(error) => {
console.error('wx.error', error);
throw error;
}
);
}
static async agentConfig(config) {
wx.agentConfig({ ...config });
}
} else {
static getCurExternalContact() {
return new Promise((resolve, reject) => {
wx.ready(() => {
wx.invoke('getCurExternalContact', {}, function (res) {
if (res.err_msg == 'getCurExternalContact:ok') {
resolve(res.userId); //返回当前外部联系人userId
} else {
reject(res.err_msg); //错误处理
}
return new Promise(async (resolve, reject) => {
Service.Hades('anon/hades/getWxWorkJSAPISignature', {
storeId: User.getStoreId(),
url: window.location.href.split('#')[0],
}).then((result2) => {
const res2 = result2.result;
wx.agentConfig({
corpid: res2.corpid, // 必填，企业微信的corpid，必须与当前登录的企业一致
agentid: res2.agentid, // 必填，企业微信的应用id （e.g. 1000247）
timestamp: res2.timestamp, // 必填，生成签名的时间戳
nonceStr: res2.nonceStr, // 必填，生成签名的随机串
signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat', 'startLiving', 'replayLiving'],
success: (res) => {
console.log(res, 'agentConfig 成功', 'res-agentconfig');
resolve(res);
},
fail: (err) => {
console.log(1213545344545)
console.log(err, 'err-agentconfig');
},
});
});
});
});
}
}
static getContext() {
return new Promise((resolve, reject) => {
wx.ready(() => {
......@@ -156,13 +116,13 @@ export default class WechatApi {
wx.ready(() => {
wx.invoke('startLiving', {
"livingId": id,
}, function(res) {
}, function (res) {
if (res.err_msg === "startLiving:ok") {
resolve(true)
} else {
reject(res.err_msg); //错误处理
}
});
});
});
})
}
......@@ -171,8 +131,7 @@ export default class WechatApi {
wx.ready(() => {
wx.invoke('replayLiving', {
"livingId": id,
}, function(res) {
console.log("WorkWXAPI 进入直播间",res)
}, function (res) {
if (res.err_msg === "replayLiving:ok") {
resolve(true)
} else {
......@@ -196,7 +155,7 @@ export default class WechatApi {
}
reject(err); //错误处理
}
});
});
});
})
}
......
src/domains/basic-domain/constants.ts
/*
* @Author: 陈剑宇
* @Date: 2020-05-07 14:43:01
* @LastEditTime: 2021-06-22 16:49:06
* @LastEditTime: 2021-08-11 22:52:04
* @LastEditors: Please set LastEditors
* @Description:
* @FilePath: /wheat-web-demo/src/domains/basic-domain/constants.ts
......
src/domains/course-domain/constants.ts
......@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2020-08-20 09:21:40
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-06-11 15:17:56
* @LastEditTime: 2021-08-11 22:50:48
* @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
......
src/index.html
......@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2020-08-24 12:20:57
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-08-11 21:22:26
* @LastEditTime: 2021-08-12 15:01:57
* @Description:
* @Copyright: 杭州杰竞科技有限公司 版权所有
-->
......@@ -40,17 +40,25 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>小麦企学院</title>
<script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
<script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js"></script>
<script type="text/javascript" src="https://image.xiaomaiketang.com/xm/iscroll-zoom-min.js"></script>
<script type="text/javascript" src="https://image.xiaomaiketang.com/xm/hammer.min.js"></script>
<script type="text/javascript" src="https://image.xiaomaiketang.com/xm/lrz.all.bundle.js"></script>
<script type="text/javascript" src="https://image.xiaomaiketang.com/xm/PhotoClip.js"></script>
<script type="text/javascript" charset="utf-8" src="//g.alicdn.com/sd/ncpc/nc.js?t=2015052012"></script>
<script type="text/javascript" src="https://xiaomai-js.oss-cn-hangzhou.aliyuncs.com/loghub-xm-0.0.1-beta.js"></script>
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
<script type="text/javascript" src="//open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js"></script>
</head>
<body>
<script>
setTimeout(()=>{
if(!wx.agentConfig){
window.location.reload()
}
},100)
</script>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
......
src/modules/college-manage/components/LeftStructureTree.jsx
import React, { useEffect, useState } from "react";
import React, { useEffect, useState, useRef } from "react";
import { withRouter } from "react-router-dom";
import { Tree, Input, Dropdown, Menu,Button,Modal,message,AutoComplete,Tooltip} from "antd";
import { Tree, Input, Dropdown, Menu, Button, Modal, message, AutoComplete, Tooltip } from "antd";
import AddOrEditPostGroupModal from "../modal/AddOrEditPostGroupModal";
import User from '@/common/js/user'
import StoreService from "@/domains/store-domain/storeService";
import { DepType } from '@/domains/store-domain/constants';
import { DepType } from '@/domains/store-domain/constants';
import Bus from '@/core/bus';
import WWOpenDataCom from '@/components/WWOpenDataCom';
import "./LeftStructureTree.less";
......@@ -13,51 +13,59 @@ const { Search } = Input;
const { DirectoryTree } = Tree;
const { Option } = AutoComplete;
function LeftStructureTree(props) {
const {treeType} = props;
const [treeData,setTreeData]=useState([]);
const { treeType } = props;
const [treeData, setTreeData] = useState([]);
const [addOrEditPostGroupShow, setAddOrEditPostGroupShow] = useState(false);
const [postGroupModalLevel, setPostGroupModalLevel] = useState("");
const [operatePostGroupModalType,setOperatePostGroupModalType] = useState("");
const [postGroupModalTitle,setPostGroupModalTitle] = useState("");
const [postGroupModalLable,setPostGroupModalLable] = useState("");
const [postGroupModalLevel, setPostGroupModalLevel] = useState("");
const [operatePostGroupModalType, setOperatePostGroupModalType] = useState("");
const [postGroupModalTitle, setPostGroupModalTitle] = useState("");
const [postGroupModalLable, setPostGroupModalLable] = useState("");
const [postGroupName, setPostGroupName] = useState("");
const [currentGroupData,setCurrentGroupData] = useState({});
const [completeOptions,setCompleteOption] = useState([]);
const [selectedKeys,setSelectedKeys]= useState([]); // 设置选中的部门key值
const [queryName,setQueryName] = useState(''); // 搜索框内的值
const [selctQueryName,setSelctQueryName]= useState(''); // 搜索出结果后最终选择的名字
const [postGroupTreeData,setPostGroupTreeData] = useState([]); // 为了判定创建和编辑时的数据会不会重明
const [open,setOpen]=useState(false);
useEffect(()=>{
const [currentGroupData, setCurrentGroupData] = useState({});
const [completeOptions, setCompleteOption] = useState([]);
const [selectedKeys, setSelectedKeys] = useState([]); // 设置选中的部门key值
const [queryName, setQueryName] = useState(''); // 搜索框内的值
const [selctQueryName, setSelctQueryName] = useState(''); // 搜索出结果后最终选择的名字
const [postGroupTreeData, setPostGroupTreeData] = useState([]); // 为了判定创建和编辑时的数据会不会重明
const [open, setOpen] = useState(false);
const timer = useRef(null)
const queryNameRef = useRef(null)
useEffect(() => {
queryNameRef.current = queryName
}, [
queryName
])
useEffect(() => {
setQueryName(''); //切换tab时搜索置空
setCompleteOption([]);
setCompleteOption([]);
setOpen(false); //切换tab时搜索的下拉框置为空
getTreeData().then((res)=>{
getTreeData().then((res) => {
const _defaultSelectedKeys = [];
if(res.length > 0){
if (res.length > 0) {
_defaultSelectedKeys.push(res[0].id);
setSelectedKeys(_defaultSelectedKeys);
props.onChangeSelectDep(res[0])
props.searchUserList(res[0],treeType,1);
}else{
props.searchUserList({id:null},treeType,1);
props.searchUserList(res[0], treeType, 1);
} else {
props.searchUserList({ id: null }, treeType, 1);
}
});
},[props.treeType]);
useEffect(()=>{
Bus.bind("addCustomer",(record)=>{addCustomer(record.treeType,record.query)})
},[]);
useEffect(()=>{
Bus.bind("changeTreeData",(record)=>{getTreeData(record.treeType)})
},[]);
}, [props.treeType]);
useEffect(() => {
Bus.bind("addCustomer", (record) => { addCustomer(record.treeType, record.query) })
}, []);
useEffect(() => {
Bus.bind("changeTreeData", (record) => { getTreeData(record.treeType) })
}, []);
const renderTitle = (title) => (
<span className="catalog-title">
{title}
</span>
);
const renderItem = (record,type) => ({
const renderItem = (record, type) => ({
value: record.userName || record.name,
label: (
<div
......@@ -70,28 +78,28 @@ function LeftStructureTree(props) {
type={type}
>
{type === 'user'?
{type === 'user' ?
<div className="search-result-item__left">
<span className="icon iconfont title-icon">&#xe603;</span>
<WWOpenDataCom type="userName" openid={record.userName}/>
<WWOpenDataCom type="userName" openid={record.userName} />
</div>
:
<div className="search-result-item__left">
{props.treeType === 'departMentTab' ?
<WWOpenDataCom type="departmentName" openid={record.name}/>
<WWOpenDataCom type="departmentName" openid={record.name} />
:
<span>{record.name}</span>
}
</div>
}
{type === 'user' && (
<div className="search-result-item__right">
<Tooltip title={<div>{handleDepName(record.depNamesList)}</div>} placement='top' arrowPointAtCenter>
{record.depNamesList.map((item,index)=>{
return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNamesList.length -1)?';':''}</span>
})}
</Tooltip>
<Tooltip title={<div>{handleDepName(record.depNamesList)}</div>} placement='top' arrowPointAtCenter>
{record.depNamesList.map((item, index) => {
return <span><WWOpenDataCom type="departmentName" openid={item} />{index < (record.depNamesList.length - 1) ? ';' : ''}</span>
})}
</Tooltip>
</div>
)}
{type === 'post' &&
......@@ -101,155 +109,155 @@ function LeftStructureTree(props) {
),
});
const notFoundContentNode = ()=>{
return <div className="empty-con">
<img src="https://image.xiaomaiketang.com/xm/wRDrb2pJFb.png" className="empty-img"/>
<div className="empty-text">暂无数据</div>
</div>
const notFoundContentNode = () => {
return <div className="empty-con">
<img src="https://image.xiaomaiketang.com/xm/wRDrb2pJFb.png" className="empty-img" />
<div className="empty-text">暂无数据</div>
</div>
}
function handleDepName(depArray){
function handleDepName(depArray) {
const depArrayDom = depArray.map((item, index) => {
return <span><WWOpenDataCom type="departmentName" openid={item}/>；</span>
return <span><WWOpenDataCom type="departmentName" openid={item} />；</span>
});
return depArrayDom;
};
function handlePlaceHolder(){
function handlePlaceHolder() {
let placeholder = '';
switch (props.treeType){
switch (props.treeType) {
case 'departMentTab':
placeholder = '搜索学员姓名、部门';
break;
break;
case 'postGrouptab':
placeholder = '搜索学员姓名/岗位/岗位组';
break;
break;
case 'customGroupTab':
placeholder = '搜索学员姓名/自定义分组集合/自定义分组';
break;
break;
default:
break;
break;
}
return placeholder
}
function confirmSearchSelect(value,option){
function confirmSearchSelect(value, option) {
const param = {}
setOpen(false);
setQueryName(value);
if(option.label.props.type === 'user'){
if (option.label.props.type === 'user') {
param.queryName = value;
}else{
} else {
param.id = option.label.props.depId;
}
props.searchUserList(param,treeType,1);
props.searchUserList(param, treeType, 1);
}
// 获取关键词的搜索结果
function getCompleteOptionData(value){
function getCompleteOptionData(value) {
// setQueryName(value);
setCompleteOption([]);
if(!value){
return
if (!value) {
return
}
const params = {
depType:DepType[props.treeType],
queryName:value,
enterpriseId:User.getEnterpriseId(),
source:0,//0代表来自企培
storeId:User.getStoreId(),
userId:User.getUserId(),
whetherCount:false,
distinct:false,
queryType:'CUSTOMER'
depType: DepType[props.treeType],
queryName: value,
enterpriseId: User.getEnterpriseId(),
source: 0,//0代表来自企培
storeId: User.getStoreId(),
userId: User.getUserId(),
whetherCount: false,
distinct: false,
queryType: 'CUSTOMER'
}
StoreService.getDepartmentUser(params).then((res) => {
const _completeOptions = [];
const userObj = {};
const departmentGroupObj = {};
const postobj = {};
const { result = {}} = res;
const {departmentUserVOList=[],departmentVOList=[],subLevelDepartmentVOList=[]} = result;
if(departmentUserVOList.length>0){
userObj.label=renderTitle('学员');
userObj.options=departmentUserVOList.map((item,index)=>{
return renderItem(item,'user');
const { result = {} } = res;
const { departmentUserVOList = [], departmentVOList = [], subLevelDepartmentVOList = [] } = result;
if (departmentUserVOList.length > 0) {
userObj.label = renderTitle('学员');
userObj.options = departmentUserVOList.map((item, index) => {
return renderItem(item, 'user');
})
}
if(departmentVOList.length>0){
switch (props.treeType){
if (departmentVOList.length > 0) {
switch (props.treeType) {
case 'departMentTab':
departmentGroupObj.label=renderTitle('部门');
break;
departmentGroupObj.label = renderTitle('部门');
break;
case 'postGrouptab':
departmentGroupObj.label=renderTitle('岗位组');
break;
departmentGroupObj.label = renderTitle('岗位组');
break;
case 'customGroupTab':
departmentGroupObj.label=renderTitle('分组集合');
break;
departmentGroupObj.label = renderTitle('分组集合');
break;
default:
break;
break;
}
departmentGroupObj.options=departmentVOList.map((item,index)=>{
return renderItem(item,'group');
departmentGroupObj.options = departmentVOList.map((item, index) => {
return renderItem(item, 'group');
})
}
if(subLevelDepartmentVOList.length>0){
switch (props.treeType){
if (subLevelDepartmentVOList.length > 0) {
switch (props.treeType) {
case 'postGrouptab':
postobj.label=renderTitle('岗位');
break;
postobj.label = renderTitle('岗位');
break;
case 'customGroupTab':
postobj.label=renderTitle('分组');
break;
postobj.label = renderTitle('分组');
break;
default:
break;
break;
}
postobj.options=subLevelDepartmentVOList.map((item,index)=>{
return renderItem(item,'post');
postobj.options = subLevelDepartmentVOList.map((item, index) => {
return renderItem(item, 'post');
})
}
if(Object.keys(userObj).length !==0){
if (Object.keys(userObj).length !== 0) {
_completeOptions.push(userObj);
}
if(Object.keys(departmentGroupObj).length !==0){
if (Object.keys(departmentGroupObj).length !== 0) {
_completeOptions.push(departmentGroupObj);
}
if(Object.keys(postobj).length !==0){
if (Object.keys(postobj).length !== 0) {
_completeOptions.push(postobj);
}
setCompleteOption(_completeOptions);
});
}
async function addCustomer(treeType,query){
async function addCustomer(treeType, query) {
await getTreeData(treeType);
props.searchUserList(query,treeType,1);
props.searchUserList(query, treeType, 1);
}
function getTreeData(treeType){
return new Promise((resolve,reject)=>{
function getTreeData(treeType) {
return new Promise((resolve, reject) => {
const params = {
departmentTypeEnum:DepType[treeType] || DepType[props.treeType],
enterpriseId:User.getEnterpriseId(),
source:0,//0代表来自企培
storeId:User.getStoreId(),
userId:User.getUserId(),
whetherCount:true
departmentTypeEnum: DepType[treeType] || DepType[props.treeType],
enterpriseId: User.getEnterpriseId(),
source: 0,//0代表来自企培
storeId: User.getStoreId(),
userId: User.getUserId(),
whetherCount: true
}
StoreService.queryDepartmentTree(params).then((res) => {
const { result = []} = res
let { departmentVOList=[] } =result;
const { result = [] } = res
let { departmentVOList = [] } = result;
let _treeData = handleData(result);
setTreeData(_treeData);
resolve(result);
});
})
}
function handleData(dataArray){
const _dataArray = dataArray.map((item,index)=>{
function handleData(dataArray) {
const _dataArray = dataArray.map((item, index) => {
item.title = "";
item.key=item.id;
if(item.sonDepartmentVOList){
item.key = item.id;
if (item.sonDepartmentVOList) {
item.children = item.sonDepartmentVOList;
handleData(item.sonDepartmentVOList)
}
......@@ -265,24 +273,24 @@ function LeftStructureTree(props) {
const moreOpenGroupOperate = (record) => (
<Menu>
<Menu.Item key="edit">
<span onClick={()=>{props.treeType==='postGrouptab'?editPostGroup(record):editCustomGroup(record)}}>编辑</span>
<span onClick={() => { props.treeType === 'postGrouptab' ? editPostGroup(record) : editCustomGroup(record) }}>编辑</span>
</Menu.Item>
{record.depLevel ===0 &&
{record.depLevel === 0 &&
<Menu.Item key="add" >
<span onClick={()=>{props.treeType==='postGrouptab'?addPostGroup(1,record):addCustomGroup(1,record)}}>
{props.treeType==='postGrouptab' &&
<span onClick={() => { props.treeType === 'postGrouptab' ? addPostGroup(1, record) : addCustomGroup(1, record) }}>
{props.treeType === 'postGrouptab' &&
<span>新建岗位</span>
}
{props.treeType==='customGroupTab' &&
{props.treeType === 'customGroupTab' &&
<span>新建分组</span>
}
</span>
</Menu.Item>
}
{/* { (record.departmentCount === 0 || !record.departmentCount) && */}
<Menu.Item key="del">
<span onClick={()=>{props.treeType==='postGrouptab'?delPostGroup(record):delCustomGroup(record)}}>删除</span>
</Menu.Item>
<Menu.Item key="del">
<span onClick={() => { props.treeType === 'postGrouptab' ? delPostGroup(record) : delCustomGroup(record) }}>删除</span>
</Menu.Item>
{/* } */}
</Menu>
);
......@@ -293,75 +301,75 @@ function LeftStructureTree(props) {
}
//添加岗位组/岗位
function addPostGroup(level,record) {
if(level===0){
function addPostGroup(level, record) {
if (level === 0) {
if (treeData.length > 9) {
message.error("岗位组数量已达10个上限");
return;
}
}
if(level===1){
if(record.sonDepartmentVOList){
if(record.sonDepartmentVOList.length > 19){
if (level === 1) {
if (record.sonDepartmentVOList) {
if (record.sonDepartmentVOList.length > 19) {
message.error("岗位数量已达20个上限");
return;
}
}
}
setCurrentGroupData({});
setAddOrEditPostGroupShow(true);
setOperatePostGroupModalType("add");
setPostGroupModalLevel(level);
setCurrentGroupData(record);
console.log('treeData',record);
if(level===0){
console.log('treeData', record);
if (level === 0) {
setPostGroupModalTitle('添加岗位组');
setPostGroupModalLable('岗位组');
setPostGroupTreeData(treeData);
}else{
} else {
setPostGroupModalTitle('添加岗位'); // sub代表岗位
setPostGroupModalLable('岗位');
setPostGroupTreeData(record.sonDepartmentVOList || []);
}
}
//编辑岗位组/岗位
function editPostGroup(record){
function editPostGroup(record) {
setAddOrEditPostGroupShow(true);
setOperatePostGroupModalType("edit");
//level为0的时候编辑的是岗位组 大于0的时候
setPostGroupModalLevel(record.depLevel);
setCurrentGroupData(record);
console.log('treeData',record);
if(record.depLevel===0){
setPostGroupModalTitle('编辑岗位组');
setPostGroupModalLable('岗位组');
setPostGroupTreeData(treeData);
}else{
setPostGroupModalTitle('编辑岗位');
setPostGroupModalLable('岗位');
setPostGroupTreeData(getParentChildernData(record.parentId));
}
//level为0的时候编辑的是岗位组 大于0的时候
setPostGroupModalLevel(record.depLevel);
setCurrentGroupData(record);
console.log('treeData', record);
if (record.depLevel === 0) {
setPostGroupModalTitle('编辑岗位组');
setPostGroupModalLable('岗位组');
setPostGroupTreeData(treeData);
} else {
setPostGroupModalTitle('编辑岗位');
setPostGroupModalLable('岗位');
setPostGroupTreeData(getParentChildernData(record.parentId));
}
}
// 获取父节点下的所有的子级数据
function getParentChildernData(parentId){
function getParentChildernData(parentId) {
let _parentChildernData = []
treeData.map((item,index)=>{
if( parentId=== item.id){
treeData.map((item, index) => {
if (parentId === item.id) {
_parentChildernData = item.sonDepartmentVOList
}
})
return _parentChildernData
return _parentChildernData
}
function delPostGroup(record){
function delPostGroup(record) {
let title = '确认删除该岗位组吗？';
let content= '删除后，该岗位组下的岗位及也将全部删除。';
if(record.departmentCount && record.departmentCount>0 ){
let content = '删除后，该岗位组下的岗位及也将全部删除。';
if (record.departmentCount && record.departmentCount > 0) {
title = '删除失败';
if(record.depLevel>0){
if (record.depLevel > 0) {
content = `${record.name}存在学员，不能删除该岗位`;
}else{
} else {
content = `${record.name}存在学员，不能删除该岗位组`;
}
Modal.warning({
......@@ -372,29 +380,29 @@ function LeftStructureTree(props) {
})
return
}
if(record.level>0){
if (record.level > 0) {
title = '确认删除该岗位吗？';
content = '删除后，不可恢复';
}
Modal.confirm({
title,
content,
icon: <span className='icon iconfont default-confirm-icon'>&#xe6f4;</span>,
okText: '确定',
okType: 'danger',
cancelText: '取消',
onOk: () => {
delGroup(record);
},
title,
content,
icon: <span className='icon iconfont default-confirm-icon'>&#xe6f4;</span>,
okText: '确定',
okType: 'danger',
cancelText: '取消',
onOk: () => {
delGroup(record);
},
});
}
function delGroup(record){
function delGroup(record) {
let parmas = {
departmentId:record.id,
enterpriseId:User.getEnterpriseId(),
source:0,
storeId:User.getStoreId(),
userId:User.getUserId()
departmentId: record.id,
enterpriseId: User.getEnterpriseId(),
source: 0,
storeId: User.getStoreId(),
userId: User.getUserId()
}
StoreService.delDepartment(parmas).then((res) => {
message.success(`删除成功`)
......@@ -405,16 +413,16 @@ function LeftStructureTree(props) {
//添加自定义分组集合/分组
function addCustomGroup(level,record) {
if(level===0){
function addCustomGroup(level, record) {
if (level === 0) {
if (treeData.length > 9) {
message.error("自定义分组集合数量已达10个上限");
return;
}
}
if(level===1){
if(record.sonDepartmentVOList){
if(record.sonDepartmentVOList.length > 19){
if (level === 1) {
if (record.sonDepartmentVOList) {
if (record.sonDepartmentVOList.length > 19) {
message.error("自定义分组数量已达20个上限");
return;
}
......@@ -425,41 +433,41 @@ function LeftStructureTree(props) {
setOperatePostGroupModalType("add");
setPostGroupModalLevel(level);
setCurrentGroupData(record)
if(level===0){
if (level === 0) {
setPostGroupModalTitle('添加分组集合');
setPostGroupModalLable('分组集合');
setPostGroupTreeData(treeData);
}else{
} else {
setPostGroupModalTitle('添加分组'); // sub代表岗位
setPostGroupModalLable('分组');
setPostGroupTreeData(record.sonDepartmentVOList || []);
}
}
//编辑自定义分组集合/分组
function editCustomGroup(record){
function editCustomGroup(record) {
setAddOrEditPostGroupShow(true);
setOperatePostGroupModalType("edit");
setPostGroupModalLevel(record.level);
setCurrentGroupData(record)
//level为0的时候编辑的是岗位组 大于0的时候
if(record.depLevel===0){
setPostGroupModalTitle('编辑分组集合');
setPostGroupModalLable('分组集合');
setPostGroupTreeData(treeData);
}else{
setPostGroupModalTitle('编辑分组');
setPostGroupModalLable('分组');
setPostGroupTreeData(getParentChildernData(record.parentId));
}
//level为0的时候编辑的是岗位组 大于0的时候
if (record.depLevel === 0) {
setPostGroupModalTitle('编辑分组集合');
setPostGroupModalLable('分组集合');
setPostGroupTreeData(treeData);
} else {
setPostGroupModalTitle('编辑分组');
setPostGroupModalLable('分组');
setPostGroupTreeData(getParentChildernData(record.parentId));
}
}
function delCustomGroup(record){
function delCustomGroup(record) {
let title = '确认删除该分组集合吗？';
let content= '删除后，该分组集合下的岗位及也将全部删除。';
if(record.departmentCount && record.departmentCount>0 ){
let content = '删除后，该分组集合下的岗位及也将全部删除。';
if (record.departmentCount && record.departmentCount > 0) {
title = '删除失败';
if(record.level>0){
if (record.level > 0) {
content = `${record.name}存在学员，不能删除该分组`;
}else{
} else {
content = `${record.name}存在学员，不能删除该分组集合`;
}
Modal.warning({
......@@ -470,22 +478,22 @@ function LeftStructureTree(props) {
})
return
}
if(record.level>0){
if (record.level > 0) {
title = '确认删除该分组吗？';
content = '删除后，不可恢复';
}
Modal.confirm({
title,
content,
icon: <span className='icon iconfont default-confirm-icon'>&#xe6f4;</span>,
okText: '确定',
okType: 'danger',
cancelText: '取消',
onOk: () => {
Modal.confirm({
title,
content,
icon: <span className='icon iconfont default-confirm-icon'>&#xe6f4;</span>,
okText: '确定',
okType: 'danger',
cancelText: '取消',
onOk: () => {
delGroup(record)
},
});
}
},
});
}
function confirmAddOrEditPostGroup() {
......@@ -493,70 +501,79 @@ function LeftStructureTree(props) {
getTreeData()
}
function selectUserList(record,e){
function selectUserList(record, e) {
const _selectKeys = [];
_selectKeys.push(e.selectedNodes[0].id)
setSelectedKeys(_selectKeys);
props.onChangeSelectDep(e.selectedNodes[0]);
props.searchUserList(e.selectedNodes[0],treeType,1);
props.searchUserList(e.selectedNodes[0], treeType, 1);
}
function changeName(value) {
setQueryName(value); setOpen(true);
clearTimeout(timer.current)
timer.current = setTimeout(() => {
getCompleteOptionData(queryNameRef.current)
}, 500)
}
return (
<div className="left-structure-tree">
<div className="organization">
<div className="search-con">
{/* <Complete/> */}
<AutoComplete
dropdownClassName="certain-category-search-dropdown"
dropdownMatchSelectWidth={250}
allowClear
onChange={(value)=>{setQueryName(value);setOpen(true);getCompleteOptionData(value)}}
// onSearch={(value)=>{getCompleteOptionData(value)}}
notFoundContent={notFoundContentNode()}
value={queryName}
open={open}
onFocus={()=>{setOpen(true)}}
onBlur={()=>{setOpen(false)}}
style={{
width: 250,
}}
options={completeOptions}
onSelect={confirmSearchSelect}
placeholder={handlePlaceHolder()}
>
<Search
style={{ width: 250 }}
enterButton={<span className='icon iconfont'>&#xe832;</span>}
/>
</AutoComplete>
<div className="search-con">
{/* <Complete/> */}
<AutoComplete
dropdownClassName="certain-category-search-dropdown"
dropdownMatchSelectWidth={250}
allowClear
onChange={changeName}
// onSearch={(value)=>{getCompleteOptionData(value)}}
notFoundContent={notFoundContentNode()}
value={queryName}
open={open}
onFocus={() => { setOpen(true) }}
onBlur={() => { setOpen(false) }}
style={{
width: 250,
}}
options={completeOptions}
onSelect={confirmSearchSelect}
placeholder={handlePlaceHolder()}
>
<Search
style={{ width: 250 }}
enterButton={<span className='icon iconfont'>&#xe832;</span>}
/>
</AutoComplete>
</div>
{(props.treeType === 'postGrouptab' || props.treeType === 'customGroupTab') && (
<div className="operate">
{props.treeType === 'postGrouptab' &&
<Button
className="add-btn"
onClick={() => {
addPostGroup(0)
}}
>
添加岗位组
</Button>
}
{props.treeType === 'customGroupTab' &&
<Button
className="add-btn"
onClick={() => {
addCustomGroup(0)
}}
>
添加自定义分组
</Button>
}
</div>
{ (props.treeType==='postGrouptab' || props.treeType=== 'customGroupTab') && (
<div className="operate">
{props.treeType==='postGrouptab' &&
<Button
className="add-btn"
onClick={() => {
addPostGroup(0)
}}
>
添加岗位组
</Button>
}
{props.treeType==='customGroupTab' &&
<Button
className="add-btn"
onClick={() => {
addCustomGroup(0)
}}
>
添加自定义分组
</Button>
}
</div>
)}
)}
<div className="tree-con">
{!selctQueryName ?
<DirectoryTree
<DirectoryTree
defaultExpandAll
showIcon={false}
treeData={treeData}
......@@ -567,7 +584,7 @@ function LeftStructureTree(props) {
<div
className="node-title-div"
onMouseOver={(e) => {
if((props.treeType==='postGrouptab' || props.treeType=== 'customGroupTab')){
if ((props.treeType === 'postGrouptab' || props.treeType === 'customGroupTab')) {
if (nodeData.key === "null") return;
let moreDiv = e.currentTarget.getElementsByClassName(
"item-more"
......@@ -584,7 +601,7 @@ function LeftStructureTree(props) {
}
}}
onMouseOut={(e) => {
if((props.treeType==='postGrouptab' || props.treeType=== 'customGroupTab')){
if ((props.treeType === 'postGrouptab' || props.treeType === 'customGroupTab')) {
if (nodeData.key === "null") return;
let moreDiv = e.currentTarget.getElementsByClassName(
"item-more"
......@@ -602,7 +619,7 @@ function LeftStructureTree(props) {
}}
>
<div className="item-icon">
<span className="icon iconfont title-icon">&#xe604;</span>
<span className="icon iconfont title-icon">&#xe604;</span>
</div>
<div
className="item-title"
......@@ -611,18 +628,18 @@ function LeftStructureTree(props) {
leftBoxWidth <= "240px"
? "35%"
: leftBoxWidth <= "304px"
? "60%"
: "78%",
? "60%"
: "78%",
}}
>
{ props.treeType==='departMentTab'?
<span><WWOpenDataCom type="departmentName" openid={nodeData.name}/></span>
:
{props.treeType === 'departMentTab' ?
<span><WWOpenDataCom type="departmentName" openid={nodeData.name} /></span>
:
<span>{nodeData.name}</span>
}
</div>
<div className="item-count">({nodeData.departmentCount || 0})</div>
{ (props.treeType==='postGrouptab' || props.treeType=== 'customGroupTab') && (
{(props.treeType === 'postGrouptab' || props.treeType === 'customGroupTab') && (
<Dropdown overlay={moreOpenGroupOperate(nodeData)}>
<div className="item-more icon iconfont">&#xe927;</div>
</Dropdown>
......@@ -634,13 +651,13 @@ function LeftStructureTree(props) {
:
<div>
{/* { (props.treeType==='departMentTab') && */}
<div>
{ selctQueryName.type==='userName'?
<WWOpenDataCom type="userName" openid={selctQueryName.openid}/>
:
<WWOpenDataCom type="departmentName" openid={selctQueryName.openid}/>
}
</div>
<div>
{selctQueryName.type === 'userName' ?
<WWOpenDataCom type="userName" openid={selctQueryName.openid} />
:
<WWOpenDataCom type="departmentName" openid={selctQueryName.openid} />
}
</div>
{/* } */}
{/* { (props.treeType==='postGrouptab' || props.treeType=== 'customGroupTab') &&
......@@ -655,7 +672,7 @@ function LeftStructureTree(props) {
} */}
</div>
}
</div>
</div>
......
src/modules/college-manage/components/MemberTree.jsx
......@@ -64,7 +64,6 @@ function MemberTree(props) {
_selectNodes.push(item);
}
})
console.log('_selectNodes',_selectNodes);
props.onSelect(_selectNodes);
}
return (
......
src/modules/college-manage/components/MemberTree.less
......@@ -9,6 +9,9 @@
}
}
.ant-tree.ant-tree-directory .ant-tree-treenode-selected:hover::before, .ant-tree.ant-tree-directory .ant-tree-treenode-selected::before{
background: none;
background:transparent;
}
.ant-tree.ant-tree-directory .ant-tree-treenode-selected .ant-tree-switcher{
color:#000;
}
}
\ No newline at end of file
src/modules/college-manage/components/SearchUser.jsx
......@@ -64,7 +64,6 @@ function SearchUser(props) {
onFocus={(e)=>{onFocus(e)}}
onChange={(e)=>{onChange(e)}}
className="search-input-item"
// onBlur={()=>{onBlur()}}
/>
{dropDownVisible &&
<div className="drop-down">
......
src/modules/college-manage/modal/NewChooseMembersModal.less
......@@ -23,7 +23,7 @@
}
.container-left-body-table{
width: 300px;
height: 330px;
max-height: 380px;
overflow: scroll;
.ant-table {
border: none;
......
src/modules/course-manage/components/AddLiveBasic.jsx
......@@ -106,6 +106,7 @@ class AddLiveBasic extends React.Component {
<span className='label'>
<span className='require'>*</span>课程名称：
</span>
<div id="courseName" style={{display:"inline-block"}}>
<Input
className={_.find(this.props.exItems,(item)=>{return item === "courseName"})?"err":""}
value={courseName}
......@@ -116,6 +117,7 @@ class AddLiveBasic extends React.Component {
this.props.onChange('courseName', e.target.value)
}}
/>
</div>
</div>
<div className='course-cover'>
<span className='label'>封面图：</span>
......@@ -146,6 +148,7 @@ class AddLiveBasic extends React.Component {
<span className='label'>
<span className='require'>*</span>课程分类：
</span>
<div id="categoryId" style={{display:"inline-block"}}>
<CourseCatalogSelect
className={_.find(this.props.exItems,(item)=>{return item === "categoryId"})?"err":""}
value={categoryId}
......@@ -153,6 +156,7 @@ class AddLiveBasic extends React.Component {
this.handleChangeCatalogList(value, label)
}}
/>
</div>
</div>
{showSelectFileModal && (
<SelectPrepareFileModal
......
src/modules/course-manage/components/LiveCourseList.jsx
......@@ -248,7 +248,7 @@ class LiveCourseList extends React.Component {
},
{
title: '课件管理',
width: '8%',
width: '75px',
key: 'courseware',
dataIndex: 'courseware',
render: (val, item) => {
......@@ -895,7 +895,7 @@ class LiveCourseList extends React.Component {
})
return
}
if (item.startTime + 15*60*1000 < new Date().getTime()) {
if (item.startTime + 15*24*60*60*1000 < new Date().getTime()) {
Modal.warning({
title: '提示',
content: "该直播课的回放视频已失效",
......
src/modules/root/App.tsx
......@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2019-07-10 10:30:49
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-08-11 17:22:58
* @LastEditTime: 2021-08-12 15:02:50
* @Description:
*/
import React, { useContext, useEffect, useState } from 'react';
......@@ -16,11 +16,10 @@ import User from '@/common/js/user';
import BaseService from "@/domains/basic-domain/baseService";
import moment from 'moment';
import { VersionContext, VersionInfo, XMContext } from '@/store/context';
import WechatApi from '@/common/js/wechatApi';
import { setStoreGroupPermission, setStorePermission, setStoreGroupList, setStoreList, setWechatLogin } from '@/store/actions/index';
import Service from "@/common/js/service";
import Bus from '@/core/tbus';
import WechatApi from '@/common/js/wechatApi';
import { func } from 'prop-types';
const { Footer, Sider, Content } = Layout;
......@@ -40,7 +39,6 @@ const App: React.FC = (props: any) => {
useEffect(() => {
getStorePermission();
initWechatConfig();
getStoreAndUserInfo();
getVersion();
if (window.location.hash === "#/") {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment