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

dream-num · Aug 29, 2020 · 254081f · 254081f
2 parents d8a1833 + 732f678
commit 254081f
Show file tree

Hide file tree

Showing 18 changed files with 1,675 additions and 142 deletions.
diff --git a/README-zh.md b/README-zh.md
@@ -150,11 +150,17 @@ npm run build
 ```
 ## 加入共建
 
-如果你想为 Luckysheet 实现一个重要功能，需要先撰写 RFC 文档，按照Luckysheet的 [RFC](https://github.com/mengshukeji/Luckysheet-rfcs) 机制进行操作，在经过社区讨论完善后才可以进行代码的提交。
-
-## 联系
-- 欢迎提交 PR 或者 [Issues](https://github.com/mengshukeji/Luckysheet/issues/new/choose)
-- Email: [email protected]
+1. 任何疑问或者建议，欢迎提交[Issues](https://github.com/mengshukeji/Luckysheet/issues/new/choose)
+2. 如果您想为 Luckysheet 实现一个重要功能，需要先撰写 RFC 文档，按照Luckysheet的 [RFC](https://github.com/mengshukeji/Luckysheet-rfcs) 机制进行操作，在经过社区讨论完善后才可以进行代码的提交。
+3. 如果您对Luckysheet感兴趣，非常欢迎加入开发组，一起来完善这个插件（下方扫码添加小编微信备注：共建），有4类任务可以认领
+    - BUG修复
+    - 新功能添加
+    - 文档
+    - 推广
+
+    您将收获：
+    - Luckysheet官方readme文档贡献者链接
+    - 参与大型开源项目，技术和视野提升
 
 ## 交流
 
@@ -171,7 +177,10 @@ npm run build
 [英文社群](./README.md)
 
 ## 贡献者和感谢
+- [@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)
 
 ## 版权信息

diff --git a/README.md b/README.md
@@ -154,13 +154,20 @@ Create a table
     })
 </script>
 ```
-## Join the co-construction
 
-If you want to implement an important function for Luckysheet, you need to write an RFC document first, follow Luckysheet's [RFC](https://github.com/mengshukeji/Luckysheet-rfcs) to operate, and submit the code after community discussion and improvement.
+## Co-construction
 
-## Contact
-- Welcome to submit PR or [Issues](https://github.com/mengshukeji/Luckysheet/issues/new/choose)
-- Email: [email protected]
+1. Any questions or suggestions are welcome to submit [Issues](https://github.com/mengshukeji/Luckysheet/issues/new/choose)
+2. If you want to implement an important function for Luckysheet, you need to write an RFC document first, follow Luckysheet's [RFC](https://github.com/mengshukeji/Luckysheet-rfcs) mechanism to operate, and only after community discussion and improvement, you can submit the code.
+3. If you are interested in Luckysheet, you are very welcome to join the development team to improve this plugin together (Email: [email protected]), there are 4 types of tasks that can be claimed
+    - BUG
+    - New features
+    - Documentation
+    - Popularize
+
+    You will gain:
+    - Luckysheet official readme document contributor link
+    - Participate in large open source projects, improve technology and vision
 
 ## Communication
 
@@ -169,7 +176,10 @@ If you want to implement an important function for Luckysheet, you need to write
 [Chinese community](./README-zh.md)
 
 ## Authors and acknowledgment
+- [@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)
 
 ## License

diff --git a/docs/guide/data.md b/docs/guide/data.md
@@ -26,7 +26,7 @@
                 "rowlen":{}, //Table row height
                 "columnlen":{}, //Table column width
                 "rowhidden":{}, //hidden rows
-                "columnhidden":{}, //hidden columns
+                "colhidden":{}, //hidden columns
                 "borderInfo":{}, //borders
             },
             "celldata": [], //initialize the cell data used
@@ -204,15 +204,15 @@
                 }
         ```
 
-    ### config.columnhidden
+    ### config.colhidden
     - Type：Object
     - Default：{}
-    - Usage：Hidden column information, Columns：`columnhidden[Columns]: 0`,
+    - Usage：Hidden column information, Columns：`colhidden[Columns]: 0`,
 
         `key` specify the number of columns,`value` is always `0`
     - example:
         ```js
-        "columnhidden": {
+        "colhidden": {
                     "30": 0,
                     "31": 0
                 }

diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md
@@ -171,7 +171,7 @@ luckysheetfile = [ {sheet1设置},  {sheet2设置},  {sheet3设置} ]`
 		"rowlen":{}, //表格行高
 		"columnlen":{}, //表格列宽
 		"rowhidden":{}, //隐藏行
-		"columnhidden":{}, //隐藏列
+		"colhidden":{}, //隐藏列
 		"borderInfo":{}, //边框
 	},
 	"celldata": [], //初始化使用的单元格数据

diff --git a/docs/zh/guide/cell.md b/docs/zh/guide/cell.md
@@ -147,6 +147,15 @@
         </td>
         <td></td>
     </tr>
+    <tr>
+        <td>ae</td>
+        <td>allowEdit</td>
+        <td>是否允许编辑</td>
+        <td>
+        0: 只读，不可编辑 1：可以编辑，默认为 1
+        </td>
+        <td></td>
+    </tr>
 </table>
 
 一个规范的单元格对象如下：