Merge pull request #297 from renxxing/dev

highlight follow and keep highlight

.github/workflows/github-pages.yml

@@ -0,0 +1,43 @@
+name: Github pages deploy
+
+on: push
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout # 检查项目
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js  # Nodejs版本
+        uses: actions/setup-node@master
+        with:
+          node-version: 12.13.0
+
+      - name: Install dependencies & Generate static files # 安装依赖打包demo和文档
+        run: |
+          node -v
+          npm install
+          npm install gulp -g
+          npm run build
+          npm run docs:build
+      
+      - name: Deploy LuckysheetDemo to GitHub Pages # 发布demo 到github pages
+        if: success()
+        uses: crazy-max/ghaction-github-pages@v2
+        with:
+          repo: mengshukeji/LuckysheetDemo
+          target_branch: gh-pages
+          build_dir: dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
+
+      - name: Deploy LuckysheetDocs to GitHub Pages # 发布docs 到github pages
+        if: success()
+        uses: crazy-max/ghaction-github-pages@v2
+        with:
+          repo: mengshukeji/LuckysheetDocs
+          target_branch: gh-pages
+          build_dir: docs/.vuepress/dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.1.7](https://github.com/mengshukeji/Luckysheet/compare/v2.1.6...v2.1.7) (2020-11-26)
+
+
+### Features
+
+* **demo:** tool function ([3baf93c](https://github.com/mengshukeji/Luckysheet/commit/3baf93cdb57238ee73ace3e7b9bca142fad81584))
+* 修改日期能够正常的弹出格式框和设置对应格式的日期时间 ([2c27044](https://github.com/mengshukeji/Luckysheet/commit/2c2704473c1c5a77091acda45a46f39ebbad3592))
+* 修改日期能够正常的弹出格式框和设置对应格式的日期时间 ([67c44e7](https://github.com/mengshukeji/Luckysheet/commit/67c44e7a68d948fcb90bd499ecc15cfb2bea5127))
+
+
+### Bug Fixes
+
+* **formula:** function ([dad6e2b](https://github.com/mengshukeji/Luckysheet/commit/dad6e2b2d144a31f4cfaaf84c90588e1a02ee006))
+* **formular:** docs ([ddac582](https://github.com/mengshukeji/Luckysheet/commit/ddac582f696898a1a46fc0ce3eb5d245d20077ae))
+* **hook:** function ([fb43a56](https://github.com/mengshukeji/Luckysheet/commit/fb43a56222c3d4c77b84efa9ff37eed8e1333a1a))
+* **hook function:** cellupdate ([5e8f71f](https://github.com/mengshukeji/Luckysheet/commit/5e8f71f32e5104769dbe6e0c61de3cd26b286344))
+* ie11右下角菜单图标会出现错位 ([34fd6e7](https://github.com/mengshukeji/Luckysheet/commit/34fd6e74cb87f9563ff28979d9f5f8a192fb558a))
+* 重复create会出现很多问题 ([8f22790](https://github.com/mengshukeji/Luckysheet/commit/8f227904fe9600ea17fdc346924d73c3bc81a041))
+
 ### [2.1.6](https://github.com/mengshukeji/Luckysheet/compare/v2.1.5...v2.1.6) (2020-11-23)
 
 

README-zh.md

@@ -39,9 +39,22 @@
 
 更详细的功能列表，请查阅：[特性](https://mengshukeji.github.io/LuckysheetDocs/zh/guide/#%E7%89%B9%E6%80%A7)
 
-## 开发计划
+## 📜 更新日志
+
+每个版本的详细更改都记录在 [CHANGELOG.md](CHANGELOG.md) 中。
+
+## ❗️ 问题反馈
+
+在反馈问题之前，请确保仔细阅读 [如何提交问题](https://mengshukeji.github.io/LuckysheetDocs/zh/guide/contribute.html#如何提交问题)。 不符合准则的问题可能会立即被移除。
+
+## ✅ 开发计划
+
 通过 [GitHub Projects](https://github.com/mengshukeji/Luckysheet/projects/1) 管理
 
+## 💪 贡献
+
+在提交PR之前，请确保仔细阅读 [贡献指南](https://mengshukeji.github.io/LuckysheetDocs/zh/guide/contribute.html)。
+
 ## 用法
 
 ### 第一步
@@ -98,12 +111,6 @@ nnpm run build
 - [excelize](https://github.com/360EntSecGroup-Skylar/excelize)
 - [h5-Dooring](https://github.com/MrXujiang/h5-Dooring)
 
-## 贡献
-
-1. 任何疑问或者建议，欢迎提交[Issues](https://github.com/mengshukeji/Luckysheet/issues/new/choose)
-2. 详细了解：[如何参与贡献](https://github.com/mengshukeji/Luckysheet/issues/128)
-
-
 ## 交流
 
 - 添加小编微信,拉你进Luckysheet开发者交流微信群,备注:加群
@@ -146,6 +153,7 @@ Luckysheet是MIT许可的开源项目，其持续稳定的开发离不开这些
 - debugger ¥ 20
 - 烦了烦 ¥ 10
 - 文顶顶 ¥ 200
+- yangxshn ¥ 10
 
 ## 贡献者和感谢
 
@@ -164,6 +172,7 @@ Luckysheet是MIT许可的开源项目，其持续稳定的开发离不开这些
 - [@TimerGang](https://github.com/TimerGang)
 - [@gsw945](https://github.com/gsw945)
 - [@swen-xiong](https://github.com/swen-xiong)
+- [@lzmch](https://github.com/lzmch)
 
 ## 版权信息
 [MIT](http://opensource.org/licenses/MIT)

README.md

@@ -44,10 +44,22 @@ English| [简体中文](./README-zh.md)
 
 For a more detailed feature list, please refer to: [Features](https://mengshukeji.github.io/LuckysheetDocs/guide/#features)
 
-## ✅TODO
+## 📜 Changelog
+
+Detailed changes for each release are documented in the [CHANGELOG.md](CHANGELOG.md).
+
+## ❗️ Issues
+
+Please make sure to read the [Issue Reporting Checklist](https://mengshukeji.github.io/LuckysheetDocs/guide/contribute.html#how-to-submit-issues) before opening an issue. Issues not conforming to the guidelines may be closed immediately.
+
+## ✅ TODO
 
 Managed with [GitHub Projects](https://github.com/mengshukeji/Luckysheet/projects/1)
 
+## 💪Contribution
+
+Please make sure to read the[ Contributing Guide](https://mengshukeji.github.io/LuckysheetDocs/guide/contribute.html) before making a pull request.
+
 ## Usage
 
 ### First step
@@ -104,11 +116,6 @@ nnpm run build
 - [excelize](https://github.com/360EntSecGroup-Skylar/excelize)
 - [h5-Dooring](https://github.com/MrXujiang/h5-Dooring)
 
-## Contribution
-
-1. Any questions or suggestions are welcome to submit [Issues](https://github.com/mengshukeji/Luckysheet/issues/new/choose)
-2. Learn more:[How to contribute](https://github.com/mengshukeji/Luckysheet/issues/128)
-
 ## Communication
 
 - [Gitter](https://gitter.im/mengshukeji/Luckysheet)
@@ -143,6 +150,7 @@ Funds donated via Patreon go directly to support mengshukeji's work on Luckyshee
 - debugger ¥ 20
 - 烦了烦 ¥ 10
 - 文顶顶 ¥ 200
+- yangxshn ¥ 10
 
 ## Authors and acknowledgment
 
@@ -161,6 +169,7 @@ Funds donated via Patreon go directly to support mengshukeji's work on Luckyshee
 - [@TimerGang](https://github.com/TimerGang)
 - [@gsw945](https://github.com/gsw945)
 - [@swen-xiong](https://github.com/swen-xiong)
+- [@lzmch](https://github.com/lzmch)
 
 ## License
 [MIT](http://opensource.org/licenses/MIT)

docs/.vuepress/config.js

@@ -62,7 +62,8 @@ module.exports = {
 						'operate',
 						'api',
 						'resource',
-						'FAQ'
+						'FAQ',
+						'contribute'
 					],
 					'/about/': [
 						'',

docs/about/README.md

@@ -16,4 +16,5 @@ Luckysheet is a project led by an individual and jointly developed by several fr
 - [@javahuang](https://github.com/javahuang)
 - [@TimerGang](https://github.com/TimerGang)
 - [@gsw945](https://github.com/gsw945)
-- [@swen-xiong](https://github.com/swen-xiong)
+- [@swen-xiong](https://github.com/swen-xiong)
+- [@lzmch](https://github.com/lzmch)

docs/about/sponsor.md

@@ -34,3 +34,4 @@ Funds donated via Patreon go directly to support mengshukeji's work on Luckyshee
 - debugger ¥ 20
 - 烦了烦 ¥ 10
 - 文顶顶 ¥ 200
+- yangxshn ¥ 10

docs/guide/FAQ.md

@@ -234,4 +234,16 @@ The second step, if it is to import the packaged code of the github repository,
 
 Tip: Most other npm installation problems can also be solved by trying above steps.
 
+------------
+
+## **<span style="font-size:20px;">Q</span>**How to carry out secondary development of Luckysheet in Vue project?
+
+**<span style="font-size:20px;">A</span>** The [luckysheet-vue](https://github.com/mengshukeji/luckysheet-vue) case is to provide an application integration solution.
+
+If directly developed locally:
+1. Start both the Luckysheet project and your own Vue project. For example, the Luckysheet project is at http://localhost:3001
+2. Import Luckysheet to use in the Vue project through `http://localhost:3001`
+
+In this case, after Luckysheet is modified in real time, the changes can be seen in the Vue project
+
 ------------