fix:解决合并代码的冲突

6d490341 · yuananting · 402be304 · 1d5170d0 · 6d490341 · 6d490341
Commit 6d490341 authored Aug 17, 2021 by yuananting
9 changed files
--- a/src/common/js/user.ts
+++ b/src/common/js/user.ts
 /*
 * @Author: 吴文洁
 * @Date: 2020-08-31 09:34:25
- * @LastEditors: Please set LastEditors
+ * @LastEditors: yuananting
- * @LastEditTime: 2021-07-20 17:41:20
+ * @LastEditTime: 2021-08-17 19:20:33
 * @Description:
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
 import Storage from './storage';
 import { PREFIX, USER_PREFIX } from '@/domains/basic-domain/constants';
-declare var window:any;
+declare var window: any;
 class User {
  getExpirationTime() {
-    return Storage.get(`${PREFIX}_expiration_time`)
+    return Storage.get(`${PREFIX}_expiration_time`);
  }
  getVersion() {
-    return Storage.getObj(`${PREFIX}_version`)
+    return Storage.getObj(`${PREFIX}_version`);
  }
-  getStoreId(){
+  getStoreId() {
-    return  window.currentStoreUserInfo.storeId || Storage.get(`${PREFIX}_storeId`)
+    return window.currentStoreUserInfo.storeId || Storage.get(`${PREFIX}_storeId`);
  }
  getEnterpriseId() {
@@ -40,6 +39,10 @@ class User {
    return window.currentStoreUserInfo.storeUserId || Storage.get(`${PREFIX}_storeUserId`);
  }
+  getStoreUserName() {
+    return Storage.get(`${PREFIX}_storeUserName`);
+  }
  getCustomerId() {
    return Storage.get(`${PREFIX}_customerId`);
  }
@@ -48,7 +51,7 @@ class User {
    return window.currentStoreUserInfo.userId || Storage.get(`${PREFIX}_userId`);
  }
-  getAvatar(){
+  getAvatar() {
    return Storage.get(`${PREFIX}_avatar`);
  }
@@ -64,16 +67,16 @@ class User {
    return Storage.get(`${PREFIX}_isAdmin`);
  }
-  setExpirationTime(value:number) {
+  setExpirationTime(value: number) {
-    return Storage.set(`${PREFIX}_expiration_time`,value)
+    return Storage.set(`${PREFIX}_expiration_time`, value);
  }
-  setVersion(value:any) {
+  setVersion(value: any) {
-    return Storage.setObj(`${PREFIX}_version`,value)
+    return Storage.setObj(`${PREFIX}_version`, value);
  }
-  setStoreId(value:any){
+  setStoreId(value: any) {
-    return Storage.set(`${PREFIX}_storeId`,value)
+    return Storage.set(`${PREFIX}_storeId`, value);
  }
  setEnterpriseId(value: any) {
@@ -92,6 +95,10 @@ class User {
    return Storage.set(`${PREFIX}_storeUserId`, value);
  }
+  setStoreUserName(value: any) {
+    return Storage.set(`${PREFIX}_storeUserName`, value);
+  }
  setCustomerId(value: any) {
    return Storage.set(`${PREFIX}_customerId`, value);
  }

--- a/src/modules/root/Header.jsx
+++ b/src/modules/root/Header.jsx
 /*
 * @Author: 吴文洁
 * @Date: 2019-09-10 18:26:03
- * @LastEditors: Please set LastEditors
+ * @LastEditors: yuananting
- * @LastEditTime: 2021-08-11 20:26:53
+ * @LastEditTime: 2021-08-17 19:19:42
 * @Description:
 */
 import React, { useRef, useContext, useEffect, useState } from 'react';
@@ -53,12 +53,12 @@ function Header(props) {
      setStoreName(value);
    });
    getStoreList();
