Merge branch 'master' of https://github.com/mengshukeji/Luckysheet in…

…to master

README-zh.md

@@ -21,10 +21,6 @@
 - excel导入导出库: [Luckyexcel](https://github.com/mengshukeji/Luckyexcel)
 - 图表插件: [chartMix](https://github.com/mengshukeji/chartMix)
 
-## 支持
-Luckysheet是MIT许可的开源项目，其持续的开发完全有赖于许多出色支持者的支持。如果您想加入他们，请考虑：
-- [kickstarter](https://www.kickstarter.com/projects/luckysheet/luckysheet)
-
 ## 特性
 
 ### 🛠️格式设置
@@ -160,6 +156,7 @@ npm run build
 ## 合作项目
 
 - [鲁班h5](https://github.com/ly525/luban-h5)
+- [excelize](https://github.com/360EntSecGroup-Skylar/excelize)
 
 ## 加入共建
 
@@ -194,15 +191,26 @@ npm run build
 ### 团队成员
 - [@wbfsa](https://github.com/wbfsa)
 - [@wpxp123456](https://github.com/wpxp123456)
-- [@swen-xiong](https://github.com/swen-xiong)
 - [@tonytonychopper123](https://github.com/tonytonychopper123)
 - [@Dushusir](https://github.com/Dushusir)
+- [@c19c19i](https://weibo.com/u/3884623955)
 
 ### 活跃成员
 - [@danielcai1987](https://github.com/danielcai1987)
 - [@qq6690876](https://github.com/qq6690876)
 - [@javahuang](https://github.com/javahuang)
 - [@gsw945](https://github.com/gsw945)
+- [@swen-xiong](https://github.com/swen-xiong)
+
+## 捐赠
+
+如果你感觉这个项目对你有用或者有所启发，可以请作者喝杯果汁：
+
+|  微信  | 支付宝 |
+|---|---|
+| <img src="https://minio.cnbabylon.com/public/luckysheet/wechat.jpg" width="140" />| <img src="https://minio.cnbabylon.com/public/luckysheet/alipay.jpg" width="130" /> |
+
+[Paypal Me](https://www.paypal.me/wbfsa)
 
 ## 版权信息
 [MIT](http://opensource.org/licenses/MIT)

README.md

@@ -27,10 +27,6 @@ English| [简体中文](./README-zh.md)
 - Excel import and export library: [Luckyexcel](https://github.com/mengshukeji/Luckyexcel)
 - Chart plugin: [chartMix](https://github.com/mengshukeji/chartMix)
 
-## Support
-Luckysheet is an MIT-licensed open source project with its ongoing development made possible entirely by the support of many awesome backers. If you'd like to join them, please consider:
-- [kickstarter](https://www.kickstarter.com/projects/luckysheet/luckysheet)
-
 ## Features
 
 ### 🛠️Formatting
@@ -165,6 +161,7 @@ Create a table
 ## Partner project
 
 - [luban-h5](https://github.com/ly525/luban-h5)
+- [excelize](https://github.com/360EntSecGroup-Skylar/excelize)
 
 ## Co-construction
 
@@ -191,15 +188,27 @@ Create a table
 ### Team
 - [@wbfsa](https://github.com/wbfsa)
 - [@wpxp123456](https://github.com/wpxp123456)
-- [@swen-xiong](https://github.com/swen-xiong)
 - [@tonytonychopper123](https://github.com/tonytonychopper123)
 - [@Dushusir](https://github.com/Dushusir)
+- [@c19c19i](https://weibo.com/u/3884623955)
 
 ### Active participants
 - [@danielcai1987](https://github.com/danielcai1987)
 - [@qq6690876](https://github.com/qq6690876)
 - [@javahuang](https://github.com/javahuang)
 - [@gsw945](https://github.com/gsw945)
+- [@swen-xiong](https://github.com/swen-xiong)
+
+## Donate
+
+If you find this project useful, you can buy author a glass of juice:
+
+|  WeChat  | Alipay |
+|---|---|
+| <img src="https://minio.cnbabylon.com/public/luckysheet/wechat.jpg" width="140" />| <img src="https://minio.cnbabylon.com/public/luckysheet/alipay.jpg" width="130" /> |
+
+[Paypal Me](https://www.paypal.me/wbfsa)
+
 
 ## License
 [MIT](http://opensource.org/licenses/MIT)

docs/guide/FAQ.md

@@ -42,6 +42,7 @@ luckysheet.buildGridData(luckysheetfile)
 ## **<span style="font-size:20px;">Q</span>** Is the remote loading data loadUrl or updateUrl?
 
 **<span style="font-size:20px;">A</span>**: [loadUrl](/zh/guide/config.html#loadurl). Configure loadUrl, Luckysheet will request the entire table data through ajax, and updateUrl will be used as the interface address for collaborative editing in real-time saving.
+Note: Initial data needs to be configured with loadUrl and loadSheetUrl parameters, while for collaborative editing, in addition to the configuration of loadUrl and loadSheetUrl, updateUrl and allowUpdate must be configured to take effect.
 
 ------------
 

docs/guide/api.md

@@ -212,6 +212,25 @@ Use note:
 
 ------------
 
+### exitEditMode([,setting])
+
+
+- **Parameter**：
+
+	- {PlainObject} [setting]: optional parameters
+        + {Function} [success]: callback function for the end of the operation
+
+- **Explanation**：
+
+	Exit edit mode. After double-clicking the cell with the mouse, it will enter the cell editing mode. After the editing is completed, when the mouse clicks on the input box elsewhere to lose focus, the editing mode will be exited, and the value of the cell will be saved. This Api is the operation of automatically exiting the editing mode, mainly to trigger the automatic saving of cells.
+
+- **Usage**:
+
+   - Manually trigger to exit edit mode
+   		`luckysheet.exitEditMode()`
+
+------------
+
 ## Row and column operations
 
 ### setHorizontalFrozen(isRange [,setting])
@@ -1994,6 +2013,48 @@ Use note:
 
 ------------
 
+### showGridLines([setting])
+
+- **Parameter**：
+
+    - {PlainObject} [setting]: optional parameters
+    	+ {Number} [order]: The subscript of the worksheet that needs to show the grid lines; the default value is the subscript of the current worksheet
+    	+ {Function} [success]: callback function for the end of the operation
+
+- **Explanation**：
+
+	Show the grid lines of the specified subscript worksheet, and return the worksheet object of the operation
+
+- **Usage**:
+
+	- Show the grid lines of the current worksheet
+	`luckysheet.showGridLines()`
+	- Show the grid lines of the third worksheet
+	`luckysheet.showGridLines({order:2})`
+
+------------
+
+### hideGridLines([setting])
+
+- **Parameter**：
+
+    - {PlainObject} [setting]: optional parameters
+    	+ {Number} [order]: The subscript of the worksheet that needs to hdie the grid lines; the default value is the subscript of the current worksheet
+    	+ {Function} [success]: callback function for the end of the operation
+
+- **Explanation**：
+
+	Hide the grid lines of the specified subscript worksheet, and return the worksheet object of the operation
+
+- **Usage**:
+
+	- Hide grid lines of current worksheet
+	`luckysheet.hideGridLines()`
+	- Hide the grid lines of the third worksheet
+	`luckysheet.hideGridLines({order:2})`
+
+------------
+
 ## Workbook operations
 
 ### create(options [,setting])
@@ -2136,7 +2197,23 @@ Use note:
 
 ------------
 
-## chart
+### refreshFormula([setting])
+
+[todo]
+
+- **Parameter**：
+
+	- {PlainObject} [setting]: optional parameters
+        + {Object | String} [range]: Set the target selection range of the parameter. The supported selection format is `"A1:B2"`, `"sheetName!A1:B2"` or `{row:[0,1], column:[0,1]}`, allows an array of multiple selections; the default is the current selection ;The default is the entire current worksheet
+        + {Function} [success]: callback function for the end of the operation
+
+- **Explanation**：
+
+	Force refresh formula. When you directly modify the values of multiple cells without triggering a refresh, and these cells are associated with formulas, you can use this API to force a formula refresh to be triggered at the end. It is generally recommended to specify the affected cell range to prevent For performance issues, if you can't determine it, leave it blank to keep the entire worksheet traversed and refreshed.
+
+------------
+
+## Chart
 
 ### insertChart([setting])