rebuild: flatpickr and dayjs

gulpfile.js

@@ -83,17 +83,14 @@ const paths = {
     css:['src/css/*.css','node_modules/flatpickr/dist/themes/light.css'],
     pluginsJs:[
         'node_modules/jquery/dist/jquery.min.js',
-        //'src/plugins/js/jquery.min.js',
         'src/plugins/js/clipboard.min.js',
         'src/plugins/js/spectrum.min.js',
         'src/plugins/js/jquery-ui.min.js',
         'src/plugins/js/jquery.mousewheel.min.js',
         'src/plugins/js/numeral.min.js',
         'src/plugins/js/html2canvas.min.js',
-        'src/plugins/js/pako.min.js',
         'src/plugins/js/localforage.min.js',
         'src/plugins/js/lodash.min.js',
-        'src/plugins/js/daterangepicker.js',
         'src/plugins/js/jstat.min.js',
         'src/plugins/js/crypto-api.min.js'
     ],

package.json

@@ -31,7 +31,7 @@
     "@babel/runtime": "^7.12.1",
     "dayjs": "^1.9.4",
     "flatpickr": "^4.6.6",
-    "jquery": "^3.5.1",
+    "jquery": "^2.2.4",
     "jspdf": "^2.1.1",
     "pako": "^1.0.11"
   },

src/controllers/cellDatePickerCtrl.js

@@ -3,7 +3,6 @@ import formula from '../global/formula';
 import Store from '../store';
 import flatpickr from 'flatpickr'
 import dayjs from "dayjs";
-import {Mandarin} from "flatpickr/dist/l10n/zh"
 
 const cellDatePickerCtrl = {
     cellFocus: function(r, c, value){
@@ -29,16 +28,16 @@ const cellDatePickerCtrl = {
         })
 
         flatpickr('#cellDatePickerBtn',{
-            locale: Mandarin,
             dateFormat: "YYYY-MM-DD",
+            allowInput: false,
+            defaultDate: dayjs(value).format('YYYY-MM-DD'),
             parseDate: (datestr, format) => {
                 return dayjs(datestr).toDate();
             },
             formatDate: (date, format, locale) => {
                 return dayjs(date).format(format);
             },
-            onChange: function (selectedDates, dateStr, instance) {
+            onChange: function (selectedDates, dateStr) {
-                console.log(selectedDates, dateStr)
                 $("#luckysheet-rich-text-editor").html(dateStr);
                 formula.updatecell(Store.luckysheetCellUpdate[0], Store.luckysheetCellUpdate[1]);
             }

src/controllers/conditionformat.js

@@ -2378,9 +2378,9 @@ const conditionformat = {
         //日期选择插件
         $('.ranges_1 ul').remove();
         $('#' + id).find("#daterange-btn").flatpickr({
-                mode: "range",
+            mode: "range",
-                 onChange:function(data,label) {
+            onChange: function (data, label) {
-                    const [start, end] = data
+                const [start, end] = data
                 //label:通过它来知道用户选择的是什么，传给后台进行相应的展示
                 let format1 = [
                     conditionformat_Text.yesterday,
@@ -2398,18 +2398,15 @@ const conditionformat = {
                     conditionformat_Text.last30days
                 ]
 
-                if(label == conditionformat_Text.all){
+                if (label == conditionformat_Text.all) {
                     $('#daterange-btn').val('');
-                }
+                } else if (format1.indexOf(label) > -1) {
-                else if(format1.indexOf(label) > -1){
                     $('#daterange-btn').val(dayjs(start).format('YYYY/MM/DD'));
-                }
+                } else if (format2.indexOf(label) > -1) {
-                else if(format2.indexOf(label) > -1){
                     $('#daterange-btn').val(dayjs(start).format('YYYY/MM/DD') + '-' + dayjs(end).format('YYYY/MM/DD'));
                 }
             }
-            }
+        });
-        );
     },
     CFSplitRange: function(range1, range2, range3, type){
         let range = [];

src/core.js

@@ -15,12 +15,12 @@ import {rowColumnOperationInitial} from './controllers/rowColumnOperation';
 import {keyboardInitial} from './controllers/keyboard';
 import {orderByInitial} from './controllers/orderBy';
 import {initPlugins} from './controllers/expendPlugins';
-import { 
+import {
-    getluckysheetfile, 
+    getluckysheetfile,
-    getluckysheet_select_save, 
+    getluckysheet_select_save,
-    getconfig, 
+    getconfig,
 } from './methods/get';
-import { 
+import {
     setluckysheet_select_save
 } from './methods/set';
 import { luckysheetrefreshgrid, jfrefreshgrid } from './global/refresh';
@@ -35,6 +35,10 @@ import method from './global/method';
 
 import * as api from './global/api';
 
+import flatpickr from 'flatpickr'
+import { Mandarin } from "flatpickr/dist/l10n/zh.js"
+flatpickr.localize(Mandarin);
+
 let luckysheet = {};
 
 // mount api
@@ -151,14 +155,14 @@ luckysheet.create = function (setting) {
         $.post(loadurl, {"gridKey" : server.gridKey}, function (d) {
             let data = eval("(" + d + ")");
             Store.luckysheetfile = data;
-            
+
             sheetmanage.initialjfFile(menu, title);
             // luckysheetsizeauto();
             initialWorkBook();
 
             //需要更新数据给后台时，建立WebSocket连接
             if(server.allowUpdate){
-                server.openWebSocket();    
+                server.openWebSocket();
             }
         });
     }
@@ -225,4 +229,4 @@ luckysheet.destroy = method.destroy;
 
 export {
     luckysheet
-}
+}