fix:修复

9ea8aafb · chenshu · 8a855681 · 9ea8aafb · 9ea8aafb · 9ea8aafb
Commit 9ea8aafb authored May 24, 2021 by chenshu
Hide whitespace changes
Inline Side-by-side

Showing with 173 additions and 16 deletions

package.json
+1 -0

src/core/function.js
+1 -8

src/index.html
+155 -0

src/modules/course-manage/offline-course/AddOfflineCourse.jsx
+16 -8

No files found.
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
    "dom-to-image": "^2.6.0",
    "dotenv": "8.2.0",
    "dotenv-expand": "5.1.0",
+    "download": "^8.0.0",
    "eslint": "^6.6.0",
    "eslint-config-react-app": "^5.2.1",
    "eslint-loader": "3.0.3",

--- a/src/core/function.js
+++ b/src/core/function.js
@@ -959,17 +959,10 @@ window.copyText = textContent => {
 }
 window.downloadFile = (dataURL, fileName) => {
-  const eleDom = document.createElement('a')
  const blob = window.convertBase64ToBlob(dataURL)
  const href = window.getObjectURL(blob)
-  $(eleDom)
+  window.download(href, fileName);
-    .attr({
-      href,
-      download: fileName
-    })
-    .get(0)
-    .click()
 }
 window.getCouponRule = record => {

--- a/src/index.html
+++ b/src/index.html
@@ -55,5 +55,160 @@
      To begin the development, run `npm start` or `yarn start`.
      To create a production bundle, use `npm run build` or `yarn build`.
    -->
+    <script>
+      (function (root, factory) {
+        if (typeof define === 'function' && define.amd) {
+          // AMD. Register as an anonymous module.
+          define([], factory);
+        } else if (typeof exports === 'object') {
+          // Node. Does not work with strict CommonJS, but
+          // only CommonJS-like environments that support module.exports,
+          // like Node.
+          module.exports = factory();
+        } else {
+          // Browser globals (root is window)
+          root.download = factory();
+        }
+      }(this, function () {
+        return function download(data, strFileName, strMimeType) {
+          var self = window, // this script is only for browsers anyway...
+            defaultMime = "application/octet-stream", // this default mime also triggers iframe downloads
+            mimeType = strMimeType || defaultMime,
+            payload = data,
+            url = !strFileName && !strMimeType && payload,
+            anchor = document.createElement("a"),
+            toString = function(a){return String(a);},
+            myBlob = (self.Blob || self.MozBlob || self.WebKitBlob || toString),
+            fileName = strFileName || "download",
+            blob,
+            reader;
+            myBlob= myBlob.call ? myBlob.bind(self) : Blob ;
+          if(String(this)==="true"){ //reverse arguments, allowing download.bind(true, "text/xml", "export.xml") to act as a callback
+            payload=[payload, mimeType];
+            mimeType=payload[0];
+            payload=payload[1];
+          }
+          if(url && url.length< 2048){ // if no filename and no mime, assume a url was passed as the only argument
+            fileName = url.split("/").pop().split("?")[0];
+            anchor.href = url; // assign href prop to temp anchor
+              if(anchor.href.indexOf(url) !== -1){ // if the browser determines that it's a potentially valid url path:
+                  var ajax=new XMLHttpRequest();
+                  ajax.open( "GET", url, true);
+                  ajax.responseType = 'blob';
+                  ajax.onload= function(e){ 
+                download(e.target.response, fileName, defaultMime);
+              };
+                  setTimeout(function(){ ajax.send();}, 0); // allows setting custom ajax headers using the return:
+                return ajax;
+            } // end if valid url?
+          } // end if url?
+          //go ahead and download dataURLs right away
+          if(/^data\:[\w+\-]+\/[\w+\-]+[,;]/.test(payload)){
+            if(payload.length > (1024*1024*1.999) && myBlob !== toString ){
+              payload=dataUrlToBlob(payload);
+              mimeType=payload.type || defaultMime;
+            }else{			
+              return navigator.msSaveBlob ?  // IE10 can't do a[download], only Blobs:
+                navigator.msSaveBlob(dataUrlToBlob(payload), fileName) :
+                saver(payload) ; // everyone else can save dataURLs un-processed
+            }
+          }//end if dataURL passed?
+          blob = payload instanceof myBlob ?
+            payload :
+            new myBlob([payload], {type: mimeType}) ;
+          function dataUrlToBlob(strUrl) {
+            var parts= strUrl.split(/[:;,]/),
+            type= parts[1],
+            decoder= parts[2] == "base64" ? atob : decodeURIComponent,
+            binData= decoder( parts.pop() ),
+            mx= binData.length,
+            i= 0,
+            uiArr= new Uint8Array(mx);
+            for(i;i<mx;++i) uiArr[i]= binData.charCodeAt(i);
+            return new myBlob([uiArr], {type: type});
+          }
+          function saver(url, winMode){
+            if ('download' in anchor) { //html5 A[download]
+              anchor.href = url;
+              anchor.setAttribute("download", fileName);
+              anchor.className = "download-js-link";
+              anchor.innerHTML = "downloading...";
+              anchor.style.display = "none";
+              document.body.appendChild(anchor);
+              setTimeout(function() {
+                anchor.click();
+                document.body.removeChild(anchor);
+                if(winMode===true){setTimeout(function(){ self.URL.revokeObjectURL(anchor.href);}, 250 );}
+              }, 66);
+              return true;
+            }
+            // handle non-a[download] safari as best we can:
+            if(/(Version)\/(\d+)\.(\d+)(?:\.(\d+))?.*Safari\//.test(navigator.userAgent)) {
+              url=url.replace(/^data:([\w\/\-\+]+)/, defaultMime);
+              if(!window.open(url)){ // popup blocked, offer direct download:
+                if(confirm("Displaying New Document\n\nUse Save As... to download, then click back to return to this page.")){ location.href=url; }
+              }
+              return true;
+            }
+            //do iframe dataURL download (old ch+FF):
+            var f = document.createElement("iframe");
+            document.body.appendChild(f);
+            if(!winMode){ // force a mime that will download:
+              url="data:"+url.replace(/^data:([\w\/\-\+]+)/, defaultMime);
+            }
+            f.src=url;
+            setTimeout(function(){ document.body.removeChild(f); }, 333);
+          }//end saver
+          if (navigator.msSaveBlob) { // IE10+ : (has Blob, but not a[download] or URL)
+            return navigator.msSaveBlob(blob, fileName);
+          }
+          if(self.URL){ // simple fast and modern way using Blob and URL:
+            saver(self.URL.createObjectURL(blob), true);
+          }else{
+            // handle non-Blob()+non-URL browsers:
+            if(typeof blob === "string" || blob.constructor===toString ){
+              try{
+                return saver( "data:" +  mimeType   + ";base64,"  +  self.btoa(blob)  );
+              }catch(y){
+                return saver( "data:" +  mimeType   + "," + encodeURIComponent(blob)  );
+              }
+            }
+            // Blob but not URL support:
+            reader=new FileReader();
+            reader.onload=function(e){
+              saver(this.result);
+            };
+            reader.readAsDataURL(blob);
+          }
+          return true;
+        }; /* end download() */
+      }))
+    </script>
  </body>
 </html>
--- a/src/modules/course-manage/offline-course/AddOfflineCourse.jsx
+++ b/src/modules/course-manage/offline-course/AddOfflineCourse.jsx
@@ -148,6 +148,15 @@ class AddOfflineCourse extends React.Component {
    return newTreeData;
  };
+  checkDetail = (courseId) => {
+    return Service.Hades('public/hades/getOfflineCourseDetail', {
+      courseId
+    }).then((res) => {
+      const { courseState } = res.result;
+      return courseState === 'UN_START';
+    });
+  }
  // 获取线下课详情
  handleFetchScheudleDetail = (courseId) => {
    return Service.Hades('public/hades/getOfflineCourseDetail',{
@@ -238,7 +247,6 @@ class AddOfflineCourse extends React.Component {
        signOutType,
        isEditDisablie: whetherHaveApply === 'YES',
      });
-      return courseState === 'UN_START';
    })
  }
