Skip to content

Commit c9d1753

Browse files
modstartmodstart
committed
新增：富文本支持文档一键导入，支持Word文档（docx）、Markdown文档（md）
1 parent e72c664 commit c9d1753

File tree

28 files changed

+558
-58
lines changed

28 files changed

+558
-58
lines changed

‎module/Member/Admin/Controller/MemberMoneyLogController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ protected function crud(AdminCRUDBuilder $builder)
4040
})
4141
->gridFilter(function (GridFilter $filter) {
4242
$filter->eq('memberUserId', '用户ID');
43+
$filter->range('created_at', '创建时间');
4344
})
4445
->title('用户钱包流水')->canAdd(false)->canEdit(false)->canDelete(false);
4546
}

‎public/asset/common/editor.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/asset/theme/default/style.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/asset/vendor/ueditor/dialogs/contentimport/contentimport.html‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
<!DOCTYPE html>
2+
<head>
3+
<title></title>
4+
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
5+
<script type="text/javascript" src="../internal.js?aea0c61c"></script>
6+
<style type="text/css">
7+
.wrapper {
8+
width: 600px;
9+
padding: 10px;
10+
height: 352px;
11+
overflow: hidden;
12+
position: relative;
13+
border-bottom: 1px solid #d7d7d7;
14+
}
15+
16+
.wrapper .file-upload {
17+
display: flex;
18+
align-items: center;
19+
}
20+
21+
.wrapper .file-upload .file-tip {
22+
color: #999;
23+
font-size: 12px;
24+
padding-left: 10px;
25+
flex-grow: 1;
26+
}
27+
28+
.wrapper .file-manual {
29+
background: #EEE;
30+
padding: 10px;
31+
border-radius: 5px;
32+
margin-top: 10px;
33+
line-height: 2;
34+
}
35+
36+
.wrapper .file-manual .title {
37+
font-weight: bold;
38+
font-size: 120%;
39+
}
40+
41+
.wrapper .file-manual .body {
42+
}
43+
44+
.wrapper .file-manual .body li {
45+
list-style: disc;
46+
margin-left: 20px;
47+
}
48+
49+
.wrapper .upload-button {
50+
width: 100px;
51+
height: 30px;
52+
background-color: #F8F8F8;
53+
border: 1px solid #EEE;
54+
border-radius: 4px;
55+
text-align: center;
56+
line-height: 28px;
57+
cursor: pointer;
58+
position: relative;
59+
flex-shrink: 0;
60+
}
61+
62+
.wrapper .upload-button .text {
63+
display: inline-block;
64+
vertical-align: middle;
65+
}
66+
67+
.wrapper .upload-button input {
68+
position: absolute;
69+
left: 0;
70+
top: 0;
71+
opacity: 0;
72+
cursor: pointer;
73+
height: 100%;
74+
width: 100%;
75+
}
76+
77+
.wrapper .file-result {
78+
border: 1px solid #333;
79+
padding: 10px;
80+
border-radius: 5px;
81+
position: absolute;
82+
left: 10px;
83+
right: 10px;
84+
top: 50px;
85+
background: #FFF;
86+
bottom: 10px;
87+
overflow: auto;
88+
display: none;
89+
}
90+
</style>
91+
</head>
92+
<body>
93+
<div class="wrapper">
94+
<div class="file-upload">
95+
<div class="upload-button">
96+
<div class="text">选择本地文件</div>
97+
<input type="file" id="contentImport"/>
98+
</div>
99+
<div class="file-tip"></div>
100+
</div>
101+
<div class="file-manual">
102+
<div class="title">
103+
支持文档格式
104+
</div>
105+
<div class="body">
106+
<ul>
107+
<li><b>Word</b>：docx</li>
108+
<li><b>Markdown</b>：md</li>
109+
</ul>
110+
</div>
111+
</div>
112+
<div class="file-result"></div>
113+
</div>
114+
<script src="../../third-party/jquery-1.10.2.js?628072e7"></script>
115+
<script src="https://cdn.bootcdn.net/ajax/libs/mammoth/1.6.0/mammoth.browser.min.js"></script>
116+
<script src="https://cdn.bootcdn.net/ajax/libs/showdown/2.1.0/showdown.min.js"></script>
117+
<script type="text/javascript" src="contentimport.js?50c896a4"></script>
118+
<script type="text/javascript">
119+
utils.domReady(function () {
120+
var options = {};
121+
var callbacks = {};
122+
contentImport.init(options, callbacks);
123+
});
124+
</script>
125+
</body>
126+
</html>

‎public/asset/vendor/ueditor/dialogs/contentimport/contentimport.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/asset/vendor/ueditor/lang/en/en.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/asset/vendor/ueditor/lang/zh-cn/zh-cn.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/asset/vendor/ueditor/themes/default/css/ueditor.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/asset/vendor/ueditor/ueditor.all.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/asset/vendor/ueditor/ueditor.config.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)