Skip to content

X
xiaomai-cloud-class-web
Commit f56c5b3f by wufan
Options

fix:修复复制到id传错问题

parent 3f1d8632
Showing with 62 additions and 32 deletions
src/bu-components/CopyFileModal.jsx
...@@ -87,7 +87,7 @@ class CopyFileModal extends React.Component { ...@@ -87,7 +87,7 @@ class CopyFileModal extends React.Component {
newParentId, // 新的父节点ID newParentId, // 新的父节点ID
instId, // 机构ID instId, // 机构ID
disk, // 盘符 disk, // 盘符
createId, // 创建者ID createId: User.getUserId(), // 创建者ID
} }
// 判断目标文件夹是否是其自身或者是他的子文件夹 // 判断目标文件夹是否是其自身或者是他的子文件夹
......
src/common/less/index.less
...@@ -11,3 +11,17 @@ ...@@ -11,3 +11,17 @@
padding: 16px; padding: 16px;
margin-top: 16px; margin-top: 16px;
} }
.row-dragging {
background: #fafafa;
border: 1px solid #ccc;
}
.row-dragging td {
padding: 16px;
visibility: hidden;
}
.row-dragging .drag-visible {
visibility: visible;
}
\ No newline at end of file
src/core/antd.less
...@@ -629,3 +629,17 @@ mr0 { ...@@ -629,3 +629,17 @@ mr0 {
color:#FFF !important; color:#FFF !important;
border:none !important; border:none !important;
} }
.row-dragging {
background: #fafafa;
border: 1px solid #ccc;
}
.row-dragging td {
padding: 16px;
visibility: hidden;
}
.row-dragging .drag-visible {
visibility: visible;
}
\ No newline at end of file
src/core/global.less
...@@ -1659,3 +1659,17 @@ input:focus { ...@@ -1659,3 +1659,17 @@ input:focus {
.ant-table-bordered .ant-table-content { .ant-table-bordered .ant-table-content {
border: 1px solid #e8e8e8 !important; border: 1px solid #e8e8e8 !important;
} }
.row-dragging {
background: #fafafa;
border: 1px solid #ccc;
}
.row-dragging td {
padding: 16px;
visibility: hidden;
}
.row-dragging .drag-visible {
visibility: visible;
}
src/index.tsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-04-27 20:35:34 * @Date: 2020-04-27 20:35:34
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2020-12-02 11:35:12 * @LastEditTime: 2020-12-23 15:26:04
* @Description: * @Description:
*/ */
...@@ -17,7 +17,6 @@ import { RootRouter } from './routes/index'; ...@@ -17,7 +17,6 @@ import { RootRouter } from './routes/index';
import 'antd/dist/antd.less'; import 'antd/dist/antd.less';
import '@/common/less/index.less'; import '@/common/less/index.less';
import '@/core/function'; import '@/core/function';
import '@/common/less/index.less';
const history = createHashHistory(); const history = createHashHistory();
......
src/modules/store-manage/StoreDecorationPage.less
...@@ -56,20 +56,19 @@ ...@@ -56,20 +56,19 @@
cursor: pointer; cursor: pointer;
} }
} }
.row-dragging { // .row-dragging {
background: #fafafa; // background: #fafafa;
border: 1px solid #ccc; // border: 1px solid #ccc;
} // }
.row-dragging td { // .row-dragging td {
padding: 16px; // padding: 16px;
visibility: hidden; // visibility: hidden;
} // }
.row-dragging .drag-visible { // .row-dragging .drag-visible {
visibility: visible !important; // visibility: visible;
opacity: 1 !important; // }
}
} }
.clip-box { .clip-box {
display: flex; display: flex;
......
src/modules/store-manage/StoreH5DecorationTab.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: wufan * @Author: wufan
* @Date: 2020-11-30 10:47:38 * @Date: 2020-11-30 10:47:38
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2020-12-23 13:49:18 * @LastEditTime: 2020-12-23 15:14:33
* @Description: web店铺banner页面 * @Description: web店铺banner页面
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -20,7 +20,6 @@ import { ...@@ -20,7 +20,6 @@ import {
} from "react-sortable-hoc"; } from "react-sortable-hoc";
import { MenuOutlined } from "@ant-design/icons"; import { MenuOutlined } from "@ant-design/icons";
import arrayMove from "array-move"; import arrayMove from "array-move";
import "./StoreDecorationPage.less";
import User from "@/common/js/user"; import User from "@/common/js/user";
import SelectPrepareFileModal from "@/modules/prepare-lesson/modal/SelectPrepareFileModal"; import SelectPrepareFileModal from "@/modules/prepare-lesson/modal/SelectPrepareFileModal";
import "./StoreDecorationPage.less"; import "./StoreDecorationPage.less";
......
src/modules/store-manage/StoreWebDecorationTab.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: wufan * @Author: wufan
* @Date: 2020-11-30 10:47:38 * @Date: 2020-11-30 10:47:38
* @LastEditors: wufan * @LastEditors: wufan
* @LastEditTime: 2020-12-23 13:49:59 * @LastEditTime: 2020-12-23 15:06:47
* @Description: web店铺banner页面 * @Description: web店铺banner页面
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -20,7 +20,6 @@ import { ...@@ -20,7 +20,6 @@ import {
} from "react-sortable-hoc"; } from "react-sortable-hoc";
import { MenuOutlined } from "@ant-design/icons"; import { MenuOutlined } from "@ant-design/icons";
import arrayMove from "array-move"; import arrayMove from "array-move";
import "./StoreDecorationPage.less";
import User from "@/common/js/user"; import User from "@/common/js/user";
import SelectPrepareFileModal from "@/modules/prepare-lesson/modal/SelectPrepareFileModal"; import SelectPrepareFileModal from "@/modules/prepare-lesson/modal/SelectPrepareFileModal";
import "./StoreDecorationPage.less"; import "./StoreDecorationPage.less";
...@@ -197,21 +196,11 @@ class StoreWebDecoration extends React.Component { ...@@ -197,21 +196,11 @@ class StoreWebDecoration extends React.Component {
return <SortableItem index={index} {...restProps} />; return <SortableItem index={index} {...restProps} />;
}; };
// 选择暖场资源 // 选择云盘资源
handleSelectVideo = (file) => { handleSelectImg = (file) => {
this.setState({ this.setState({
showSelectFileModal: false, showSelectFileModal: false,
}); });
const { ossUrl, resourceId, folderName, folderFormat, folderSize } = file;
const liveCourseWarmMedia = {
contentType: "WARMUP",
mediaType: folderFormat === "MP4" ? "VIDEO" : "PICTURE",
mediaContent: resourceId,
mediaUrl: ossUrl,
mediaName: folderName,
size: folderSize,
};
console.log("file", file);
this.uploadImage(file); this.uploadImage(file);
}; };
...@@ -395,7 +384,7 @@ class StoreWebDecoration extends React.Component { ...@@ -395,7 +384,7 @@ class StoreWebDecoration extends React.Component {
onClose={() => { onClose={() => {
this.setState({ showSelectFileModal: false }); this.setState({ showSelectFileModal: false });
}} }}
onSelect={this.handleSelectVideo} onSelect={this.handleSelectImg}
/> />
<Modal <Modal
title="设置图片" title="设置图片"
......
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