@@ -457,7 +465,7 @@ class AddOfflineCourse extends React.Component {
  preSubmit = () => {
    const { courseId } = this.state;
-    courseId ? this.handleFetchScheudleDetail(courseId).then(bool => bool && this.handleSubmit()) : this.handleSubmit();
+    courseId ? this.checkDetail(courseId).then(bool => bool && this.handleSubmit()) : this.handleSubmit();
  }
  // 保存
@@ -607,13 +615,13 @@ class AddOfflineCourse extends React.Component {
      } else if(moment(moment(data.calendarTime[0]).format('YYYY-MM-DD') + moment(data.startTime).format(' HH:mm')).valueOf() < Date.now()){
        message.warning('上课时间不能早于现在');
        resolve(false);
-      } else if(data.startTime > data.endTime){
+      } else if(data.startTime >= data.endTime){
        message.warning('上课结束时间不能早于上课开始时间');
        resolve(false);
      } else if(data.whetherSetApply === 'YES' && !data.startTimeApply){
        message.warning('请选择报名时间');
        resolve(false);
-      } else if(data.whetherSetApply === 'YES' && data.startTimeApply > data.endTimeApply){
+      } else if(data.whetherSetApply === 'YES' && data.startTimeApply >= data.endTimeApply){
        message.warning('报名结束时间需大于报名开始时间');
        resolve(false);
      } else if(data.whetherSetApply === 'YES' && data.endTimeApply > moment(moment(data.calendarTime[0]).format('YYYY-MM-DD') + moment(data.endTime).format(' HH:mm')).valueOf()){
@@ -1026,10 +1034,9 @@ class AddOfflineCourse extends React.Component {
                      value={startTimeApply ? [moment(startTimeApply), moment(endTimeApply)] : null }
                      format={"YYYY-MM-DD HH:mm"}
                      onChange={(dates) => { this.handleChangeDates(dates) }}
-                      style={{ width: "calc(100% - 70px)" }}
                      renderExtraFooter={() => calendarTime[0] ? <div style={{ position: 'absolute', bottom: 8, cursor: 'pointer' }}>
                        <span
-                          onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(1, 'days').valueOf(), endTimeApply: `${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}` })}
+                          onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(1, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() })}
                          style={{
                            color: '#FFB714', 
                            border: '1px solid #FFB714', 
@@ -1039,7 +1046,7 @@ class AddOfflineCourse extends React.Component {
                          }}
                        >上课前1天</span>
                        <span
-                          onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(2, 'days').valueOf(), endTimeApply: `${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}` })}
+                          onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(2, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() })}
                          style={{
                            color: '#FFB714', 
                            border: '1px solid #FFB714', 
@@ -1049,7 +1056,7 @@ class AddOfflineCourse extends React.Component {
                          }}
                        >上课前2天</span>
                        <span
-                          onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(3, 'days').valueOf(), endTimeApply: `${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}` })}
+                          onClick={() => this.setState({ startTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).subtract(3, 'days').valueOf(), endTimeApply: moment(`${moment(calendarTime[0]).format('YYYY-MM-DD')} ${moment(startTime).format('HH:mm')}`).valueOf() })}
                          style={{
                            color: '#FFB714', 
                            border: '1px solid #FFB714', 
@@ -1072,6 +1079,7 @@ class AddOfflineCourse extends React.Component {
                    <InputNumber
                      value={quota}
                      min={oldQuta || 1}
+                      max={100000}
                      precision={0}
                      style={{ margin: '0 4px', width: 90 }}
                      disabled={oldQuta < 0}