-  }, []);
+  }, [getStoreList, handleConvertShortUrl, htmlUrl]);
  useEffect(() => {
    storeUserId && getUserInfo();
    enterpriseId ? getEnterpriseUser() : User.setIsAdmin(false);
-  }, [storeUserId]);
+  }, [enterpriseId, getEnterpriseUser, storeUserId]);
  useEffect(() => {
    if (!messageHelpRef.current) {
@@ -81,6 +81,7 @@ function Header(props) {
      setPhone(phone);
      setAvatar(res.result.avatar);
      User.setAvatar(res.result.avatar);
+      User.setStoreUserName(weChatAccount);
    });
  }

--- a/src/modules/task-center/train-task/AddTrainTask.jsx
+++ b/src/modules/task-center/train-task/AddTrainTask.jsx
@@ -2,7 +2,7 @@
 * @Author: yuananting
 * @Date: 2021-07-29 13:57:03
 * @LastEditors: yuananting
- * @LastEditTime: 2021-08-17 18:21:35
+ * @LastEditTime: 2021-08-17 19:14:55
 * @Description: 任务中心-培训任务-新建页面
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
@@ -23,17 +23,23 @@ import Bus from '@/core/bus';
 import $ from 'jquery';
 function AddTrainTask() {
-  const type = getParameterByName('type');
+  const type = window.getParameterByName('type');
-  const taskId = getParameterByName('taskId');
+  const taskId = window.getParameterByName('taskId');
-  const taskState = getParameterByName('taskState');
+  const taskState = window.getParameterByName('taskState');
  const defaultCover = 'https://image.xiaomaiketang.com/xm/rEAetaTEh3.png';
  const DEFAULT_BASIC_INFO = {
+    createId: User.getStoreUserId(),
    taskName: '', // 培训任务名称
    coverUrl: defaultCover,
    coverId: null,
-    helpStoreUserIds: [], // 指定协同者id
+    helpStoreUserIds: [
+      {
+        checkedId: User.getStoreUserId(),
+        checkedName: User.getStoreUserName()
+      },
+    ], // 指定协同者id
    timeType: 'FOREVER', // 培训时间，默认永久有效
    startTime: null, // 固定时间段-开始时间
    endTime: null, // 固定时间段-结束时间
@@ -199,7 +205,7 @@ function AddTrainTask() {
  // 确认保存新建
  function submitRemote(introduceId, issue) {
-    const { assignList, endTime, helpStoreUserIds, learnType, startTime, taskName, timeType, coverId } = basicInfo;
+    const { createId, assignList, endTime, helpStoreUserIds, learnType, startTime, taskName, timeType, coverId } = basicInfo;
    let _scheduleMediaRequests = [];
@@ -241,7 +247,7 @@ function AddTrainTask() {
    const commonParams = {
      assignList: _assignList,
-      createId: User.getStoreUserId(),
+      createId,
      endTime,
      helpStoreUserIds: _helpStoreUserIds, // 协同者集合
      issueState: issue, // 是否发布

--- a/src/modules/task-center/train-task/components/BasicInfo.jsx
+++ b/src/modules/task-center/train-task/components/BasicInfo.jsx
@@ -24,9 +24,9 @@ const { RangePicker } = DatePicker;
 const FormItem = Form.Item;
 function BasicInfo(props) {
-  const taskState = getParameterByName('taskState');
+  const taskState = window.getParameterByName('taskState');
-  const type = getParameterByName('type');
+  const type = window.getParameterByName('type');
-  const originTimeType = getParameterByName('timeType');
+  const originTimeType = window.getParameterByName('timeType');
  const { basicInfo, startCheck } = props;
  const { createId, taskName, coverUrl, helpStoreUserIds, timeType, startTime, endTime, learnType, assignList, introduce, loadintroduce } = basicInfo;

--- a/src/modules/task-center/train-task/components/BasicInfo.less
+++ b/src/modules/task-center/train-task/components/BasicInfo.less
@@ -86,6 +86,11 @@
      font-size: 14px;
      color: #cccccc;
    }
+    .disabled {
+      color: #ccc !important;
+      cursor: not-allowed !important;
+      pointer-events: none !important;
+    }
  }
  .learning-model-tips {

--- a/src/modules/task-center/train-task/modal/ChooseAssignorModal.jsx
+++ b/src/modules/task-center/train-task/modal/ChooseAssignorModal.jsx
@@ -16,6 +16,7 @@ import WWOpenDataCom from '@/components/WWOpenDataCom';
 import _ from 'underscore';
 import './ChooseAssignorModal.less';
 import $ from 'jquery';
+import LottieIcon from '@/components/LottieIcon';
 const { TabPane } = Tabs;
 const { DirectoryTree } = Tree;
@@ -412,6 +413,8 @@ function ChooseAssignorModal(props) {
              <TabPane key='customGroupTab' tab='自定义分组'></TabPane>
            </Tabs>
            <div className='tree-con'>
+              <Choose>
+                <When condition={structureData.length > 0}>
                  <DirectoryTree
                    defaultExpandAll
                    checkable
@@ -442,6 +445,11 @@ function ChooseAssignorModal(props) {
                      );
                    }}
                  />
+                </When>
+                <Otherwise>
+                  <LottieIcon title='搜索无结果' type='search' size={150} />
+                </Otherwise>
+              </Choose>
            </div>
          </div>
        </div>
@@ -453,6 +461,8 @@ function ChooseAssignorModal(props) {
            </span>
          </div>
          <div className='data-body'>
+            <Choose>
+              <When condition={checkedAssignorList.length > 0}>
                {checkedAssignorList.map((item, index) => {
                  return (
                    <div className='selected-item'>
@@ -483,6 +493,12 @@ function ChooseAssignorModal(props) {
                    </div>
                  );
                })}
+              </When>
+              <Otherwise>
+                <LottieIcon title='暂无数据' type='college' size={150} />
+              </Otherwise>
+            </Choose>
          </div>
        </div>
      </div>

--- a/src/modules/task-center/train-task/modal/ChooseAssignorModal.less
+++ b/src/modules/task-center/train-task/modal/ChooseAssignorModal.less
@@ -78,6 +78,12 @@
            font-size: 14px !important;
          }
        }
+        .lottie-icon {
+          margin-top: 64px;
+          .lottie-icon__title {
+            color: #666666;
+          }
+        }
        .tree-con {
          overflow-y: scroll;
          overflow-x: hidden;
@@ -137,6 +143,12 @@
        overflow-y: scroll;
        overflow-x: hidden;
        max-height: 370px;
+        .lottie-icon {
+          margin-top: 76px;
+          .lottie-icon__title {
+            color: #666666;
+          }
+        }
        .selected-item {
          padding: 12px 12px 12px 16px;
          display: flex;

--- a/src/modules/task-center/train-task/modal/ChooseCollaboratorModal.jsx
+++ b/src/modules/task-center/train-task/modal/ChooseCollaboratorModal.jsx
@@ -2,7 +2,7 @@
 * @Author: yuananting
 * @Date: 2021-08-12 16:27:38
 * @LastEditors: yuananting
- * @LastEditTime: 2021-08-13 19:39:34
+ * @LastEditTime: 2021-08-17 19:10:02
 * @Description: 新建培训任务-选择协同人员
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
@@ -10,14 +10,10 @@
 import React, { useState, useEffect } from 'react';
 import { Modal, Input, Tooltip, List, Checkbox } from 'antd';
-import { XMTable } from '@/components';
-import college from '@/common/lottie/college.json';
-import Service from '@/common/js/service';
-import User from '@/common/js/user';
 import StoreService from '@/domains/store-domain/storeService';
-import search from '@/common/lottie/search';
 import './ChooseCollaboratorModal.less';
 import WWOpenDataCom from '@/components/WWOpenDataCom';
+import LottieIcon from '@/components/LottieIcon';
 import _ from 'underscore';
@@ -186,6 +182,8 @@ function ChooseCollaboratorModal(props) {
            enterButton={<span className='icon iconfont'>&#xe832;</span>}
          />
          <div className='data-body'>
+            <Choose>
+              <When condition={employeeList.length > 0}>
                <List
                  header={
                    <Checkbox checked={allChecked} onChange={handleCheckedAll}>
@@ -216,6 +214,11 @@ function ChooseCollaboratorModal(props) {
                    </List.Item>
                  )}
                />
+              </When>
+              <Otherwise>
+                <LottieIcon title='搜索无结果' type='search' size={150} />
+              </Otherwise>
+            </Choose>
          </div>
        </div>
        <div className='right-list'>

--- a/src/modules/task-center/train-task/modal/ChooseCollaboratorModal.less
+++ b/src/modules/task-center/train-task/modal/ChooseCollaboratorModal.less
@@ -12,6 +12,12 @@
        overflow-x: hidden;
        max-height: 370px;
        padding-right: 16px;
+        .lottie-icon {
+          margin-top: 76px;
+          .lottie-icon__title {
+            color: #666666;
+          }
+        }
        .ant-list {
          .ant-list-item:hover {
            background-color: #f3f6fa;