Merge branch 'master' of http://gitlab.lashuju.com/opensource/luckysheet

gulpfile.js

@@ -50,16 +50,16 @@ const babelConfig = {
 function clean() {
     return del(['dist']);
 }
+
 //监听文件+重载
 function watchReload() {
-    serve();
     core();
+    serve();
     const watcher = watch(['src/**']);
 
     // 多次刷新节流
     let reloadTimer = null;
     watcher.on('change', function (path, stats) {
-        console.info('change------',path)
         
 
         if (reloadTimer !== null) {
@@ -67,7 +67,7 @@ function watchReload() {
         }
         reloadTimer = setTimeout(() => {
             reload();
-            // core();
+            core();
             reloadTimer = null;
         }, 500);
 
@@ -92,7 +92,7 @@ async function core() {
     });
 
     return bundle.write({
-        file: 'src/luckysheet.js',
+        file: 'dist/luckysheet.js',
         format: 'umd',
         name: 'luckysheet',
         sourcemap: true
@@ -119,7 +119,7 @@ function otherFile() {
 function serve() {
     browserSync.init({
         server: {
-            baseDir: "src"
+            baseDir: "./"
         }
     });
 }

src/index.html → index.html

@@ -9,40 +9,40 @@
 	<title>Luckysheet</title>
 
 	<!-- build:css plugins/css/pluginsCss.min.css -->
-	<link rel='stylesheet' href='plugins/css/spectrum.min.css' />
-	<link rel="stylesheet" href="plugins/css/daterangepicker.css">
+	<link rel='stylesheet' href='./src/plugins/css/spectrum.min.css' />
+	<link rel="stylesheet" href="./src/plugins/css/daterangepicker.css">
 	<!-- endbuild -->
 
 	<!-- build:css plugins/plugins.min.css -->
-	<link rel="stylesheet" href="plugins/font-awesome.min.css" />
-	<link rel='stylesheet' href='plugins/jquery-ui.min.css' />
-	<link rel='stylesheet' href='plugins/jquery-ui.theme.min.css' />
+	<link rel="stylesheet" href="./src/plugins/font-awesome.min.css" />
+	<link rel='stylesheet' href='./src/plugins/jquery-ui.min.css' />
+	<link rel='stylesheet' href='./src/plugins/jquery-ui.theme.min.css' />
 	<!-- endbuild -->
 
 	<!-- build:css css/main.min.css -->
-	<link rel="stylesheet" href="css/luckysheet-core.css" />
+	<link rel="stylesheet" href="./src/css/luckysheet-core.css" />
 	<!-- endbuild -->
 
 	<!-- build:js plugins/js/plugin.min.js -->
-	<script src="plugins/js/jquery.min.js"></script>
-	<script src="plugins/js/clipboard.min.js"></script>
-	<script src='plugins/js/spectrum.min.js'></script>
-	<script src='plugins/js/jquery-ui.min.js'></script>
-	<script src="plugins/js/jquery.mousewheel.min.js"></script>
-	<script src="plugins/js/numeral.min.js"></script>
-	<script src="plugins/js/moment.min.js"></script>
-	<script src="plugins/js/moment-timezone-with-data.min.js"></script>
-	<script src="plugins/js/moment-msdate.js"></script>
-	<script src="plugins/js/html2canvas.min.js"></script>
-	<script src="plugins/js/pako.min.js"></script>
-	<script src="plugins/js/localforage.min.js"></script>
-	<script src="plugins/js/lodash.min.js"></script>
-	<script src="plugins/js/daterangepicker.js"></script>
-	<script src="plugins/js/jstat.min.js"></script>
+	<script src="./src/plugins/js/jquery.min.js"></script>
+	<script src="./src/plugins/js/clipboard.min.js"></script>
+	<script src='./src/plugins/js/spectrum.min.js'></script>
+	<script src='./src/plugins/js/jquery-ui.min.js'></script>
+	<script src="./src/plugins/js/jquery.mousewheel.min.js"></script>
+	<script src="./src/plugins/js/numeral.min.js"></script>
+	<script src="./src/plugins/js/moment.min.js"></script>
+	<script src="./src/plugins/js/moment-timezone-with-data.min.js"></script>
+	<script src="./src/plugins/js/moment-msdate.js"></script>
+	<script src="./src/plugins/js/html2canvas.min.js"></script>
+	<script src="./src/plugins/js/pako.min.js"></script>
+	<script src="./src/plugins/js/localforage.min.js"></script>
+	<script src="./src/plugins/js/lodash.min.js"></script>
+	<script src="./src/plugins/js/daterangepicker.js"></script>
+	<script src="./src/plugins/js/jstat.min.js"></script>
 	<!-- endbuild -->
 
 	<!-- rollup luckysheet.js -->
-	<script src="luckysheet.js"></script>
+	<script src="./dist/luckysheet.js"></script>
 </head>
 
 <body>

src/controllers/freezen.js

@@ -2,7 +2,7 @@ import Store from '../store'
 
 let visibledatarow = Store.visibledatarow;
 
-export default luckysheetFreezen = {
+const luckysheetFreezen = {
         freezenHorizontalHTML: '<div id="luckysheet-freezebar-horizontal" class="luckysheet-freezebar" tabindex="0"><div class="luckysheet-freezebar-handle luckysheet-freezebar-horizontal-handle" ><div class="luckysheet-freezebar-handle-bar luckysheet-freezebar-horizontal-handle-title" ></div><div class="luckysheet-freezebar-handle-bar luckysheet-freezebar-horizontal-handle-bar" ></div></div><div class="luckysheet-freezebar-drop luckysheet-freezebar-horizontal-drop" ><div class="luckysheet-freezebar-drop-bar luckysheet-freezebar-horizontal-drop-title" ></div><div class="luckysheet-freezebar-drop-bar luckysheet-freezebar-horizontal-drop-bar" >&nbsp;</div></div></div>',
         freezenVerticalHTML: '<div id="luckysheet-freezebar-vertical" class="luckysheet-freezebar" tabindex="0"><div class="luckysheet-freezebar-handle luckysheet-freezebar-vertical-handle" ><div class="luckysheet-freezebar-handle-bar luckysheet-freezebar-vertical-handle-title" ></div><div class="luckysheet-freezebar-handle-bar luckysheet-freezebar-vertical-handle-bar" ></div></div><div class="luckysheet-freezebar-drop luckysheet-freezebar-vertical-drop" ><div class="luckysheet-freezebar-drop-bar luckysheet-freezebar-vertical-drop-title" ></div><div class="luckysheet-freezebar-drop-bar luckysheet-freezebar-vertical-drop-bar" >&nbsp;</div></div></div>',
         initialHorizontal: true,
@@ -1392,3 +1392,4 @@ export default luckysheetFreezen = {
         }
     }
 
+export default luckysheetFreezen;

src/core.js

@@ -1,9 +1,7 @@
 
 import defaultSetting from './config.js'
 import luckysheet from './luckysheet-chart'
-
-
-
+import { common_extend } from './utils/util'
 
 luckysheet.create = function (setting) {
     var extendsetting = common_extend(defaultSetting, setting);
@@ -109,6 +107,7 @@ luckysheet.create = function (setting) {
 
     return luckysheet;
 }
+
 export {
     luckysheet
 }

src/index.js

@@ -1,5 +1,5 @@
 import './utils/math'
-import luckysheet from './core'
+import { luckysheet } from './core'
 import __firefox from './utils/polyfill'
 
 // polyfill event in firefox
@@ -7,7 +7,4 @@ if(window.addEventListener && (navigator.userAgent.indexOf("Firefox") > 0)){
     __firefox();
 }
 
-export default luckysheet;
-export {
-    luckysheet
-}
+export default luckysheet;

src/luckysheet-core.js

@@ -30,6 +30,9 @@
     } from './controllers/constant'
   
     import luckysheetFreezen from './controllers/freezen'
+    // import Store from './store'
+
+    // let visibledatarow = Store.visibledatarow;
 
     //动态表格
     
@@ -22917,21 +22920,7 @@
         }
     }
 
-    var common_extend = function (jsonbject1, jsonbject2) {
-        var resultJsonObject = {};
-
-        for (var attr in jsonbject1) {
-            resultJsonObject[attr] = jsonbject1[attr];
-        }
-
-        for (var attr in jsonbject2) {
-            resultJsonObject[attr] = jsonbject2[attr];
-        }
-
-        return resultJsonObject;
-    };
-
-    
+   
 
     var gridW = 0, gridH = 0, cellmainHeight = 0, cellmainWidth = 0;
     luckysheet.luckysheetsizeauto = function () {

src/luckysheet-function.js

@@ -3,6 +3,9 @@ import {
     luckyColor
 } from './controllers/constant'
 import luckysheetFreezen from './controllers/freezen'
+// import Store from './store'
+
+// let visibledatarow = Store.visibledatarow;
 
 // (function(luckysheet) {
 	// console.log = function(){};

src/utils/util.js

@@ -30,7 +30,27 @@ function isRealNum(val) {
     }
 }
 
+/**
+ * extend two objects
+ * @param {Object } jsonbject1
+ * @param {Object } jsonbject2 
+ */
+function common_extend(jsonbject1, jsonbject2) {
+    var resultJsonObject = {};
+
+    for (var attr in jsonbject1) {
+        resultJsonObject[attr] = jsonbject1[attr];
+    }
+
+    for (var attr in jsonbject2) {
+        resultJsonObject[attr] = jsonbject2[attr];
+    }
+
+    return resultJsonObject;
+};
+
 export {
     isJsonString,
-    isRealNum
+    isRealNum,
+    common_extend
 }