Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xiaomai-cloud-class-web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiaomai-cloud-class
xiaomai-cloud-class-web
Commits
f56c5b3f
Commit
f56c5b3f
authored
Dec 23, 2020
by
wufan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修复复制到id传错问题
parent
3f1d8632
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
64 additions
and
34 deletions
+64
-34
src/bu-components/CopyFileModal.jsx
+1
-1
src/common/less/index.less
+15
-0
src/core/antd.less
+15
-0
src/core/global.less
+14
-0
src/index.tsx
+1
-2
src/modules/store-manage/StoreDecorationPage.less
+13
-14
src/modules/store-manage/StoreH5DecorationTab.jsx
+1
-2
src/modules/store-manage/StoreWebDecorationTab.jsx
+4
-15
No files found.
src/bu-components/CopyFileModal.jsx
View file @
f56c5b3f
...
...
@@ -87,7 +87,7 @@ class CopyFileModal extends React.Component {
newParentId
,
// 新的父节点ID
instId
,
// 机构ID
disk
,
// 盘符
createId
,
// 创建者ID
createId
:
User
.
getUserId
()
,
// 创建者ID
}
// 判断目标文件夹是否是其自身或者是他的子文件夹
...
...
src/common/less/index.less
View file @
f56c5b3f
...
...
@@ -10,4 +10,18 @@
background: #fff;
padding: 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
View file @
f56c5b3f
...
...
@@ -628,4 +628,18 @@ mr0 {
background:#FF4F4F !important;
color:#FFF !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
View file @
f56c5b3f
...
...
@@ -1659,3 +1659,17 @@ input:focus {
.ant-table-bordered .ant-table-content {
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
View file @
f56c5b3f
...
...
@@ -2,7 +2,7 @@
* @Author: 吴文洁
* @Date: 2020-04-27 20:35:34
* @LastEditors: wufan
* @LastEditTime: 2020-12-
02 11:35:12
* @LastEditTime: 2020-12-
23 15:26:04
* @Description:
*/
...
...
@@ -17,7 +17,6 @@ import { RootRouter } from './routes/index';
import
'antd/dist/antd.less'
;
import
'@/common/less/index.less'
;
import
'@/core/function'
;
import
'@/common/less/index.less'
;
const
history
=
createHashHistory
();
...
...
src/modules/store-manage/StoreDecorationPage.less
View file @
f56c5b3f
...
...
@@ -56,20 +56,19 @@
cursor: pointer;
}
}
.row-dragging {
background: #fafafa;
border: 1px solid #ccc;
}
.row-dragging td {
padding: 16px;
visibility: hidden;
}
.row-dragging .drag-visible {
visibility: visible !important;
opacity: 1 !important;
}
// .row-dragging {
// background: #fafafa;
// border: 1px solid #ccc;
// }
// .row-dragging td {
// padding: 16px;
// visibility: hidden;
// }
// .row-dragging .drag-visible {
// visibility: visible;
// }
}
.clip-box {
display: flex;
...
...
src/modules/store-manage/StoreH5DecorationTab.jsx
View file @
f56c5b3f
...
...
@@ -2,7 +2,7 @@
* @Author: wufan
* @Date: 2020-11-30 10:47:38
* @LastEditors: wufan
* @LastEditTime: 2020-12-23 1
3:49:18
* @LastEditTime: 2020-12-23 1
5:14:33
* @Description: web店铺banner页面
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
...
...
@@ -20,7 +20,6 @@ import {
}
from
"react-sortable-hoc"
;
import
{
MenuOutlined
}
from
"@ant-design/icons"
;
import
arrayMove
from
"array-move"
;
import
"./StoreDecorationPage.less"
;
import
User
from
"@/common/js/user"
;
import
SelectPrepareFileModal
from
"@/modules/prepare-lesson/modal/SelectPrepareFileModal"
;
import
"./StoreDecorationPage.less"
;
...
...
src/modules/store-manage/StoreWebDecorationTab.jsx
View file @
f56c5b3f
...
...
@@ -2,7 +2,7 @@
* @Author: wufan
* @Date: 2020-11-30 10:47:38
* @LastEditors: wufan
* @LastEditTime: 2020-12-23 1
3:49:59
* @LastEditTime: 2020-12-23 1
5:06:47
* @Description: web店铺banner页面
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
...
...
@@ -20,7 +20,6 @@ import {
}
from
"react-sortable-hoc"
;
import
{
MenuOutlined
}
from
"@ant-design/icons"
;
import
arrayMove
from
"array-move"
;
import
"./StoreDecorationPage.less"
;
import
User
from
"@/common/js/user"
;
import
SelectPrepareFileModal
from
"@/modules/prepare-lesson/modal/SelectPrepareFileModal"
;
import
"./StoreDecorationPage.less"
;
...
...
@@ -197,21 +196,11 @@ class StoreWebDecoration extends React.Component {
return
<
SortableItem
index=
{
index
}
{
...
restProps
}
/>;
};
// 选择
暖场
资源
handleSelect
Video
=
(
file
)
=>
{
// 选择
云盘
资源
handleSelect
Img
=
(
file
)
=>
{
this
.
setState
({
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
);
};
...
...
@@ -395,7 +384,7 @@ class StoreWebDecoration extends React.Component {
onClose=
{
()
=>
{
this
.
setState
({
showSelectFileModal
:
false
});
}
}
onSelect=
{
this
.
handleSelect
Video
}
onSelect=
{
this
.
handleSelect
Img
}
/>
<
Modal
title=
"设置图片"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment