molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/sentcms/sentcms

Browse Source 
# Conflicts:
#	public/static/admin/js/module/form.js
#	public/static/common/js/require-xlsx.js
This commit is contained in:
tensent
2020-08-15 21:48:31 +08:00
parent 55f98eed02 57eb01296c
commit 2184b686f5
11 changed files with 58 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/static/admin/js/main.js
View File

@@ -26,7 +26,7 @@ require.config({
paths: {
'sent': ['common/js/sent'],
'form': ['common/js/require-form'],
'xlsx': ['common/js/require-xlsx'],
'xlsxs': ['common/js/require-xlsx'],
'upload': 'common/js/require-upload',
'validator': 'common/js/require-validator',
'message': ['plugins/messager/messager'],
@@ -70,7 +70,7 @@ require.config({
// nanoscroller
'slimscroll': 'plugins/jquery-slimscroll/jquery.slimscroll',
'sheetjs': ['plugins/sheetjs/xlsx.full.min']
'xlsx': ['plugins/sheetjs/xlsx.full.min']
},
shim: {
'message': {deps: ['jquery', 'css!'+'plugins/messager/css/style.css']},