合并

public/react/src/common/educoder.js

@@ -8,8 +8,8 @@ export { default as setmiyah } from './Component';
 export { default as queryString } from './UrlTool2';
 
 export {
-	getImageUrl as getImageUrl, getUrl as getUrl, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
+	getImageUrl as getImageUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
-	, getupload_git_file as getupload_git_file, getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
+	, getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
 	, getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode
 } from './UrlTool';
 export { default as queryString } from './UrlTool2';
@@ -19,7 +19,10 @@ export {
 	, broadcastChannelPostMessage, broadcastChannelOnmessage
 } from './EventUtil';
 
-export { updatePageParams as updatePageParams } from './RouterUtil';
+export {
+	trigger as trigger, on as on, off as off
+	, broadcastChannelPostMessage, broadcastChannelOnmessage
+} from './EventUtil';
 
 export { bytesToSize as bytesToSize } from './UnitUtil';
 
@@ -29,7 +32,11 @@ export {
 } from './TextUtil'
 export { handleDateString, getNextHalfHourOfMoment, formatDuring } from './DateUtil'
 
-export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from './util/ShareUtil'
+export {
+	markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
+	downloadFile, sortDirections
+} from './TextUtil'
+export { handleDateString, getNextHalfHourOfMoment, formatDuring } from './DateUtil'
 
 export { isDev as isDev, isMobile } from './Env'
 
@@ -37,6 +44,8 @@ export { toStore as toStore, fromStore as fromStore } from './Store'
 
 export { trace_collapse, trace, debug, info, warn, error, trace_c, debug_c, info_c, warn_c, error_c } from './LogUtil'
 
+export { trace_collapse, trace, debug, info, warn, error, trace_c, debug_c, info_c, warn_c, error_c } from './LogUtil'
+
 export {
 	EDU_ADMIN, EDU_BUSINESS, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
 	, EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL