+
+ 雄安智评云数字科技有限公司
+
+
+ Code the Future
+
+
+ 吉客云
+
+
+ 华为
+
+- [Github 论坛](https://github.com/mengshukeji/Luckysheet/discussions)
+- 以下扫码加入官方微信群或者QQ群
-或者
+| 加小编微信: msuniver，备注:加群 | QQ群:767964895 |
+|---|---|
+|
| 
|
-- 加入Luckysheet开发者交流QQ群
-
- 
[英文社群](./README.md)
## 赞助
-如果你感觉这个项目对你有用或者有所启发，可以请作者喝杯果汁：
+Luckysheet是MIT许可的开源项目，其持续稳定的开发离不开这些优秀的 [**支持者**](https://dream-num.github.io/LuckysheetDocs/zh/about/sponsor.html#%E8%B5%9E%E5%8A%A9%E8%80%85%E5%88%97%E8%A1%A8)。 如果您想加入他们，请考虑：
-注意事项：
-1. 付款留言请备注：昵称，您的网站地址
-2. 默认会将您加入到下方的赞助者列表。如果您想匿名赞助，付款留言请备注：匿名
-3. 如果您忘记留言昵称或者网站地址，请联系小编email: alexads@foxmail.com或者微信：dushusir2。
+- [成为Patreon的支持者或赞助商](https://www.patreon.com/mengshukeji)
+- [成为Open Collective的支持者或赞助商](https://opencollective.com/luckysheet)
+- 通过PayPal，微信或支付宝一次性捐赠
-| 微信 | 支付宝 |
-|---|---|
-| 
| 
|
+| PayPal | 微信 | 支付宝 |
+|---|---|---|
+| [Paypal Me](https://www.paypal.me/wbfsa) | 
| 
|
+
+### Patreon和OpenCollective有什么区别？
-### [Paypal Me](https://www.paypal.me/wbfsa)
+通过Patreon捐赠的资金将直接用于支持menshshukeji在Luckysheet上的工作。 通过OpenCollective捐赠的资金由透明费用管理，将用于补偿核心团队成员的工作和费用或赞助社区活动。 通过在任一平台上捐款，您的姓名/徽标将得到适当的认可和曝光。
## 赞助者列表
+
（按时间顺序排列）
- *勇 ¥ 30
- 虚我 ¥ 200
@@ -219,23 +170,127 @@ npm run build
- **平 ¥ 100
- **东 ¥ 10
- debugger ¥ 20
+- 烦了烦 ¥ 10
+- 文顶顶 ¥ 200
+- yangxshn ¥ 10
+- 爱乐 ¥ 100
+- 小李飞刀刀 ¥ 66
+- 张铭 ¥ 200
+- 曹治军 ¥ 1
+- *特 ¥ 10
+- **权 ¥ 9.9
+- **sdmq ¥ 20
+- *旭 ¥ 10
+- Quentin ¥ 20
+- 周宇凡 ¥ 100
+- *超 ¥ 10
+- 维宁 ¥ 100
+- hyy ¥ 20
+- 雨亭寒江月 ¥ 50
+- **功 ¥ 10
+- **光 ¥ 20
+- terrywan ¥ 100
+- 王晓洪 ¥ 10
+- Sun ¥ 10
+- 忧绣 ¥ 100
+- Jasonx ¥ 10
+- 国勇 ¥ 66.6
+- 郎志 ¥ 100
+- 匿名 ¥ 1
+- ni ¥ 100
+- 苏 ¥ 50
+- Mads_chan ¥ 1
+- LK ¥ 100
+- 智连方舟 李汪石 ¥ 168
+- **发 ¥ 260
+- *超 ¥ 10
+- *勇 ¥ 10
+- *腾 ¥ 15
+- 名字好难起 ¥ 20
+- 大山 ¥ 1
+- waiting ¥ 1000
+- **宇 ¥ 10.00
+- 刘小帅的哥哥 ¥ 20.00
+- 宁静致远 ¥ 10.00
+- Eleven ¥ 1.00
+- **帆 ¥ 188
+- henry ¥ 100
+- .波罗 ¥ 50
+- 花落有家 ¥ 50
+- 踏遍南水北山 ¥ 1
+- LC ¥ 5
+- **明 ¥ 8.80
+- *军 ¥ 20
+- 张彪 ¥ 50
+- 企业文档云@肖敏 ¥ 10
+- 匿名 ¥ 50
+- 逍遥行 ¥ 10
+- z.wasaki ¥ 50
+- Make Children ¥ 20
+- Foam ¥ 20
+- 奥特曼( o|o)ノ三 ¥ 50
+- **凯 ¥ 10
+- **兵 ¥ 20
+- **川 ¥ 1
+- 二万 ¥ 50
+- 蔚然成林 ¥ 10
+- 邹杰 ¥ 10
+- 张永强 ¥ 50
+- 鱼得水 ¥ 270
+- Ccther ¥ 1
+- Eric Cheng ¥ 10
+- 佚名 ¥ 1
+- 花叶 ¥ 50
+- GT ¥ 20
+- 菜菜心 ¥ 10
+- fisher ¥ 1
+- JC ¥ 5
+- 佚名 ¥ 20
+- 独孤一剑 ¥ 50
+- mxt ¥ 20
+- 一叶迷山 ¥ 100
+- Jeff ¥ 100
+- 八千多条狗🐶 ¥ 100
+- 晓峰 ¥ 10
+- 戒 ¥ 1
+- 浪里个浪 ¥ 1
+- 回调函数 ¥ 50
+- 赖瓜子 ¥ 5
+- Milo•J ¥ 20
+- 可道云 ¥ 200
+- *程 ¥ 10
+- 来一杯卡布酸奶 ¥ 5
+- 刘久胜 ¥ 100
+- 快意江湖 ¥ 50
+- *新 ¥ 9.9
+- **龙 ¥ 100
## 贡献者和感谢
-### 团队成员
+### 核心团队活跃成员
- [@wbfsa](https://github.com/wbfsa)
-- [@wpxp123456](https://github.com/wpxp123456)
+- [@eiji-th](https://github.com/eiji-th)
+- [@fly-95](https://github.com/fly-95)
- [@tonytonychopper123](https://github.com/tonytonychopper123)
- [@Dushusir](https://github.com/Dushusir)
+- [@iamxuchen800117](https://github.com/iamxuchen800117)
+- [@wpxp123456](https://github.com/wpxp123456)
- [@c19c19i](https://weibo.com/u/3884623955)
+- [@zhangchen915](https://github.com/zhangchen915)
+- [@jerry-f](https://github.com/jerry-f)
+- [@flowerField](https://github.com/flowerField)
-### 活跃成员
+### 社区伙伴
+- [@yiwasheng](https://github.com/yiwasheng)
- [@danielcai1987](https://github.com/danielcai1987)
- [@qq6690876](https://github.com/qq6690876)
- [@javahuang](https://github.com/javahuang)
- [@TimerGang](https://github.com/TimerGang)
- [@gsw945](https://github.com/gsw945)
- [@swen-xiong](https://github.com/swen-xiong)
+- [@lzmch](https://github.com/lzmch)
+- [@kdevilpf](https://github.com/kdevilpf)
+- [@WJWM0316](https://github.com/WJWM0316)
## 版权信息
[MIT](http://opensource.org/licenses/MIT)
diff --git a/README.md b/README.md
index c88215da9061573c3b38aaf0e0bcfb92af020759..2863adc28724fa7cf395a0de4cf4c16e5b075c0d 100644
--- a/README.md
+++ b/README.md
@@ -9,147 +9,95 @@
+# Luckysheet 3.x has been renamed to [Univer](https://github.com/dream-num/univer)
English| [简体中文](./README-zh.md)
## Introduction
🚀Luckysheet is an online spreadsheet like excel that is powerful, simple to configure, and completely open source.
+
## Links
| Source Code | Documentation | Demo | Plugins Demo | Forum |
| ------ | -------- | ------ | ------ | ------ |
- | [Github](https://github.com/mengshukeji/Luckysheet)| [Online Documentation](https://mengshukeji.github.io/LuckysheetDocs/) | [Online Demo](https://mengshukeji.github.io/LuckysheetDemo) | [Import Excel Demo](https://mengshukeji.github.io/LuckyexcelDemo/) | [Chinese Forum](https://support.qq.com/product/288322) |
+ | [Github](https://github.com/mengshukeji/Luckysheet)| [Online Documentation](https://dream-num.github.io/LuckysheetDocs/) | [Online Demo](https://dream-num.github.io/LuckysheetDemo) / [Cooperative editing demo](http://luckysheet.lashuju.com/demo/) | [Import Excel Demo](https://dream-num.github.io/LuckyexcelDemo/) | [Chinese Forum](https://support.qq.com/product/288322) |
| [Gitee Mirror](https://gitee.com/mengshukeji/Luckysheet)| [Gitee Online Documentation](https://mengshukeji.gitee.io/LuckysheetDocs/) | [Gitee Online Demo](https://mengshukeji.gitee.io/luckysheetdemo/) | [Gitee Import Excel Demo](https://mengshukeji.gitee.io/luckyexceldemo/) | [Google Group](https://groups.google.com/g/luckysheet) |
## Plugins
-- Excel import and export library: [Luckyexcel](https://github.com/mengshukeji/Luckyexcel)
-- Chart plugin: [chartMix](https://github.com/mengshukeji/chartMix)
+- [Luckyexcel](https://github.com/mengshukeji/Luckyexcel): Excel import and export library
+- [chartMix](https://github.com/mengshukeji/chartMix): Chart plugin
+
+## Ecosystem
+
+| Project | Description |
+|---------|-------------|
+| [Luckysheet Vue] | Luckysheet and Luckyexcel in a vue cli3 project |
+| [Luckysheet Vue3] | Luckysheet and Luckyexcel in a vue3 project with vite|
+| [Luckysheet React] | Luckysheet in a React project |
+| [Luckyexcel Node] | Use Luckyexcel in koa2 |
+| [Luckysheet Server] | Java backend Luckysheet Server |
+| [Luckysheet Server Starter] | LuckysheetServer docker deployment startup template |
+
+[Luckysheet Vue]: https://github.com/mengshukeji/luckysheet-vue
+[Luckysheet Vue3]: https://github.com/hjwforever/luckysheet-vue3-vite
+[Luckysheet React]: https://github.com/mengshukeji/luckysheet-react
+[Luckyexcel Node]: https://github.com/mengshukeji/Luckyexcel-node
+[Luckysheet Server]: https://github.com/mengshukeji/LuckysheetServer
+[Luckysheet Server Starter]: https://github.com/mengshukeji/LuckysheetServerStarter
+
## Features
-### 🛠️Formatting
-+ **Styling** (Change font style, size, color, or apply effects)
-+ **Conditional formatting** (highlight interesting cells or ranges of cells, emphasize unusual values, and visualize data by using data bars, color scales, and icon sets that correspond to specific variations in the data)
-+ **Align or rotate text**
-+ **Support text truncation, overflow, automatic line wrapping**
-+ **Data types**
- + **currency, percentages, decimals, dates**
- + **Custom** (E.g `##,###0.00` , `$1,234.56$##,###0.00_);[Red]($##,###0.00)`, `_($* ##,###0.00_);_(...($* "-"_);_(@_)`, `08-05 PM 01:30MM-dd AM/PM hh:mm` )
-+ **Cell segmentation style** (Alt+Enter line break, sub,super, in-cell style)
-
-### 🧬Cells
-+ **Move cells by drag and dropping** (Operate on selection)
-+ **Fill handle** (For a series like 1, 2, 3, 4, 5..., type 1 and 2 in the first two cells. For the series 2, 4, 6, 8..., type 2 and 4. Support arithmetic sequence, geometric sequence,date, week,chinese numbers)
-+ **Auto Fill Options** (Fill copy, sequence, only format, no format, day, month, year)
-+ **Multiple selection** (Hold Ctrl Selecting multiple cells, copy and paste)
-+ **Find and replace** (Such as a particular number or text string, Support regular expression, whole word, case sensitive)
-+ **Location** (Cells can be selected according to the data type)
-+ **Merge cells**
-+ **Data validation** (Checkbox, drop-down list, datePicker)
-
-### 🖱️Row & columns
-+ **Hide, Insert, Delete rows and columns**
-+ **Frozen rows and columns** (First row, first column, Frozen to selection, freeze adjustment lever can be dragged)
-+ **Split text** (Split text into different columns with the Convert Text to Columns Wizard)
-
-### 🔨Operation
-+ **Undo/Redo**
-+ **Copy/Paste/Cut** (Copy from excel to Luckysheet with format, vice versa)
-+ **Hot key** (The operating experience is consistent with excel, if there are differences or missing, please feedback to us)
-+ **Format Painter** (Similar to google sheet)
-+ **Selection by drag and dropping** (Change the parameters of formula and chart through selection)
-
-### ⚙️Formulas & functions
-+ **Built-in formulas**
- + Math (SUMIFS, AVERAGEIFS, SUMIF, SUM, etc.)
- + Text (CONCATENATE, REGEXMATCH, MID)
- + Date (DATEVALUE, DATEDIF, NOW, WEEKDAY, etc.)
- + Financial (PV, FV, IRR, NPV, etc.)
- + Logical (IF, AND, OR, IFERROR, etc.)
- + Lookup (VLOOKUP, HLOOkUP, INDIRECT, OFFSET, etc.)
- + Dynamic Array (Excel2019 new formulas, SORT,FILTER,UNIQUE,RANDARRAY,SEQUENCE)
-+ **Array** (={1,2,3,4,5,6}, Crtl+Shift+Enter)
-+ **Remote formulas** (DM_TEXT_TFIDF, DM_TEXT_TEXTRANK,DATA_CN_STOCK_CLOSE etc. Need remote interface, can realize complex calculation)
-+ **Custom** (Some formula suitable for use in China have been added. AGE_BY_IDCARD, SEX_BY_IDCARD, BIRTHDAY_BY_IDCARD, PROVINCE_BY_IDCARD, CITY_BY_IDCARD, etc. You can define any formula you want)
-
-### 📐Tables
-+ **Filters** (Support color , numerical, date, text filtering)
-+ **Sort** (Sort multiple fields simultaneously)
-
-### 📈Pivot table
-+ **Arrange fields** (Add fileds to rows, columns, values, area, it is similar to excel)
-+ **Aggregation** (Surport Sum,Count,CountA,CountUnique,Average,Max,Min,Median,Product,Stdev,Stdevp,Var,VarP etc.)
-+ **Filter data** (Add fileds to filters area and analyze the desired data )
-+ **Drill down** (Double click pivot table cell to drill down for detail data )
-+ **Create a PivotChart** (Pivot table can create a chart )
-
-### 📊Chart
-+ **Support types** (Line, Column, Area, Bar, Pie, comming soon Scatter, Radar, Gauge, Funnel etc.)
-+ **Chart Plugins** (Link to another project [ChartMix](https://github.com/mengshukeji/chartMix)(MIT): ECharts is currently supported,Highcharts, Ali G2, amCharts, googleChart, chart.js are being developed gradually)
-+ **Sparklines** (Support by formula : Line, Pie, Box, Pie etc.)
-
-### ✍️Share
-+ **Comments** (Add, delete, update)
-+ **Collaborate** (Simultaneous editing by multiple users)
-
-### 📚Insert object
-+ **Insert picture** (JPG,PNG,SVG and so on)
-
-### ⚡Luckysheet
-+ **Matrix operation** (Operate selection through the right-click menu: transpose, rotate, numerical calculation)
-+ **Screenshot** (Take a screenshot with selection)
-+ **Copy to** (In the right-click menu, copy selection to json, array etc.)
-+ **EXCEL import/export** (Specially adapted to Luckysheet, export is under development)
-
-
-### ⏱️Coming soon
-+ **Print** (Like excel print option, save to PDF)
-+ **Tree menu** (Just like the outline (group) function of excel)
-+ **Table new Features** (filter, slicer)
-+ **CSV,TXT import/export** (Specially adapted to Luckysheet)
-+ **Insert Shapes** ([Pen tool](https://github.com/mengshukeji/Pentool) Shapes)
-+ **Documentation** (Improve documentation and API)
-+ **More...** (Please advise us)
-
-## Requirements
-[Node.js](https://nodejs.org/en/) Version >= 6
+- **Formatting**: style, conditional formatting, text alignment and rotation, text truncation, overflow, automatic line wrapping, multiple data types, cell segmentation style
+- **Cells**: drag and drop, fill handle, multiple selection, find and replace, location, merge cells, data verification
+- **Row & column**: hide, insert, delete rows or columns, freeze, and split text
+- **Operation**: undo, redo, copy, paste, cut, hot key, format painter, drag and drop selection
+- **Formulas & Functions**: Built-in, remote and custom formulas
+- **Tables**: filter, sort
+- **Enhanced functions**: Pivot tables, charts, comments, cooperative editing, insert picture, matrix calculations, screenshots, copying to other formats, EXCEL import and export, etc.
-## Installation
-```
-npm install
-npm install gulp -g
-```
+For a more detailed feature list, please refer to: [Features](https://dream-num.github.io/LuckysheetDocs/guide/#features)
-## Development
-Development
-```
-npm run dev
-```
-Package
-```
-npm run build
-```
+## 📖 Resources
+- Priority reading for new users: [User Guide](https://github.com/mengshukeji/Luckysheet/wiki/User-Guide)
+- For the tutorials, learning materials and supporting solutions provided by the community, please refer to: [Tutorials and Resources](https://dream-num.github.io/LuckysheetDocs/guide/resource.html)
+
+## 📜 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://dream-num.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://dream-num.github.io/LuckysheetDocs/guide/contribute.html) before making a pull request.
## Usage
-#### First step
+### First step
Introduce dependencies through CDN
```
-
-
-
-
-
-
+
+
+
+
+
+
```
-#### Second step
+### Second step
Specify a table container
```
```
-#### Third step
+### Third step
Create a table
```
```
+## Development
+
+### Requirements
+[Node.js](https://nodejs.org/en/) Version >= 6
+
+### Installation
+```
+npm install
+npm install gulp -g
+```
+### Development
+```
+npm run dev
+```
+### Package
+```
+npm run build
+```
+
## Partner project
- [luban-h5](https://github.com/ly525/luban-h5)
-- [excelize](https://github.com/360EntSecGroup-Skylar/excelize)
- [h5-Dooring](https://github.com/MrXujiang/h5-Dooring)
-
-## Co-construction
-
-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: alexads@foxmail.com), 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
+- [Furion](https://gitee.com/monksoul/Furion)
+- [AFFiNE.PRO](https://github.com/toeverything/AFFiNE)
## Communication
-
+- [Github Discussions](https://github.com/mengshukeji/Luckysheet/discussions)
- [Gitter](https://gitter.im/mengshukeji/Luckysheet)
[Chinese community](./README-zh.md)
## Sponsor
-If you find this project useful, you can buy author a glass of juice:
+Luckysheet is an MIT-licensed open source project with its ongoing development made possible entirely by the support of these awesome [backers](https://dream-num.github.io/LuckysheetDocs/about/sponsor.html#sponsors-list). If you'd like to join them, please consider:
+
+- [Become a backer or sponsor on Patreon](https://www.patreon.com/mengshukeji).
+- [Become a backer or sponsor on Open Collective](https://opencollective.com/luckysheet).
+- One-time donation via PayPal, WeChat or Alipay
-Note:
-1. Please note the payment message: nickname, your website address
-2. By default, you will be added to the sponsor list below. If you want to sponsor anonymously, please leave a note on payment: anonymous
-3. If you forget your nickname or website address, please contact the editor email: alexads@foxmail.com or WeChat: dushusir2.
+| PayPal | WeChat | Alipay |
+|---|---|---|
+| [Paypal Me](https://www.paypal.me/wbfsa) | | |
-| WeChat | Alipay |
-|---|---|
-| | |
+### What's the difference between Patreon and OpenCollective?
-### [Paypal Me](https://www.paypal.me/wbfsa)
+Funds donated via Patreon go directly to support mengshukeji's work on Luckysheet. Funds donated via OpenCollective are managed with transparent expenses and will be used for compensating work and expenses for core team members or sponsoring community events. Your name/logo will receive proper recognition and exposure by donating on either platform.
## Sponsors List
+
(Sort by time)
- *勇 ¥ 30
- 虚我 ¥ 200
@@ -213,27 +169,127 @@ Note:
- **平 ¥ 100
- **东 ¥ 10
- debugger ¥ 20
+- 烦了烦 ¥ 10
+- 文顶顶 ¥ 200
+- yangxshn ¥ 10
+- 爱乐 ¥ 100
+- 小李飞刀刀 ¥ 66
+- 张铭 ¥ 200
+- 曹治军 ¥ 1
+- *特 ¥ 10
+- **权 ¥ 9.9
+- **sdmq ¥ 20
+- *旭 ¥ 10
+- Quentin ¥ 20
+- 周宇凡 ¥ 100
+- *超 ¥ 10
+- 维宁 ¥ 100
+- hyy ¥ 20
+- 雨亭寒江月 ¥ 50
+- **功 ¥ 10
+- **光 ¥ 20
+- terrywan ¥ 100
+- 王晓洪 ¥ 10
+- Sun ¥ 10
+- 忧绣 ¥ 100
+- Jasonx ¥ 10
+- 国勇 ¥ 66.6
+- 郎志 ¥ 100
+- 匿名 ¥ 1
+- ni ¥ 100
+- 苏 ¥ 50
+- Mads_chan ¥ 1
+- LK ¥ 100
+- 智连方舟 李汪石 ¥ 168
+- **发 ¥ 260
+- *超 ¥ 10
+- *勇 ¥ 10
+- *腾 ¥ 15
+- 名字好难起 ¥ 20
+- 大山 ¥ 1
+- waiting ¥ 1000
+- **宇 ¥ 10.00
+- 刘小帅的哥哥 ¥ 20.00
+- 宁静致远 ¥ 10.00
+- Eleven ¥ 1.00
+- **帆 ¥ 188
+- henry ¥ 100
+- .波罗 ¥ 50
+- 花落有家 ¥ 50
+- 踏遍南水北山 ¥ 1
+- LC ¥ 5
+- **明 ¥ 8.80
+- *军 ¥ 20
+- 张彪 ¥ 50
+- 企业文档云@肖敏 ¥ 10
+- 匿名 ¥ 50
+- 逍遥行 ¥ 10
+- z.wasaki ¥ 50
+- Make Children ¥ 20
+- Foam ¥ 20
+- 奥特曼( o|o)ノ三 ¥ 50
+- **凯 ¥ 10
+- **兵 ¥ 20
+- **川 ¥ 1
+- 二万 ¥ 50
+- 蔚然成林 ¥ 10
+- 邹杰 ¥ 10
+- 张永强 ¥ 50
+- 鱼得水 ¥ 50
+- Ccther ¥ 1
+- Eric Cheng ¥ 10
+- 佚名 ¥ 1
+- 花叶 ¥ 50
+- GT ¥ 20
+- 菜菜心 ¥ 10
+- fisher ¥ 1
+- JC ¥ 5
+- 佚名 ¥ 20
+- 独孤一剑 ¥ 50
+- mxt ¥ 20
+- 一叶迷山 ¥ 100
+- Jeff ¥ 100
+- 八千多条狗🐶 ¥ 100
+- 晓峰 ¥ 10
+- 戒 ¥ 1
+- 浪里个浪 ¥ 1
+- 回调函数 ¥ 50
+- 赖瓜子 ¥ 5
+- Milo•J ¥ 20
+- 可道云 ¥ 200
+- *程 ¥ 10
+- 来一杯卡布酸奶 ¥ 5
+- 刘久胜 ¥ 100
+- 快意江湖 ¥ 50
+- *新 ¥ 9.9
+- **龙 ¥ 100
## Authors and acknowledgment
-### Team
+### Active Core Team Members
- [@wbfsa](https://github.com/wbfsa)
-- [@wpxp123456](https://github.com/wpxp123456)
+- [@eiji-th](https://github.com/eiji-th)
+- [@fly-95](https://github.com/fly-95)
- [@tonytonychopper123](https://github.com/tonytonychopper123)
- [@Dushusir](https://github.com/Dushusir)
+- [@iamxuchen800117](https://github.com/iamxuchen800117)
+- [@wpxp123456](https://github.com/wpxp123456)
- [@c19c19i](https://weibo.com/u/3884623955)
+- [@zhangchen915](https://github.com/zhangchen915)
+- [@jerry-f](https://github.com/jerry-f)
+- [@flowerField](https://github.com/flowerField)
-### Active participants
+### Community Partners
+- [@yiwasheng](https://github.com/yiwasheng)
- [@danielcai1987](https://github.com/danielcai1987)
- [@qq6690876](https://github.com/qq6690876)
- [@javahuang](https://github.com/javahuang)
- [@TimerGang](https://github.com/TimerGang)
- [@gsw945](https://github.com/gsw945)
- [@swen-xiong](https://github.com/swen-xiong)
-
-## Donate
-
-
+- [@lzmch](https://github.com/lzmch)
+- [@kdevilpf](https://github.com/kdevilpf)
+- [@WJWM0316](https://github.com/WJWM0316)
## License
[MIT](http://opensource.org/licenses/MIT)
diff --git a/deploy.bat b/deploy.bat
index a7d776b240991f959291decb66040230e6240fbd..51f8cdaac3441bbf57aa3b48f01960e85c14d251 100644
--- a/deploy.bat
+++ b/deploy.bat
@@ -3,10 +3,14 @@ npm run build
cd dist
git init
git remote add origin https://github.com/mengshukeji/LuckysheetDemo.git
+git config --local user.email "1414556676@qq.com"
+git config --local user.name "Dushusir"
git add .
git commit -m 'deploy Luckysheet demo'
git push -f origin master:gh-pages
+# ===============================================
+
# deploy Docs
npm run docs:build
cd docs/.vuepress/dist
@@ -16,6 +20,12 @@ git add .
git commit -m 'deploy Luckysheet docs'
git push -f origin master:gh-pages
+# ===============================================
+
+# add a tags
+git tag -a doc -m "doc"
+
+
# replease
npm run build
npm run release -- --release-as patch
@@ -29,3 +39,65 @@ npm run commit
npm version patch
git push -u origin master
npm publish
+
+
+# ==============================================
+
+# test feature branch
+git checkout -b fea origin/feature
+git pull
+
+## After some test, create PR merge feature to master branch
+
+git checkout master
+git branch -d fea
+
+# ===============================================
+
+# test pull request: https://docs.github.com/cn/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally
+
+# 139 is ID, dev is branch name
+git fetch origin pull/139/head:test-139
+git checkout test-139
+# test code
+git push origin test-139
+# create new PR ,merge test-139 to master
+
+# list all remote and local branchs
+git branch -a
+# delete remote branch
+git push origin --delete dev
+git checkout master
+# delete local branch
+git branch -d dev
+
+# pr
+## 1. fork 到自己的仓库
+
+## 2. git clone 到本地
+
+## 3. 上游建立连接
+git remote add upstream https://github.com/mengshukeji/Luckysheet.git
+
+## 4. 创建开发分支
+git checkout -b dev
+
+## 5. 修改提交代码
+git add .
+git commit -m "add"
+git push origin dev
+
+## 6. 同步代码，将最新代码同步到本地
+git fetch upstream
+git rebase upstream/master
+
+## 7. 如果有冲突（没有可以略过）
+git status # 查看冲突文件，并修改冲突
+git add .
+git rebase --continue
+
+## 8.提交分支代码
+git push origin dev
+
+## 7. 提交pr
+去自己github仓库对应fork的项目下new pull request
\ No newline at end of file
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 39f2bacc6ecb3591c86e01cf5b301065b3af87e9..e812419914f95d920ff793f73bea8b0dd6da8483 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -16,8 +16,9 @@ module.exports = {
},
themeConfig: {
+ domain: 'https://dream-num.github.io/LuckysheetDemo',
logo: '/img/logo.png',
-
+ author: 'Luckysheet',
// 仓库地址
repo: 'mengshukeji/Luckysheet',
// 允许编辑链接文字
@@ -42,7 +43,14 @@ module.exports = {
nav: [
{ text: 'Home', link: '/' },
{ text: 'Guide', link: '/guide/' },
- { text: 'Demo', link: 'https://mengshukeji.github.io/LuckysheetDemo/' }
+ { text: 'Demo', link: 'https://dream-num.github.io/LuckysheetDemo/' },
+ {
+ text: 'More',
+ ariaLabel: 'More',
+ items: [
+ { text: 'About', link: '/about/' }
+ ]
+ },
],
// 侧边栏
sidebar: {
@@ -53,7 +61,14 @@ module.exports = {
'cell',
'operate',
'api',
- 'FAQ'
+ 'resource',
+ 'FAQ',
+ 'contribute'
+ ],
+ '/about/': [
+ '',
+ 'sponsor',
+ 'company'
],
},
},
@@ -77,7 +92,14 @@ module.exports = {
nav: [
{ text: '首页', link: '/zh/' },
{ text: '指南', link: '/zh/guide/' },
- { text: '演示', link: 'https://mengshukeji.github.io/LuckysheetDemo/' }
+ { text: '演示', link: 'https://dream-num.github.io/LuckysheetDemo/' },
+ {
+ text: '了解更多',
+ ariaLabel: '了解更多',
+ items: [
+ { text: '关于', link: '/zh/about/' }
+ ]
+ },
],
// 侧边栏
sidebar: {
@@ -88,11 +110,38 @@ module.exports = {
'cell',
'operate',
'api',
- 'FAQ'
+ 'resource',
+ 'FAQ',
+ 'contribute'
+ ],
+ '/zh/about/': [
+ '',
+ 'sponsor',
+ 'company'
],
},
},
},
},
+ plugins: {
+ 'vuepress-plugin-baidu-autopush': {},
+ 'sitemap': {
+ hostname: 'https://dream-num.github.io/LuckysheetDocs'
+ },
+ 'vuepress-plugin-code-copy': true,
+ 'seo': {
+ siteTitle: (_, $site) => $site.title,
+ title: $page => $page.title,
+ description: $page => $page.frontmatter.description,
+ author: (_, $site) => $site.themeConfig.author,
+ tags: $page => $page.frontmatter.tags,
+ twitterCard: _ => 'summary_large_image',
+ type: $page => ['guide'].some(folder => $page.regularPath.startsWith('/' + folder)) ? 'article' : 'website',
+ url: (_, $site, path) => ($site.themeConfig.domain || '') + path,
+ image: ($page, $site) => $page.frontmatter.image && (($site.themeConfig.domain && !$page.frontmatter.image.startsWith('http') || '') + $page.frontmatter.image),
+ publishedAt: $page => $page.frontmatter.date && new Date($page.frontmatter.date),
+ modifiedAt: $page => $page.lastUpdated && new Date($page.lastUpdated),
+ }
+ }
}
\ No newline at end of file
diff --git a/docs/about/README.md b/docs/about/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..6ceeae8c021f1fc014581911448eb21f27304e7d
--- /dev/null
+++ b/docs/about/README.md
@@ -0,0 +1,28 @@
+# Meet the Team
+
+Luckysheet is a project led by an individual and jointly developed by several friends with the same interests.
+
+### Active Core Team Members
+- [@wbfsa](https://github.com/wbfsa)
+- [@eiji-th](https://github.com/eiji-th)
+- [@fly-95](https://github.com/fly-95)
+- [@tonytonychopper123](https://github.com/tonytonychopper123)
+- [@Dushusir](https://github.com/Dushusir)
+- [@iamxuchen800117](https://github.com/iamxuchen800117)
+- [@wpxp123456](https://github.com/wpxp123456)
+- [@c19c19i](https://weibo.com/u/3884623955)
+- [@zhangchen915](https://github.com/zhangchen915)
+- [@jerry-f](https://github.com/jerry-f)
+- [@flowerField](https://github.com/flowerField)
+
+### Community Partners
+- [@yiwasheng](https://github.com/yiwasheng)
+- [@danielcai1987](https://github.com/danielcai1987)
+- [@qq6690876](https://github.com/qq6690876)
+- [@javahuang](https://github.com/javahuang)
+- [@TimerGang](https://github.com/TimerGang)
+- [@gsw945](https://github.com/gsw945)
+- [@swen-xiong](https://github.com/swen-xiong)
+- [@lzmch](https://github.com/lzmch)
+- [@kdevilpf](https://github.com/kdevilpf)
+- [@WJWM0316](https://github.com/WJWM0316)
\ No newline at end of file
diff --git a/docs/about/company.md b/docs/about/company.md
new file mode 100644
index 0000000000000000000000000000000000000000..e01b43cd4b17e18866522a3b8a5a8a8a1ec61802
--- /dev/null
+++ b/docs/about/company.md
@@ -0,0 +1,49 @@
+# Community case
+
+We collected a lot of case feedback from the community, and also discovered Luckysheet usage scenarios that we did not expect before.
+
+It is our responsibility to actively listen to the voice of the community, and to continuously update and iterate with your support and feedback.
+
+
+## Company Case
+
+|
+
+
+
+ 雄安智评云数字科技有限公司 + |
+
+
+
+
+ Code the Future + |
+
+
+
+
+ 吉客云 + |
+
+
+
+
+ 华为 + |
+
| + | ++ | ++ | ++ | +
| |
+
+### What's the difference between Patreon and OpenCollective?
+
+Funds donated via Patreon go directly to support mengshukeji's work on Luckysheet. Funds donated via OpenCollective are managed with transparent expenses and will be used for compensating work and expenses for core team members or sponsoring community events. Your name/logo will receive proper recognition and exposure by donating on either platform.
+
+## Sponsors List
+
+(Sort by time)
+- *勇 ¥ 30
+- 虚我 ¥ 200
+- 甜党 ¥ 50
+- Alphabet(Google)-gcf ¥ 1
+- **平 ¥ 100
+- **东 ¥ 10
+- debugger ¥ 20
+- 烦了烦 ¥ 10
+- 文顶顶 ¥ 200
+- yangxshn ¥ 10
+- 爱乐 ¥ 100
+- 小李飞刀刀 ¥ 66
+- 张铭 ¥ 200
+- 曹治军 ¥ 1
+- *特 ¥ 10
+- **权 ¥ 9.9
+- **sdmq ¥ 20
+- *旭 ¥ 10
+- Quentin ¥ 20
+- 周宇凡 ¥ 100
+- *超 ¥ 10
+- 维宁 ¥ 100
+- hyy ¥ 20
+- 雨亭寒江月 ¥ 50
+- **功 ¥ 10
+- **光 ¥ 20
+- terrywan ¥ 100
+- 王晓洪 ¥ 10
+- Sun ¥ 10
+- 忧绣 ¥ 100
+- Jasonx ¥ 10
+- 国勇 ¥ 66.6
+- 郎志 ¥ 100
+- 匿名 ¥ 1
+- ni ¥ 100
+- 苏 ¥ 50
+- Mads_chan ¥ 1
+- LK ¥ 100
+- 智连方舟 李汪石 ¥ 168
+- **发 ¥ 260
+- *超 ¥ 10
+- *勇 ¥ 10
+- *腾 ¥ 15
+- 名字好难起 ¥ 20
+- 大山 ¥ 1
+- waiting ¥ 1000
+- **宇 ¥ 10.00
+- 刘小帅的哥哥 ¥ 20.00
+- 宁静致远 ¥ 10.00
+- Eleven ¥ 1.00
+- **帆 ¥ 188
+- henry ¥ 100
+- .波罗 ¥ 50
+- 花落有家 ¥ 50
+- 踏遍南水北山 ¥ 1
+- LC ¥ 5
+- **明 ¥ 8.80
+- *军 ¥ 20
+- 张彪 ¥ 50
+- 企业文档云@肖敏 ¥ 10
+- 匿名 ¥ 50
+- 逍遥行 ¥ 10
+- z.wasaki ¥ 50
+- Make Children ¥ 20
+- Foam ¥ 20
+- 奥特曼( o|o)ノ三 ¥ 50
+- **凯 ¥ 10
+- **兵 ¥ 20
+- **川 ¥ 1
+- 二万 ¥ 50
+- 蔚然成林 ¥ 10
+- 邹杰 ¥ 10
+- 张永强 ¥ 50
+- 鱼得水 ¥ 50
+- Ccther ¥ 1
+- Eric Cheng ¥ 10
+- 佚名 ¥ 1
+- 花叶 ¥ 50
+- GT ¥ 20
+- 菜菜心 ¥ 10
+- fisher ¥ 1
+- JC ¥ 5
+- 佚名 ¥ 20
+- 独孤一剑 ¥ 50
+- mxt ¥ 20
+- 一叶迷山 ¥ 100
+- Jeff ¥ 100
+- 八千多条狗🐶 ¥ 100
+- 晓峰 ¥ 10
+- 戒 ¥ 1
+- 浪里个浪 ¥ 1
+- 回调函数 ¥ 50
+- 赖瓜子 ¥ 5
+- Milo•J ¥ 20
+- 可道云 ¥ 200
+- *程 ¥ 10
+- 来一杯卡布酸奶 ¥ 5
+- 刘久胜 ¥ 100
+- 快意江湖 ¥ 50
+- *新 ¥ 9.9
+- **龙 ¥ 100
\ No newline at end of file
diff --git a/docs/guide/FAQ.md b/docs/guide/FAQ.md
index 7a0b90f23104a6e46284dda1727092a42483d9ea..2747772266376c3386f7fca0fafd5effe4a1ced4 100644
--- a/docs/guide/FAQ.md
+++ b/docs/guide/FAQ.md
@@ -1,8 +1,10 @@
# FAQ
-## **Q** What is the difference between data and celldata in luckysheetfile?
+The content of this chapter collects the common problems that everyone has feedback. If the official documents and this list can’t answer your questions, I recommend you to [Official Forum](https://github.com/mengshukeji/Luckysheet/discussions)
-**A**: Use one-dimensional array format [celldata](/zh/guide/sheet.html#celldata), after the initialization is completed, the data converted into a two-dimensional array format is used for storage and update, and celldata is no longer used.
+## What is the difference between data and celldata in luckysheetfile?
+
+**A**: Use one-dimensional array format [celldata](/guide/sheet.html#celldata), after the initialization is completed, the data converted into a two-dimensional array format is used for storage and update, and celldata is no longer used.
If you need to take out `data` as initial data, you need to execute [transToCellData(data)](/guide/api.html#transtocelldata-data-setting) to convert it to celldata data.
Among them, the celldata in `{ r, c, v }` format is converted to a two-dimensional array using [transToData(celldata)](/guide/api.html#transtodata-celldata-setting)
@@ -18,41 +20,41 @@ luckysheet.transToData(celldata)
------------
-## **Q** What are the cell types?
+## What are the cell types?
-**A**: Refer to [Cell Format List](/zh/guide/cell.html), with examples of available cell formats
+**A**: Refer to [Cell Format List](/guide/cell.html), with examples of available cell formats
------------
-## **Q** How to use Luckysheet in Vue/React project?
+## How to use Luckysheet in Vue/React project?
-**A**:
+**A**: Check
- Vue case: [luckysheet-vue](https://github.com/mengshukeji/luckysheet-vue)
- React case: [luckysheet-react](https://github.com/mengshukeji/luckysheet-react)
------------
-## **Q** Why will the formula in the table not be triggered after initialization?
+## Why will the formula in the table not be triggered after initialization?
-**A** : Refer to [Table data format](/zh/guide/sheet.html#calcchain) ,just set the calcChain corresponding to the cell data.
+**A**: Refer to [Table data format](/guide/sheet.html#calcchain) ,just set the calcChain corresponding to the cell data.
------------
-## **Q** Is the remote loading data loadUrl or updateUrl?
+## Is the remote loading data loadUrl or updateUrl?
-**A**: [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, the four parameters of loadUrl, loadSheetUrl, updateUrl and allowUpdate can be configured to take effect.
+**A**: [loadUrl](/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 parameter, while for collaborative editing, the four parameters of loadUrl, updateUrl and allowUpdate can be configured to take effect.
------------
-## **Q** What is the difference between `index` and `order` for each sheet page?
+## What is the difference between `index` and `order` for each sheet page?
**A**: Each sheet page has a unique id, which is `index`, which can be incremented by numbers or a random string. And `order` is the sorting situation of all sheets, starting from 0, can only be numbers `0,1,2...`.
------------
-## **Q** Why can’t I run the project directly under the dist folder?
+## Why can’t I run the project directly under the dist folder?
**A**: Need to start the local server
@@ -61,7 +63,7 @@ Note: Initial data needs to be configured with loadUrl and loadSheetUrl paramete
------------
-## **Q** How to import and export excel?
+## How to import and export excel?
**A**: The excel import and export library developed with Luckysheet-[Luckyexcel](https://github.com/mengshukeji/Luckyexcel) has realized the excel import function, and the export function is under development.You can refer to these 2 blog posts for excel export at this stage:
@@ -70,77 +72,77 @@ Note: Initial data needs to be configured with loadUrl and loadSheetUrl paramete
------------
-## **Q** How to merge cells during initialization?
+## How to merge cells during initialization?
**A**: Refer to the following case:
- [How Luckysheet initializes the data with merged cells](https://www.cnblogs.com/DuShuSir/p/13272397.html)
------------
-## **Q** How does 'Luckysheet' save the data from the table to the database? Is there a soulution for storage and collaboration?
+## How does 'Luckysheet' save the data from the table to the database? Is there a soulution for storage and collaboration?
-**A** :There are two options：
+**A**: There are two options:
- 1. after the table operation is completed, you can use `luckysheet.getAllSheets()` to get all sheet data that stroed in the back-end.
- 2. enable the collaborative editing function to transmit data to the back-end in real-time.
-refer this article：
+refer this article:
[How Luckysheet saves the data in the table to the database](https://www.cnblogs.com/DuShuSir/p/13857874.html)
------------
-## **Q** How to monitor cell hover or click events? how to monitor `cellRenderAfter` in real-time?
+## How to monitor cell hover or click events? how to monitor `cellRenderAfter` in real-time?
-**A** ：我们搜集到需要针对单元格事件的二次开发需求，规划了单元格相关的钩子函数，参考[单元格钩子函数](/zh/guide/config.html#cellrenderafter)（显示的TODO的暂未开放）
+**A**: We have collected the secondary development requirements for cell events, and planned the cell-related hook functions, refer to [cell hook function](/guide/config.html#cellrenderafter) (the TODO displayed is not yet open)
------------
-## **Q** How to customize the top toolbar?
+## How to customize the top toolbar?
-**A** ：
-reference: [options.showtoolbarconfig](/zh/guide/config.html#showtoolbarconfig)(TODO means waiting to developed)
+**A**:
+reference: [options.showtoolbarconfig](/guide/config.html#showtoolbarconfig)(TODO means waiting to developed)
------------
-## **Q** Does the project use jQuery?
+## Does the project use jQuery?
-**A** ：yes. At the beginning, Luckysheet uses jQuery。The packaging tool will package the jQuery to this file `./plugins/js/plugin.js`
+**A**: yes. At the beginning, Luckysheet uses jQuery。The packaging tool will package the jQuery to this file `./plugins/js/plugin.js`
If your project (such as react / Vue) also references jQuery globally and causes conflicts, you can try to remove a jQuery.
-if you want to remove jQuery in `Luckysheet`, you can find `jQuery` in source code folder `gulpfile.js`：[src/plugins/js/jquery.min.js](https://github.com/mengshukeji/Luckysheet/blob/master/gulpfile.js)，then delete information related to jQuery.
+if you want to remove jQuery in `Luckysheet`, you can find `jQuery` in source code folder `gulpfile.js`: [src/plugins/js/jquery.min.js](https://github.com/mengshukeji/Luckysheet/blob/master/gulpfile.js)，then delete information related to jQuery.
------------
-## **Q** How to add a field to a cell object?
+## How to add a field to a cell object?
-**A** reference [cell object format](/zh/guide/cell.html)，then read this annotation[src/controllers/postil.js](https://github.com/mengshukeji/Luckysheet/blob/master/src/controllers/postil.js)。the annotation is a configuration in a cell object.
+**A**: reference [cell object format](/guide/cell.html)，then read this annotation[src/controllers/postil.js](https://github.com/mengshukeji/Luckysheet/blob/master/src/controllers/postil.js)。the annotation is a configuration in a cell object.
------------
-## **Q** The toolbar icon is on the loading stage all the time.
+## The toolbar icon is on the loading stage all the time.
-**A** The luckysheet use iconfont icon in this project, if any icon cannot be loaded ,plz check your iconfont.css. we are so sorry that we did not describe it clearly in the old version documents.
+**A**: The luckysheet use iconfont icon in this project, if any icon cannot be loaded ,plz check your iconfont.css. we are so sorry that we did not describe it clearly in the old version documents.
-Now the documents have been updated.[official documents](/zh/guide/#使用步骤)
+Now the documents have been updated.[official documents](/guide/#steps-for-usage)
------------
-## **Q** Can't run Luckyexcel after package.
+## Can't run Luckyexcel after package.
-**A** Terminal does not show `end`, but if the `dist` folder has this file `luckyexcel.js`, it is normal.
+**A**: Terminal does not show `end`, but if the `dist` folder has this file `luckyexcel.js`, it is normal.
-Lucky excel is an excel import and export library. The project uses `gulp` as a packaging tool. There is a problem with the old version of the packaging tool, but it is fixed now. if this problem still troubles you, plz check the following steps：
+Lucky excel is an excel import and export library. The project uses `gulp` as a packaging tool. There is a problem with the old version of the packaging tool, but it is fixed now. if this problem still troubles you, plz check the following steps:
1. pull the latest code.
2. `npm i`
3. `npm run build`
-more information：[Luckyexcel](https://github.com/mengshukeji/Luckyexcel/)
+more information: [Luckyexcel](https://github.com/mengshukeji/Luckyexcel/)
------------
-## **Q** How to disable editing of cells？How to open sheet protection?
+## How to disable editing of cells？How to open sheet protection?
-**A** Sheet protection includes disable editing of cells that you need to make some configurations on each sheets. `config.authority`, the latest configurations[sheet protection](/zh/guide/sheet.html#config-authority)。
+**A**: Sheet protection includes disable editing of cells that you need to make some configurations on each sheets. `config.authority`, the latest configurations[sheet protection](/guide/sheet.html#config-authority)。
In order to make it easier for you to understand the function of sheet protection, the following video shows how to make the whole sheet uneditable, but allow a column of cells to be edited:
@@ -150,21 +152,21 @@ In you local browser, you can open the control pannel, use `luckysheet.getLuckys
------------
-## **Q** How to configure data validation?
+## How to configure data validation?
-**A** there is the configuration of data validation，[data validation](/zh/guide/sheet.html#dataVerification)。Also there is the API that you can use `data validation` in any time. [setDataVerification](/zh/guide/api.html#setdataverification-optionitem-setting).
+**A**: there is the configuration of data validation，[data validation](/guide/sheet.html#dataVerification)。Also there is the API that you can use `data validation` in any time. [setDataVerification](/guide/api.html#setdataverification-optionitem-setting).
------------
-## **Q** Is there a case for using Luckysheet with CDN?
+## Is there a case for using Luckysheet with CDN?
-**A** Luckysheet supports CDN. reference：[The case of using luckysheet by CDN](https://www.cnblogs.com/DuShuSir/p/13859103.html)
+**A**: Luckysheet supports CDN. reference: [The case of using luckysheet by CDN](https://www.cnblogs.com/DuShuSir/p/13859103.html)
------------
-## **Q** how to limit the adaptive height of a picture in a cell？
+## how to limit the adaptive height of a picture in a cell？
-**A** First of all, you need to move the picture and adjust the cell size, and then there are the following situations:
+**A**: First of all, you need to move the picture and adjust the cell size, and then there are the following situations:
- if the cell contains a picture and you expand the cell, the picure will not be expanded.
- if the cell contains a picture and you shorten the cell to the edge of the picture, the picture will shrink.
@@ -176,11 +178,148 @@ if you want to get the position of the picture, you can overlap the picture with
------------
-## **Q** How to get the default row height and column width of the worksheet?
+## How to get the default row height and column width of the worksheet?
-**A** There are two ways to get it
+**A**: There are two ways to get it
- 1. use `luckysheet.getLuckysheetfile()` to get all configuration data, so you can get the `defaultRowHeight` and `defaultColWidth` in the sheet configuration data。
-- 2. use API to get the default row height [getDefaultRowHeight](/zh/guide/api.html#getdefaultrowheight-setting) and column width.[getDefaultColWidth](/zh/guide/api.html#getdefaultcolwidth-setting)
+- 2. use API to get the default row height [getDefaultRowHeight](/guide/api.html#getdefaultrowheight-setting) and column width.[getDefaultColWidth](/guide/api.html#getdefaultcolwidth-setting)
+
+------------
+
+## How to hide the add row button and the back to top button below the worksheet?
+
+**A**: Configuration is open
+- Allow adding rows [enableAddRow](/guide/config.html#enableaddrow)
+- Allow back to top [enableAddBackTop](/guide/config.html#enableAddBackTop)
+
+------------
+
+## How to hide the row and column headings of the worksheet?
+
+**A**: Configuration is open
+- The width of the row header area [rowHeaderWidth](/guide/config.html#rowheaderwidth)
+- The height of the column header area [columnHeaderHeight](/guide/config.html#columnHeaderHeight)
+
+------------
+
+## What method can be called to set `config.merge`?
+
+**A**: Three methods
+- Interface operation
+- Use API: [setRangeMerge](/guide/api.html#setrangemerge-type-setting)
+- Manually assemble merge parameters
+
+------------
+
+## Why is the official new feature ineffective?
+
+**A**: The first step is to check whether you have used CDN to import,
+
+The CDN link used in the Luckysheet tutorial is the service provided by [jsdelivr](https://www.jsdelivr.com/package/npm/luckysheet), and the code is from [npmjs.com](https://www.npmjs.com/) automatically sync the past, not from [Github](https://github.com/mengshukeji/Luckysheet/). Because our newly submitted code still needs to be tested for a period of time, it will not be released to npm immediately, causing the npm code to lag behind Github.
+
+If you need to try the latest code, we strongly recommend that you pull the code from the [Luckysheet Github](https://github.com/mengshukeji/Luckysheet/) main repository. After our version is stable, we will consider releasing the npm package in real time.
+
+The second step, if it is to import the packaged code of the github repository, test to determine whether there is a bug, you can find the problem and try to fix it, and then [submit a PR](https://github.com/mengshukeji/Luckysheet/pulls), if can't fix it, please [submit issues](https://github.com/mengshukeji/Luckysheet/issues).
+
+------------
+
+## `npm run dev` reported an error: ʻError: Cannot find module'rollup'`?
+
+**A**: It may be a problem with the npm package installation, try the following steps:
+1. `npm cache clean --force`
+2. `npm i rimraf -g`
+3. `rimraf node_modules`
+4. Delete the package-lock.json file
+5. `npm i`
+6. `npm run dev`
+
+Tip: Most other npm installation problems can also be solved by trying above steps.
+
+------------
+
+## How to carry out secondary development of Luckysheet in Vue project?
+
+**A**: 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
+
+------------
+
+## Error reporting `Store.createChart` when creating chart?
+
+**A**: You need to introduce a chart plugin to use it. You should configure the chart plugin to use when the workbook is initialized. Refer to
+
+- Plugins configuration [plugins](/guide/config.html#plugins)
+- 或 官方demo [src/index.html](https://github.com/mengshukeji/Luckysheet/blob/master/src/index.html)
+
+------------
+
+## Can cells add custom attributes?
+
+**A**: The custom attributes directly assigned to the cell object will be filtered. To make the custom attributes take effect, you need to edit the code to remove the filter attributes.
+
+------------
+
+## How to enter text starting with `'='`? For example, `=currentDate('YYYY-MM-DD')`, it will remove the function by default, how to prohibit the function?
+
+**A**: Just add a single quotation mark in front of it, and it will be forcibly recognized as a string, which is consistent with excel. For example: `'=currentDate('YYYY-MM-DD')`
+
+------------
+
+## Why does the create callback have no effect?
+
+**A**: The API method `luckysheet.create()` does not have a callback, but Luckysheet provides a hook function to execute the callback method at a specified location, such as:
+- Triggered before the workbook is created [workbookCreateBefore](/guide/config.html#workbookcreatebefore)
+- Triggered after the workbook is created [workbookCreateAfter](/guide/config.html#workbookcreateafter)
+
+------------
+
+## When create, the first cell is selected by default, how to remove it?
+
+**A**: When the cell is selected, it is highlighted by default, just remove the highlight, use API: [setRangeShow](/guide/api.html#setrangeshow-range-setting)
+
+```js
+luckysheet.setRangeShow("A2",{show:false})
+```
+
+------------
+
+## Where is the right-click event bound?
+
+**A**: In the source code [src/controllers/hander.js](https://github.com/mengshukeji/Luckysheet/blob/master/src/controllers/handler.js), search for `event.which == "3"` to find the code executed by the right-click event.
+
+------------
+
+## How to add a custom toolbar?
+
+**A**: No configuration is currently provided, you can refer to the implementation of the print button in the toolbar to modify the source code:
+1. Search for `luckysheet-icon-print` globally to find the implementation of the print button, in [src/controllers/constant.js](https://github.com/mengshukeji/Luckysheet/blob/master/src/controllers/constant.js) add a similar template string, you need to customize a unique id
+2. Modify [src/controllers/resize.js](https://github.com/mengshukeji/Luckysheet/blob/master/src/controllers/resize.js) and add a new record in the toobarConfig object
+3. Modify [src/controllers/menuButton.js](https://github.com/mengshukeji/Luckysheet/blob/master/src/controllers/menuButton.js) to add an event listener
+
+------------
+
+## How to add custom formulas?
+
+**A**: Two source codes need to be modified:
+1. Add a formula to the `functionImplementation` object in the [src/function/functionImplementation.js](https://github.com/mengshukeji/Luckysheet/blob/master/src/function/functionImplementation.js) file, format refer to formulas such as `SUM`/`AVERAGE`
+2. Modify all the language packs in the [src/locale](https://github.com/mengshukeji/Luckysheet/blob/master/src/locale) file directory, and add the new formula description to the `functionlist` array in. Among them, `t` is the category of the function, `m` is the number of parameters, the minimum number of parameters and the maximum number of parameters.
+
+------------
+
+## Is there a similar loadData interface, I want to load 10 records first, and then dynamically load the data, these data are appended to the table?
+
+**A**: Yes. Our `loadSheetUrl` provides this function, which can be turned on by initializing `options.enablePage = true`.
+
+Searching for `enablePage` in the source code, you can see that there is a `method.addDataAjax` method, which contains an ajax request to dynamically load data, which will be appended to the worksheet.
+
+This function is now hidden in the document, because when we made this interface, the interface parameters were matched according to our actual business, which may not be universal. We are going to abstract and release it for everyone to use. If you want to use it yourself you can change it based on this.
+
+It is recommended that you consider writing your own interface to load the data, and then use `setRangeValue` to append the data at the specified location, which has a higher degree of customization.
------------
\ No newline at end of file
diff --git a/docs/guide/README.md b/docs/guide/README.md
index 7141366d3eaecafa69591e6826431fc420eee315..32f5b7b3f4aa1516ab1c48b5fcc5346c14643925 100644
--- a/docs/guide/README.md
+++ b/docs/guide/README.md
@@ -4,13 +4,17 @@
Luckysheet is an online spreadsheet like excel that is powerful, simple to configure, and completely open source.
## Demo
-[Online demo](https://mengshukeji.github.io/LuckysheetDemo/)
+[Online demo](https://dream-num.github.io/LuckysheetDemo/)
+## Online Case
+
+- [Cooperative editing demo](http://luckysheet.lashuju.com/demo/)(Note: The official Java backend will also be open source after finishing,using OT algorithm. Please do not operate frequently to prevent the server from crashing)
+
## Features
-### Formatting
+### 🛠️Formatting
+ **Styling** (Change font style, size, color, or apply effects)
+ **Conditional formatting** (highlight interesting cells or ranges of cells, emphasize unusual values, and visualize data by using data bars, color scales, and icon sets that correspond to specific variations in the data)
+ **Align or rotate text**
@@ -18,8 +22,9 @@ Luckysheet is an online spreadsheet like excel that is powerful, simple to confi
+ **Data types**
+ **currency, percentages, decimals, dates**
+ **Custom** (E.g `##,###0.00` , `$1,234.56$##,###0.00_);[Red]($##,###0.00)`, `_($* ##,###0.00_);_(...($* "-"_);_(@_)`, `08-05 PM 01:30MM-dd AM/PM hh:mm` )
++ **Cell segmentation style** (Alt+Enter line break, sub,super, in-cell style)
-### Cells
+### 🧬Cells
+ **Move cells by drag and dropping** (Operate on selection)
+ **Fill handle** (For a series like 1, 2, 3, 4, 5..., type 1 and 2 in the first two cells. For the series 2, 4, 6, 8..., type 2 and 4. Support arithmetic sequence, geometric sequence,date, week,chinese numbers)
+ **Auto Fill Options** (Fill copy, sequence, only format, no format, day, month, year)
@@ -27,20 +32,21 @@ Luckysheet is an online spreadsheet like excel that is powerful, simple to confi
+ **Find and replace** (Such as a particular number or text string, Support regular expression, whole word, case sensitive)
+ **Location** (Cells can be selected according to the data type)
+ **Merge cells**
++ **Data validation** (Checkbox, drop-down list, datePicker)
-### Row & columns
+### 🖱️Row & columns
+ **Hide, Insert, Delete rows and columns**
+ **Frozen rows and columns** (First row, first column, Frozen to selection, freeze adjustment lever can be dragged)
+ **Split text** (Split text into different columns with the Convert Text to Columns Wizard)
-### Operation
+### 🔨Operation
+ **Undo/Redo**
-+ **Copy/Paste/Cut** (Copy from excel to luckysheet with format, vice versa)
++ **Copy/Paste/Cut** (Copy from excel to Luckysheet with format, vice versa)
+ **Hot key** (The operating experience is consistent with excel, if there are differences or missing, please feedback to us)
+ **Format Painter** (Similar to google sheet)
+ **Selection by drag and dropping** (Change the parameters of formula and chart through selection)
-### Formulas & functions
+### ⚙️Formulas & functions
+ **Built-in formulas**
+ Math (SUMIFS, AVERAGEIFS, SUMIF, SUM, etc.)
+ Text (CONCATENATE, REGEXMATCH, MID)
@@ -53,39 +59,41 @@ Luckysheet is an online spreadsheet like excel that is powerful, simple to confi
+ **Remote formulas** (DM_TEXT_TFIDF, DM_TEXT_TEXTRANK,DATA_CN_STOCK_CLOSE etc. Need remote interface, can realize complex calculation)
+ **Custom** (Some formula suitable for use in China have been added. AGE_BY_IDCARD, SEX_BY_IDCARD, BIRTHDAY_BY_IDCARD, PROVINCE_BY_IDCARD, CITY_BY_IDCARD, etc. You can define any formula you want)
-### Tables
+### 📐Tables
+ **Filters** (Support color , numerical, date, text filtering)
+ **Sort** (Sort multiple fields simultaneously)
-### Pivot table
+### 📈Pivot table
+ **Arrange fields** (Add fileds to rows, columns, values, area, it is similar to excel)
+ **Aggregation** (Surport Sum,Count,CountA,CountUnique,Average,Max,Min,Median,Product,Stdev,Stdevp,Var,VarP etc.)
+ **Filter data** (Add fileds to filters area and analyze the desired data )
+ **Drill down** (Double click pivot table cell to drill down for detail data )
+ **Create a PivotChart** (Pivot table can create a chart )
-### Chart
+### 📊Chart
+ **Support types** (Line, Column, Area, Bar, Pie, comming soon Scatter, Radar, Gauge, Funnel etc.)
+ **Chart Plugins** (Link to another project [ChartMix](https://github.com/mengshukeji/chartMix)(MIT): ECharts is currently supported,Highcharts, Ali G2, amCharts, googleChart, chart.js are being developed gradually)
+ **Sparklines** (Support by formula : Line, Pie, Box, Pie etc.)
-### Share
+### ✍️Share
+ **Comments** (Add, delete, update)
+ **Collaborate** (Simultaneous editing by multiple users)
-### LuckySheet
+### 📚Insert object
++ **Insert picture** (JPG,PNG,SVG and so on)
+
+### ⚡Luckysheet
+ **Matrix operation** (Operate selection through the right-click menu: transpose, rotate, numerical calculation)
+ **Screenshot** (Take a screenshot with selection)
+ **Copy to** (In the right-click menu, copy selection to json, array etc.)
-+ **EXCEL,CSV,TXT import/export** (Specially adapted to luckysheet)
-+ **Insert picture and Shapes** (JPG,PNG,SVG,Pen tool and so on)
-+ **Data validation** (Checkbox, drop-down list, datePicker)
-+ **Cell segmentation style** (Alt+Enter line break, sub,super, in-cell style)
++ **EXCEL import/export** (Specially adapted to Luckysheet, export is under development)
-### Coming soon
+### ⏱️Coming soon
+ **Print** (Like excel print option, save to PDF)
+ **Tree menu** (Just like the outline (group) function of excel)
+ **Table new Features** (filter, slicer)
++ **CSV,TXT import/export** (Specially adapted to Luckysheet)
++ **Insert Shapes** ([Pen tool](https://github.com/mengshukeji/Pentool) Shapes)
+ **Documentation** (Improve documentation and API)
+ **More...** (Please advise us)
@@ -118,15 +126,19 @@ There are two ways to introduce dependencies
#### CDN
```html
-
-
-
-
-
-
+
+
+
+
+
+
```
-Note that `https://cdn.jsdelivr.net/npm/luckysheet/dist/luckysheet.umd.js` will pull the latest luckysheet code. If you want to specify the luckysheet version, please add the version number after the luckysheet , Such as: `https://cdn.jsdelivr.net/npm/luckysheet@2.0.0/dist/luckysheet.umd.js`
+Note that the path of `https://cdn.jsdelivr.net/npm/luckysheet@latest/dist/luckysheet.umd.js` means that the latest luckysheet code will be pulled, but if Luckysheet has just been released, the jsdelivr website may not have time Synchronize from npm, so using this path will still pull to the previous version. We recommend that you directly specify the latest version.
+
+To specify the Luckysheet version, please add the version number after all CDN dependent files, such as: `https://cdn.jsdelivr.net/npm/luckysheet@2.1.12/dist/luckysheet.umd.js`.
+
+> How do I know which version is the latest version? View the latest [release record](https://github.com/mengshukeji/Luckysheet/releases) or [package.json](https://github.com/mengshukeji/Luckysheet/blob/master/package.json)` version` field.
If it is not convenient to access jsdelivr.net, you can also import it locally
@@ -237,8 +249,8 @@ You can see the complete settings
If you encounter problems with Luckysheet, follow the steps below to find the answer
1. Use Doge or Google to search for common technical issues
-2. For Luckysheet related issues, please view [Luckysheet Official Document](https://mengshukeji.github.io/LuckysheetDocs/)(Note that the function of marking TODO has not yet been implemented)
-3. Search [FAQ List](https://mengshukeji.github.io/LuckysheetDocs/guide/FAQ.html)
+2. For Luckysheet related issues, please view [Luckysheet Official Document](https://dream-num.github.io/LuckysheetDocs/)(Note that the function of marking TODO has not yet been implemented)
+3. Search [FAQ List](https://dream-num.github.io/LuckysheetDocs/guide/FAQ.html)
4. Search [Official Forum](https://groups.google.com/g/luckysheet) to see if anyone has encountered it
5. Try to check or experiment by yourself to find the answer
6. Please try to read the source code to find the answer,
diff --git a/docs/guide/api.md b/docs/guide/api.md
index bdd25b03beda2bcb6f0bf5944a6177ba8147249d..6ee77b6907f84831e4f7893cf5a526b62ab185d9 100644
--- a/docs/guide/api.md
+++ b/docs/guide/api.md
@@ -6,6 +6,7 @@ Use note:
1. When script is introduced globally, all APIs are mounted under the window.luckysheet object, which can be printed and seen in the browser console; when npm is introduced, all APIs are also mounted under the luckysheet object
2. The first parameter of the `success` callback function is the return value of the API method
3. If you need a new API, please submit it to github [Issues](https://github.com/mengshukeji/Luckysheet/issues/new/choose), and decide whether to open the new API according to the number of likes
+4. The required `order` parameter in the API method is the value of `order` in the worksheet object, not `index`
## Cell operation
@@ -175,6 +176,7 @@ Use note:
+ {Boolean} [isWholeWord]: Whether to match the whole word; the default is `false`
+ {Boolean} [isCaseSensitive]: Whether to match case sensitively; the default is `false`
+ {Number} [order]: Worksheet subscript; the default value is the current worksheet subscript
+ + {String} [type]: cell attribute; the default value is `"m"`
- **Explanation**：
@@ -184,6 +186,8 @@ Use note:
- Find the string `"value"` in the current worksheet
`luckysheet.find("value")`
+ - Find cells in the current worksheet whose formula contains `"SUM"`
+ `luckysheet.find("SUM",{type:"f"})`
------------
@@ -316,6 +320,16 @@ Use note:
Pay special attention to the setting of `range` in `setting` only when `isRange` is set to `true`, which is different from the general range format.
+ If you want to use this API to set the freeze after the workbook is initialized, you can execute it in the hook function after the workbook is created, such as:
+ ```js
+ luckysheet.create({
+ hook:{
+ workbookCreateAfter:function(){
+ luckysheet.setBothFrozen(false);
+ }
+ }
+ });
+
- **Usage**:
- Frozen ranks
@@ -571,7 +585,7 @@ Use note:
- **Parameter**：
- - {Number} [columnInfo]: Correspondence between the number of columns and the width
+ - {Object} [columnInfo]: Correspondence between the number of columns and the width
- {PlainObject} [setting]: optional parameters
+ {Number} [order]: Worksheet subscript; the default value is the current worksheet subscript
@@ -714,6 +728,179 @@ Use note:
------------
+
+### getRangeWithFlatten()
+
+- **Explanation**：
+
+ Returns an array representing the positions of all cells in the specified area, which is different from the getrange method, which organizes the data of the selection by cell (rather than a continuous area).
+
+- **Usage**:
+
+ - Select the specified area in the table, and then execute
+
+ `luckysheet.getRange()`
+
+ The returned result is:
+ ```json
+ [
+ {"row":[0,0],"column":[0,2]},
+ {"row":[1,1],"column":[0,0]},
+ {"row":[3,3],"column":[0,0]}
+ ]
+ ```
+ Where，{"row":[0,0],"column":[0,2]} denote a whole continuous region.
+
+ - Select the area above in the table and execute
+
+ `luckysheet.getRangeWithFlatten()`
+
+ The returned result is:
+ ```json
+ [
+ {"r":0,"c":0},
+ {"r":0,"c":1},
+ {"r":0,"c":2},
+ {"r":1,"c":0},
+ {"r":3,"c":0}
+ ]
+ ```
+
+------------
+
+
+### getRangeValuesWithFlatte()
+
+- **Explanation**：
+
+ Returns an array of objects representing the contents of all cells in a specified range
+
+- **Usage**:
+
+ - Select the specified area in the table, and then execute
+
+ `luckysheet.getRange()`
+
+ The returned result is:
+ ```json
+ [
+ {"row":[0,0],"column":[0,2]},
+ {"row":[1,1],"column":[0,0]},
+ {"row":[3,3],"column":[0,0]}
+ ]
+ ```
+ Where，{"row":[0,0],"column":[0,2]} denote a whole continuous region.
+
+ - Select the area above in the table and execute
+
+ `luckysheet.getRangeValuesWithFlatte()`
+
+ The returned result is:
+ ```json
+ [
+ {
+ "bg": null,
+ "bl": 0,
+ "it": 0,
+ "ff": 0,
+ "fs": 11,
+ "fc": "rgb(51, 51, 51)",
+ "ht": 1,
+ "vt": 1,
+ "v": 1,
+ "ct": {
+ "fa": "General",
+ "t": "n"
+ },
+ "m": "1"
+ },
+ {
+ "bg": null,
+ "bl": 0,
+ "it": 0,
+ "ff": 0,
+ "fs": 11,
+ "fc": "rgb(51, 51, 51)",
+ "ht": 1,
+ "vt": 1,
+ "v": 2,
+ "ct": {
+ "fa": "General",
+ "t": "n"
+ },
+ "m": "2"
+ },
+ {
+ "bg": null,
+ "bl": 0,
+ "it": 0,
+ "ff": 0,
+ "fs": 11,
+ "fc": "rgb(51, 51, 51)",
+ "ht": 1,
+ "vt": 1,
+ "v": 3,
+ "ct": {
+ "fa": "General",
+ "t": "n"
+ },
+ "m": "3"
+ },
+ {
+ "v": "Background",
+ "ct": {
+ "fa": "General",
+ "t": "g"
+ },
+ "m": "Background",
+ "bg": null,
+ "bl": 1,
+ "it": 0,
+ "ff": 0,
+ "fs": 11,
+ "fc": "rgb(51, 51, 51)",
+ "ht": 1,
+ "vt": 1
+ },
+ {
+ "v": "Border",
+ "ct": {
+ "fa": "General",
+ "t": "g"
+ },
+ "m": "Border",
+ "bg": null,
+ "bl": 1,
+ "it": 0,
+ "ff": 0,
+ "fs": 11,
+ "fc": "rgb(51, 51, 51)",
+ "ht": 1,
+ "vt": 1
+ }
+ ]
+ ```
+------------
+
+### getRangeAxis()
+
+- **Explanation**：
+
+ Returns an array of coordinate strings corresponding to the current selection. Multiple selections may exist. Each selection may be a single cell (such as A1) or a rectangular region of multiple cells (such as D9: E12)
+
+- **Usage**:
+
+ - The current selection is"E10:E14"、"A7:B13"、"C4"、 "A3" and "C6:D9", execute
+
+ `luckysheet.getRangeAxis()`
+
+ The returned result is:
+ ```json
+ ["E10:E14", "A7:B13", "C4", "A3", "C6:D9"]
+ ```
+
+------------
+
### getRangeValue([setting])
- **Parameter**：
@@ -850,7 +1037,6 @@ Use note:
------------
### getRangeJson(title [,setting])
-
- **Parameter**：
@@ -877,8 +1063,7 @@ Use note:
The returned result is:
```json
[
- { "A": "value1", "B": "value3" },
- { "A": "value2", "B": "value4" }
+ { "value1": "value2", "value3": "value4" }
]
```
@@ -889,7 +1074,8 @@ Use note:
The returned result is:
```json
[
- { "value1": "value2", "value3": "value4" }
+ { "A": "value1", "B": "value3" },
+ { "A": "value2", "B": "value4" }
]
```
@@ -1102,8 +1288,6 @@ Use note:
### setRangeShow(range [,setting])
-[todo]
-
- **Parameter**：
- {Array | Object | String} [range]: The range of the selection, the format of the supported selection 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
@@ -1201,7 +1385,7 @@ Use note:
}
]
]
- luckysheet.setRangeValue(data)
+ luckysheet.setRangeValue(data,{range:"A1:B2"})
```
------------
@@ -1746,9 +1930,9 @@ Use note:
+ `"flipLeftRight"`: flip left and right
+ `"flipClockwise"`: rotate clockwise
+ `"flipCounterClockwise"`: rotate counterclockwise
- + `"Transpose"`: Transpose
- + `"DeleteZeroByRow"`: delete 0 values at both ends by row
- + `"DeleteZeroByColumn"`: delete zero values at both ends by column
+ + `"transpose"`: Transpose
+ + `"deleteZeroByRow"`: delete 0 values at both ends by row
+ + `"deleteZeroByColumn"`: delete zero values at both ends by column
+ `"removeDuplicateByRow"`: delete duplicate values by row
+ `"removeDuplicateByColumn"`: remove duplicate values by column
+ `"newMatrix"`: Produce a new matrix
@@ -1828,7 +2012,7 @@ Use note:
Return all worksheet configurations, the format is the same as the worksheet configuration, and the results obtained can be used as options.data when the form is initialized.
- Therefore, this API is suitable for manually operating and configuring a table, and then taking out all the worksheet information to save it, and then use it for table creation in other places. If you want to get all the workbook data including the workbook configuration, you can use [toJson](#toJson())
+ Therefore, this API is suitable for manually operating and configuring a table, and then taking out all the worksheet information to save it, and then use it for table creation in other places. If you want to get all the workbook data including the workbook configuration, it is recommended to use [toJson](#toJson()), and it can be directly used to initialize Luckysheet.
- **Usage**:
@@ -1892,9 +2076,6 @@ Use note:
### getConfig([setting])
-[todo]
-
-
- **Parameter**：
- {PlainObject} [setting]: optional parameters
@@ -1908,9 +2089,6 @@ Use note:
### setConfig([setting])
-[todo]
-
-
- **Parameter**：
- {PlainObject} [setting]: optional parameters
@@ -1921,6 +2099,19 @@ Use note:
Quickly set the current worksheet config configuration
+------------
+### updataSheet([setting])
+
+- **参数**：
+
+ - {PlainObject} [setting]: optional parameters
+ + {Array} [data]: Worksheet Configuration
+ + {Function} [success]: callback function for the end of the operation
+
+- **说明**：
+
+ Update the corresponding sheet according to the set sheet configuration
+
------------
### setSheetAdd([setting])
@@ -2269,9 +2460,6 @@ Use note:
### scroll([setting])
-[todo]
-
-
- **参数**：
- {PlainObject} [setting]: optional parameters
@@ -2331,8 +2519,6 @@ Use note:
### setWorkbookName(name [,setting])
-[todo]
-
- **Parameter**：
- {Number} [name]: Workbook name
@@ -2345,6 +2531,19 @@ Use note:
------------
+### getWorkbookName(name [,setting])
+
+- **Parameter**：
+
+ - {PlainObject} [setting]: optional parameters
+ + {Function} [success]: callback function for the end of the operation
+
+- **Explanation**：
+
+ get workbook name
+
+------------
+
### undo([setting])
[todo]
@@ -2379,17 +2578,41 @@ Use note:
### refreshFormula([setting])
-[todo]
+- **Parameter**：
+
+ - {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.
+
+------------
+
+### refreshMenuButtonFocus([data],[r],[c],[success])
- **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
+ - {Array} [data]: Operational data
+ - {Number} [r]: Specified row
+ - {Number} [c]: Specified column
+ - {Function} [success]: callback function for the end of the operation
+
+- **Explanation**：
+
+ Refreshes the top status bar status of the specified cell.
+
+------------
+
+### checkTheStatusOfTheSelectedCells(type,status)
+
+- **Parameter**：
+
+ - {String} type: type
+ - {String} status: Target state value
- **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.
+ Check whether the status of all specified types of cells in the selection meets the conditions (mainly bold, italics, strikeouts, underscores, etc.).
------------
@@ -2568,8 +2791,6 @@ Use note:
### toJson()
-[todo]
-
- **Explanation**：
The exported json string can be directly used as the parameter `options` when the workbook is initialized by `luckysheet.create(options)`. The usage scenario is to manually save all the parameters after the user manipulates the table, and then initialize the table elsewhere. Use, similar to the import and export of a luckysheet proprietary format.
diff --git a/docs/guide/config.md b/docs/guide/config.md
index d50edd709d39241ab1bb64b4cad3349b70818259..c03224f7056b2ff6b8140f6830dc529502689015 100644
--- a/docs/guide/config.md
+++ b/docs/guide/config.md
@@ -28,7 +28,6 @@ Luckysheet has opened more detailed custom configuration options, which are as f
- Customize the toolbar ([showtoolbarConfig](#showtoolbarConfig))
- Customize the bottom sheet bar ([showsheetbarConfig](#showsheetbarConfig))
- Customize the counting bar ([showstatisticBarConfig](#showstatisticBarConfig))
-- Custom add row and back to the top ([sheetBottomConfig](#sheetBottomConfig))
- Custom cell right-click menu ([cellRightClickConfig](#cellRightClickConfig))
- Customize the right-click menu of the bottom sheet bar ([sheetRightClickConfig](#sheetRightClickConfig))
@@ -59,24 +58,22 @@ The following are all supported setting parameters
- Customize the bottom sheet bar [showsheetbarConfig](#showsheetbarConfig)
- The bottom count bar [showstatisticBar](#showstatisticBar)
- Custom Count Bar [showstatisticBarConfig](#showstatisticBarConfig)
-- Custom add row and back to top [sheetBottomConfig](#sheetBottomConfig)
-- Allow editing [allowEdit](#allowEdit)
- Allow adding rows [enableAddRow](#enableAddRow)
-- Allow adding columns [enableAddCol](#enableAddCol)
+- Allow back to top [enableAddBackTop](#enableAddBackTop)
- User Info [userInfo](#userInfo)
- User Information Menu [userMenuItem](#userMenuItem)
- Back button link [myFolderUrl](#myFolderUrl)
- Ratio [devicePixelRatio](#devicePixelRatio)
- Function Button [functionButton](#functionButton)
- Auto-indent interface [showConfigWindowResize](#showConfigWindowResize)
-- Load the next page [enablePage](#enablePage)
- Refresh formula [forceCalculation](#forceCalculation)
- Custom cell right-click menu [cellRightClickConfig](#cellRightClickConfig)
- Customize the right-click menu of the bottom sheet bar [sheetRightClickConfig](#sheetRightClickConfig)
-- Whether to show the row number area [showRowBar](#showRowBar)
-- Whether to show the column number area [showColumnBar](#showColumnBar)
+- The width of the row header area [rowHeaderWidth](#rowHeaderWidth)
+- The height of the column header area [columnHeaderHeight](#columnHeaderHeight)
- Whether to show the formula bar [sheetFormulaBar](#sheetFormulaBar)
- Initialize the default font size [defaultFontSize](#defaultFontSize)
+- Pager [pager](#pager)
### container
- Type: String
@@ -93,7 +90,7 @@ The following are all supported setting parameters
### lang
- Type: String
- Default: "en"
-- Usage: Internationalization settings, allowing to set the language of the workbook, supporting Chinese ("zh") and English ("en")
+- Usage: Internationalization settings, allow to set the language of the table, support simplified Chinese ("zh"), English ("en") and traditional Chinese ("zh_tw") and Spanish ("es")
------------
### gridKey
@@ -204,7 +201,8 @@ Note that you also need to configure `loadUrl` and `loadSheetUrl` to take effect
bold: false, //'Bold (Ctrl+B)'
italic: false, //'Italic (Ctrl+I)'
strikethrough: false, //'Strikethrough (Alt+Shift+5)'
- textColor: false, //'Text color'
+ underline: false, // 'Underline (Alt+Shift+6)'
+ textColor: false, //'Text color'
fillColor: false, //'Cell color'
border: false, //'border'
mergeCell: false, //'Merge cells'
@@ -349,27 +347,6 @@ Note that you also need to configure `loadUrl` and `loadSheetUrl` to take effect
}
}
```
-------------
-### sheetBottomConfig
-
-[todo]
-
-- Type: Object
-- Default: {}
-- Usage: Add row button and back to top button configuration below the worksheet
-- Format:
- ```json
- {
- addRow: false, // Add row button
- backTop: false // Back to the top
- }
-
-------------
-### allowEdit
-- Type: Boolean
-- Default: true
-- Usage: Whether to allow front-end editing
-
------------
### enableAddRow
- Type: Boolean
@@ -377,16 +354,61 @@ Note that you also need to configure `loadUrl` and `loadSheetUrl` to take effect
- Usage: Allow additional rows
------------
-### enableAddCol
+### enableAddBackTop
- Type: Boolean
- Default: true
-- Usage: Allow adding columns
+- Usage: Allow back to top
------------
### userInfo
-- Type: String
-- Default: `' rabbit'`
-- Usage: User information display style in the upper right corner
+- Type: String | Boolean | Object
+- Default: false
+- Usage: User information display style in the upper right corner,Support the following three formats
+ 1. HTML template string, such as:
+
+ ```js
+ options:{
+ // Other configuration
+ userInfo:' Lucky',
+ }
+ ```
+
+ Or an ordinary string, such as:
+
+ ```js
+ options:{
+ // Other configuration
+ userInfo:'Lucky',
+ }
+ ```
+
+ 2. Boolean type, such as:
+
+ `false`: Do not show
+ ```js
+ options:{
+ // Other configuration
+ userInfo:false, // Do not display user information
+ }
+
+ ```
+ `ture`: Show the default string
+ ```js
+ options:{
+ // Other configuration
+ userInfo:true, // Show HTML:' Lucky'
+ }
+
+ ```
+ 3. Object format, set `userImage`: user avatar address and `userName`: user name, such as:
+ ```js
+ options:{
+ // Other configuration
+ userImage:'https://cdn.jsdelivr.net/npm/luckyresources@1.0.3/assets/img/logo/logo.png', // Avatar url
+ userName:'Lucky', // username
+ }
+ ```
+ 4. Note that if set to `undefined` or not set, the same as setting `false`
------------
### userMenuItem
@@ -418,12 +440,6 @@ Note that you also need to configure `loadUrl` and `loadSheetUrl` to take effect
- Default: true
- Usage: The configuration of the chart or pivot table will pop up on the right, set whether the workbook will be automatically indented after popping up
-------------
-### enablePage
-- Type: Boolean
-- Default: false
-- Usage: Allow to load next page
-
------------
### forceCalculation
- Type: Boolean
@@ -439,33 +455,65 @@ Note that you also need to configure `loadUrl` and `loadSheetUrl` to take effect
------------
### cellRightClickConfig
-[todo]
-
- Type: Object
- Default: {}
- Usage: Custom configuration cell right-click menu
-- Format:
- ```json
+- Format:
+ ```json
{
- copy: false, //Copy
- copyAs: false, //Copy as
- paste: false, //Paste
- insert: false, //Insert
- delete: false, //Delete
- hide: false, //Hide
- deleteCell: false, //Delete cell
- clear: false, //Clear content
- matrix: false, //Matrix operation selection
- sort: false, //Sort selection
- filter: false, //Filter selection
- chart: false //Chart generation
- }
+ copy: false, // copy
+ copyAs: false, // copy as
+ paste: false, // paste
+ insertRow: false, // insert row
+ insertColumn: false, // insert column
+ deleteRow: false, // delete the selected row
+ deleteColumn: false, // delete the selected column
+ deleteCell: false, // delete cell
+ hideRow: false, // hide the selected row and display the selected row
+ hideColumn: false, // hide the selected column and display the selected column
+ rowHeight: false, // row height
+ columnWidth: false, // column width
+ clear: false, // clear content
+ matrix: false, // matrix operation selection
+ sort: false, // sort selection
+ filter: false, // filter selection
+ chart: false, // chart generation
+ image: false, // insert picture
+ link: false, // insert link
+ data: false, // data verification
+ cellFormat: false // Set cell format
+ }
+ ```
+
+ In addition to the cells, the configuration here also includes the row header right-click menu, the column header right-click menu, and the column header drop-down arrow menu. The specific configuration relationships are as follows:
+
+ |Right-click menu configuration|Cell|Row header|Column header|Column arrow|
+ | ------------ | ------------ | ------------ | ----------- | ------------ |
+ |copy|copy|copy|copy|copy|
+ |copyAs|copy as|copy as|copy as|copy as|
+ |paste|paste|paste|paste|paste|
+ |insertRow|Insert a row|Increase N rows upwards and N rows downwards|-|-|
+ |insertColumn|Insert Column|-|Add N columns to the left and N columns to the right|Add N columns to the left and N columns to the right|
+ |deleteRow|Delete selected row|Delete selected row|-|-|
+ |deleteColumn|Delete selected column|-|Delete selected column|Delete selected column|
+ |deleteCell|Delete cell|-|-|-|
+ |hideRow|-|Hide the selected row and show the selected row|-|-|
+ |hideColumn|-|-|Hide the selected column and show the selected column|Hide the selected column and show the selected column|
+ |rowHeight|-|row height|-|-|
+ |columnWidth|-|-|Column Width|Column Width|
+ |clear|clear content|clear content|clear content|-|
+ |matrix|Matrix Operation Selection|Matrix Operation Selection|Matrix Operation Selection|-|
+ |sort|Sort selection|Sort selection|Sort selection|A-Z sort and Z-A sort|
+ |filter|Filter selection|Filter selection|Filter selection|-|
+ |chart|chart generation|chart generation|chart generation|-|
+ |image|Insert Picture|Insert Picture|Insert Picture|-|
+ |link|Insert link|Insert link|Insert link|-|
+ |data|Data Verification|Data Verification|Data Verification|-|
+ |cellFormat|Set cell format|Set cell format|Set cell format|-|
------------
### sheetRightClickConfig
-[todo]
-
- Type: Object
- Default: {}
- Usage: Customize the right-click menu of the bottom sheet bar
@@ -476,23 +524,21 @@ Note that you also need to configure `loadUrl` and `loadSheetUrl` to take effect
copy: false, //Copy
rename: false, //Rename
color: false, //Change color
- hide: false, //Hide
- show: false, //Unhide
- left: false, //Move to the left
- right: false //Move to the right
+ hide: false, //Hide, unhide
+ move: false, //Move to the left, move to the right
}
------------
-### showRowBar
-- Type: Boolean
-- Default: true
-- Usage: Whether to show the row number area
+### rowHeaderWidth
+- Type: Number
+- Default: 46
+- Usage: The width of the row header area, if set to 0, it means to hide the row header
------------
-### showColumnBar
-- Type: Boolean
-- Default: true
-- Usage: Whether to show the column number area
+### columnHeaderHeight
+- Type: Number
+- Default: 20
+- Usage: The height of the column header area, if set to 0, it means hide the column header
------------
### sheetFormulaBar
@@ -508,6 +554,36 @@ Note that you also need to configure `loadUrl` and `loadSheetUrl` to take effect
------------
+### limitSheetNameLength
+- Type: Boolean
+- Default: true
+- Usage：Is the length of the sheet name limited in scenarios such as sheet renaming
+
+------------
+
+### defaultSheetNameMaxLength
+- Type：Number
+- Default：31
+- Usage：Default maximum allowed sheet name length
+
+------------
+
+### pager
+- Type：Object
+- Default：null
+- Usage：Pager button settings, the first version of the solution is directly used jquery plug-in [sPage](https://github.com/jvbei/sPage)
+ Clicking the paging button will trigger the hook function `onTogglePager`, which returns the current page number, which is the same as the `backFun` method of `sPage`. This pager setting is only responsible for the UI part. For the specific data request and data rendering after switching paging, please enter the `onTogglePager` custom processing in the number of hook lines.
+ ```js
+ pager: {
+ pageIndex: 1, //Current page number
+ pageSize: 10, //How many rows of data are displayed on each page
+ total: 50, //Total number of rows of data
+ selectOption: [10, 20] //Options that allow setting the number of rows per page
+ }
+ ```
+
+------------
+
## Hook Function (TODO)
When the hook function is used in secondary development, hooks will be implanted in each common mouse or keyboard operation, and the function passed in by the developer will be called to expand the function of Luckysheet.
@@ -516,66 +592,231 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
## Cell
+### cellEditBefore
+
+- Type: Function
+- Default: null
+- Usage: Triggered before entering the cell editing mode. When a cell is selected and in the non-editing state, there are usually the following three conventional methods to trigger the edit mode
+ - Double click the cell
+ - Hit Enter
+ - Use API: enterEditMode
+- Parameter:
+ - {Array} [range]: Current selection range
+
+------------
+### cellUpdateBefore
+
+- Type: Function
+- Default: null
+- Usage: Triggered before updating this cell value, `return false` will not perform subsequent updates. After modifying the cell in the editing state, this hook is triggered before exiting the editing mode and updating the data.
+- Parameter:
+ - {Number} [r]: The row number of the cell
+ - {Number} [c]: The column number of the cell
+ - {Object | String | Number} [value]: The content of the cell to be modified
+ - {Boolean} [isRefresh]: Whether to refresh the entire table
+
+------------
+### cellUpdated
+
+- Type: Function
+- Default: null
+- Usage: Triggered after updating this cell
+- Parameter:
+ - {Number} [r]: The row number of the cell
+ - {Number} [c]: The column number of the cell
+ - {Object} [oldValue]: Cell object before modification
+ - {Object} [newValue]: Modified cell object
+ - {Boolean} [isRefresh]: Whether to refresh the entire table
+
+------------
+### cellRenderBefore
+
+- Type: Function
+- Default: null
+- Usage: Triggered before the cell is rendered, `return false` will not render the cell
+- Parameter:
+ - {Object} [cell]:Cell object
+ - {Object} [position]:
+ + {Number} [r]: The row number of the cell
+ + {Number} [c]: The column number of the cell
+ + {Number} [start_r]: The horizontal coordinate of the upper left corner of the cell
+ + {Number} [start_c]: The vertical coordinate of the upper left corner of the cell
+ + {Number} [end_r]: The horizontal coordinate of the lower right corner of the cell
+ + {Number} [end_c]: The vertical coordinate of the lower right corner of the cell
+ - {Object} [sheet]: Current sheet object
+ - {Object} [ctx]: The context of the current canvas
+
+------------
### cellRenderAfter
+
- Type: Function
- Default: null
-- Usage: Triggered after the cell rendering ends
+- Usage: Triggered after the cell rendering ends, `return false` will not render the cell
- Parameter:
- - {Number} [r]: Row number of cell
- - {Number} [c]: Column number of cell
- - {Object} [v]: Cell object
+ - {Object} [cell]: Cell object
+ - {Object} [position]:
+ + {Number} [r]: The row number of the cell
+ + {Number} [c]: The column number of the cell
+ + {Number} [start_r]: The horizontal coordinate of the upper left corner of the cell
+ + {Number} [start_c]: The vertical coordinate of the upper left corner of the cell
+ + {Number} [end_r]: The horizontal coordinate of the lower right corner of the cell
+ + {Number} [end_c]: The vertical coordinate of the lower right corner of the cell
+ - {Object} [sheet]: Current worksheet object
+ - {Object} [ctx]: The context of the current canvas
+
+- Example:
+
+ A case of drawing two pictures in the upper left corner and lower right corner of cell D1
+ :::::: details
+ ```js
+ luckysheet.create({
+ hook: {
+ cellRenderAfter: function (cell, position, sheetFile, ctx) {
+ var r = position.r;
+ var c = position.c;
+ if (r === 0 && c === 3) { // Specify to process cell D1
+ if (!window.storeUserImage) {
+ window.storeUserImage = {}
+ }
+
+ if (!window.storeUserImage[r + '_' + c]) {
+ window.storeUserImage[r + '_' + c] = {}
+ }
+
+ var img = null;
+ var imgRight = null;
+
+ if (window.storeUserImage[r + '_' + c].image && window.storeUserImage[r + '_' + c].imgRight) {
+
+ // Fetch directly after loading
+ img = window.storeUserImage[r + '_' + c].image;
+ imgRight = window.storeUserImage[r + '_' + c].imgRight;
+
+ } else {
+
+ img = new Image();
+ imgRight = new Image();
+
+ img.src = 'https://www.dogedoge.com/favicon/developer.mozilla.org.ico';
+ imgRight.src = 'https://www.dogedoge.com/static/icons/twemoji/svg/1f637.svg';
+
+ // The picture is cached in the memory, fetched directly next time, no need to reload
+ window.storeUserImage[r + '_' + c].image = img;
+ window.storeUserImage[r + '_' + c].imgRight = imgRight;
+
+ }
+
+
+ if (img.complete) { //Direct rendering that has been loaded
+ ctx.drawImage(img, position.start_c, position.start_r, 10, 10);
+ } else {
+ img.onload = function () {
+ ctx.drawImage(img, position.start_c, position.start_r, 10, 10);
+ }
+
+ }
+
+ if (imgRight.complete) {
+ ctx.drawImage(imgRight, position.end_c - 10, position.end_r - 10, 10, 10);
+ } else {
+
+ imgRight.onload = function () {
+ ctx.drawImage(imgRight, position.end_c - 10, position.end_r - 10, 10, 10);
+ }
+ }
+
+ }
+ }
+ }
+ })
+ ```
+ :::
------------
-### cellHover
+### cellAllRenderBefore
+
- Type: Function
- Default: null
-- Usage: Triggered when the mouse moves over the cell (hover)
+- Usage:The method executed before all cells are rendered. Internally, this method is added before `luckysheetDrawMain` renders the table.
- Parameter:
- - {Number} [r]: Row number of cell
- - {Number} [c]: Column number of cell
- - {Object} [v]: Cell object
+ - {Object} [data]: Two-dimensional array data of the current worksheet
+ - {Object} [sheet]: Current worksheet object
+ - {Object} [ctx]: The context of the current canvas
------------
-### cellEditBefore
+### rowTitleCellRenderBefore
+
- Type: Function
- Default: null
-- Usage: Triggered after double-clicking the cell, that is, when double-clicking the cell to edit the content, this method is triggered first
+- Usage: Triggered before the row header cell is rendered, `return false` will not render the row header
- Parameter:
- - {Number} [r]: Row number of cell
- - {Number} [c]: Column number of cell
- - {Object} [v]: Cell object
+ - {String} [rowNum]: Row number
+ - {Object} [position]:
+ + {Number} [r]: The row number of the cell
+ + {Number} [top]: The vertical coordinate of the upper left corner of the cell
+ + {Number} [width]: Cell width
+ + {Number} [height]: Cell height
+ - {Object} [ctx]: The context of the current canvas
------------
-### cellEditAfter
+### rowTitleCellRenderAfter
+
- Type: Function
- Default: null
-- Usage: Triggered after double-clicking the cell, that is, when double-clicking the cell to edit the content, this method is finally triggered
+- Usage: Triggered after the row header cell is rendered, `return false` will not render the row header
- Parameter:
- - {Number} [r]: Row number of cell
- - {Number} [c]: Column number of cell
- - {Object} [oldV]: Cell object before Modified
- - {Object} [newV]: Cell object after Modified
+ - {String} [rowNum]: Row number
+ - {Object} [position]:
+ + {Number} [r]: The row number of the cell
+ + {Number} [top]: The vertical coordinate of the upper left corner of the cell
+ + {Number} [width]: Cell width
+ + {Number} [height]: Cell height
+ - {Object} [ctx]: The context of the current canvas
------------
+### columnTitleCellRenderBefore
-## Selected area
+- Type: Function
+- Default: null
+- Usage: Triggered before the column header cell is rendered, `return false` will not render the column header
+- Parameter:
+ - {Object} [columnAbc]: Column header characters
+ - {Object} [position]:
+ - {Number} [c]: The column number of the cell
+ - {Number} [left]: The horizontal coordinate of the upper left corner of the cell
+ - {Number} [width]: Cell width
+ - {Number} [height]: Cell height
+ - {Object} [ctx]: The context of the current canvas
+
+------------
+### columnTitleCellRenderAfter
-### rangeSelectBefore
- Type: Function
- Default: null
-- Usage: Frame selection or trigger before setting selection
+- Usage: Triggered after the column header cell is rendered, `return false` will not render the column header
- Parameter:
- - {Object || Array} [range]: Selection area, may be multiple selection areas
+ - {Object} [columnAbc]: Column header characters
+ - {Object} [position]:
+ - {Number} [c]: The column number of the cell
+ - {Number} [left]: The horizontal coordinate of the upper left corner of the cell
+ - {Number} [width]: Cell width
+ - {Number} [height]: Cell height
+ - {Object} [ctx]: The context of the current canvas
------------
-### rangeSelectAfter
+
+## Selected area
+
+### rangeSelect
- Type: Function
- Default: null
- Usage: Frame selection or trigger after setting selection
- Parameter:
- - {Object || Array} [range]: Selection area, may be multiple selection areas
+ - {Object} [sheet]: Current worksheet object
+ - {Object | Array} [range]: Selection area, may be multiple selection areas
------------
+
### rangeMoveBefore
- Type: Function
- Default: null
@@ -598,7 +839,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
- Default: null
- Usage: Before the selection
- Parameter:
- - {Object || Array} [range]: Selection area, may be multiple selection areas
+ - {Object | Array} [range]: Selection area, may be multiple selection areas
- {Object} [data]: Data corresponding to the selection area
------------
@@ -607,7 +848,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
- Default: null
- Usage: After the selection is modified
- Parameter:
- - {Object || Array} [range]: Selection area, may be multiple selection areas
+ - {Object | Array} [range]: Selection area, may be multiple selection areas
- {Object} [oldData]: Before modification, the data corresponding to the selection area
- {Object} [newData]: After modification, the data corresponding to the selection area
@@ -617,7 +858,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
- Default: null
- Usage: Before copying selection
- Parameter:
- - {Object || Array} [range]: Selection area, may be multiple selection areas
+ - {Object | Array} [range]: Selection area, may be multiple selection areas
- {Object} [data]: Data corresponding to the selection area
------------
@@ -626,7 +867,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
- Default: null
- Usage: After copying selection
- Parameter:
- - {Object || Array} [range]: Selection area, may be multiple selection areas
+ - {Object | Array} [range]: Selection area, may be multiple selection areas
- {Object} [data]: Data corresponding to the selection area
------------
@@ -635,7 +876,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
- Default: null
- Usage: Before pasting the selection
- Parameter:
- - {Object || Array} [range]: Selection area, may be multiple selection areas
+ - {Object | Array} [range]: Selection area, may be multiple selection areas
- {Object} [data]: The data corresponding to the selection area to be pasted
------------
@@ -644,7 +885,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
- Default: null
- Usage: After pasting the selection
- Parameter:
- - {Object || Array} [range]: Selection area, may be multiple selection areas
+ - {Object | Array} [range]: Selection area, may be multiple selection areas
- {Object} [originData]: The data corresponding to the selection area to be pasted
- {Object} [pasteData]: Data to paste
@@ -690,7 +931,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
- Default: null
- Usage: Before the selection is cleared
- Parameter:
- - {Object || Array} [range]: Selection area, may be multiple selection areas
+ - {Object | Array} [range]: Selection area, may be multiple selection areas
- {Object} [data]: The data corresponding to the selection area to be cleared
------------
@@ -699,7 +940,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
- Default: null
- Usage: After the selection is cleared
- Parameter:
- - {Object || Array} [range]: Selection area, may be multiple selection areas
+ - {Object | Array} [range]: Selection area, may be multiple selection areas
- {Object} [data]: The data corresponding to the selection area to be cleared
------------
@@ -723,12 +964,14 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
## Worksheet
### sheetCreatekBefore
+(TODO)
- Type: Function
- Default: null
- Usage: Triggered before the worksheet is created, the new worksheet also includes the new pivot table
------------
### sheetCreateAfter
+(TODO)
- Type: Function
- Default: null
- Usage: Triggered after the worksheet is created, the new worksheet also includes the new pivot table
@@ -737,6 +980,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
------------
### sheetMoveBefore
+(TODO)
- Type: Function
- Default: null
- Usage: Before the worksheet is moved
@@ -746,6 +990,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
------------
### sheetMoveAfter
+(TODO)
- Type: Function
- Default: null
- Usage: After the worksheet is moved
@@ -756,6 +1001,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
------------
### sheetDeleteBefore
+(TODO)
- Type: Function
- Default: null
- Usage: Before the worksheet is deleted
@@ -764,6 +1010,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
------------
### sheetDeleteAfter
+(TODO)
- Type: Function
- Default: null
- Usage: After the worksheet is deleted
@@ -772,6 +1019,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
------------
### sheetEditNameBefore
+(TODO)
- Type: Function
- Default: null
- Usage: Before changing the name of the worksheet
@@ -781,6 +1029,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
------------
### sheetEditNameAfter
+(TODO)
- Type: Function
- Default: null
- Usage: After changing the name of the worksheet
@@ -791,6 +1040,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
------------
### sheetEditColorBefore
+(TODO)
- Type: Function
- Default: null
- Usage: Before changing the color of the worksheet
@@ -800,6 +1050,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
------------
### sheetEditColorAfter
+(TODO)
- Type: Function
- Default: null
- Usage: After changing the color of the worksheet
@@ -810,6 +1061,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
------------
### sheetZoomBefore
+(TODO)
- Type: Function
- Default: null
- Usage: Before worksheet zoom
@@ -819,6 +1071,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
------------
### sheetZoomAfter
+(TODO)
- Type: Function
- Default: null
- Usage: After worksheet zoom
@@ -827,6 +1080,42 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
- {String} [oldZoom]: Before modification, the current worksheet zoom ratio
- {String} [newZoom]: After modification, the current worksheet zoom ratio
+------------
+### sheetActivateBefore
+(TODO)
+- Type: Function
+- Default: null
+- Usage：Before worksheet activate
+- Parameter：
+ - {Number} [i]: `index` of current worksheet
+
+------------
+### sheetActivateAfter
+(TODO)
+- Type: Function
+- Default: null
+- Usage：After worksheet activate
+- Parameter：
+ - {Number} [i]: `index` of current worksheet
+
+------------
+### sheetDeactivateBefore
+（TODO）
+- Type: Function
+- Default: null
+- Usage：Before the worksheet changes from active to inactive
+- Parameter：
+ - {Number} [i]: `index` of current worksheet
+
+------------
+### sheetDeactivateAfter
+（TODO）
+- Type: Function
+- Default: null
+- Usage：After the worksheet is changed from active to inactive
+- Parameter：
+ - {Number} [i]: `index` of current worksheet
+
------------
## Workbook
@@ -866,7 +1155,7 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
### updated
- Type: Function
- Default: null
-- Usage: The method executed after each operation is updated is executed after the canvas rendering, that is, every time the client performs a workbook operation, Luckysheet saves the operation in the history and triggers it. When undoing and redoing, it is also an operation, of course, the hook function will be triggered.
+- Usage: The method executed after each operation is updated is executed after the canvas rendering, monitor changes in worksheet content, that is, every time the client performs a workbook operation, Luckysheet saves the operation in the history and triggers it. When undoing and redoing, it is also an operation, of course, the hook function will be triggered.
- Parameter:
- {Object} [operate]: The history information of this operation will have different history records according to different operations. Refer to the source code [History](https://github.com/mengshukeji/Luckysheet/blob/master/src/controllers/controlHistory.js )
@@ -880,6 +1169,16 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
------------
+## Cooperative
+
+### cooperativeMessage
+
+- Type：Function
+- Default：null
+- Usage：Receive the cooperation message, secondary development. Expanding cooperative message instruction set
+- Params:
+ - {Object} : Receives the entire collaboration message body object sent by the server
+
## Image
### imageInsertBefore
@@ -1046,4 +1345,16 @@ The hook functions are uniformly configured under ʻoptions.hook`, and configura
- Default: null
- Usage: Customized method of drilling down cell data, note that this hook function is mounted under options: `options.fireMousedown`
+------------
+
+## Pager
+
+### onTogglePager
+
+- Type: Function
+- Default: null
+- Usage: Click the page button to call back the function, return the current page number, refer to [sPage backFun](https://github.com/jvbei/sPage)
+- Parameter:
+ - {Object} [page]: Return the current page object
+
------------
\ No newline at end of file
diff --git a/docs/guide/contribute.md b/docs/guide/contribute.md
new file mode 100644
index 0000000000000000000000000000000000000000..c832a8d146e8fbdaa010a1c75aff80ab7c668550
--- /dev/null
+++ b/docs/guide/contribute.md
@@ -0,0 +1,221 @@
+
+# Contribution guide
+
+welcome! We are very happy that you are here and look forward to your interest in participating in Luckysheet contributions. Of course, before you participate in the Luckysheet contribution, please make sure to read the following full text:
+
+## Our code of conduct
+
+1. We promise to respect all those who participated in the contribution, not limited to those who raised questions, contributed documents and code, resolved bugs and other contributions;
+
+2. We are obliged to abide by local laws and regulations, and we reject all behaviors with legal risks;
+3. We oppose any participant's derogatory comments, personal attacks, harassment or insult to others, and other non-professional behaviors;
+4. We have the right and responsibility to delete or edit content that does not comply with this code of conduct, not limited to code, issues, wikis, documents and others. Participants who do not comply with the code of conduct may be removed from the team;
+5. We accept the supervision of anyone, and anyone can report to us the facts that are found to be inconsistent with this code of conduct through problem feedback.
+
+## How to participate in contributing?
+
+* Contributed documents: Browsing the document can deepen your understanding of Luckysheet. Once you find that the document is not clearly written or the logic is confusing, you can correct, modify, and supplement. You can go to [Google Forum](https://groups.google.com/g/luckysheet) to give feedback
+* Contributing code: Welcome everyone to contribute code to the Luckysheet community, you are welcome to claim the Open state [Issues](https://github.com/mengshukeji/Luckysheet/issues) and unfinished features, submit a PR, and become one of the contributors If you find that some functions cannot meet your needs or have problems during use, please record in Issues
+* Participate in the issue discussion: you can post your suggestions under any [Issues](https://github.com/mengshukeji/Luckysheet/issues)
+* Review code: You can see PR submitted by all contributors on [Github](https://github.com/mengshukeji/Luckysheet), you can review their code and post your suggestions
+
+## How to submit issues
+
+Before you submit features/improvements, you should pay attention to the following points:
+
+* Please confirm whether the feature/improvement has been submitted by others
+* An easy-to-understand title to explain the bug/submission feature/improvement you submitted
+* If it is a bug, describe the cause of the bug in detail. If it can be reproduced, please try to provide complete reproduction steps
+* If it is a feature, then the feature should have wide applicability, suitable for most users, and it is best to provide detailed design documents
+* If it is an improvement, describe the benefits of this improvement as clearly as possible
+
+Specific steps:
+
+* Create [Issues](https://github.com/mengshukeji/Luckysheet/issues) and describe the issue clearly
+* If you want to solve the issue, assign the issue to your own name. If you just submit a bug/feature/improvement and don’t have time to contribute code, set assignne to empty
+* If it is a relatively large feature/improvement, try to output the design document first and follow the [Luckysheet RFC](https://github.com/mengshukeji/Luckysheet-rfcs) process for others to review
+
+## How to claim Issues
+
+In Luckysheet's [Issues](https://github.com/mengshukeji/Luckysheet/issues) list, there are many issues created by others that have not been repaired. If you are interested, you can claim these issues. The steps to claim are as follows:
+
+* Leave a message under the issue, express the idea of claiming the task, and specify **@I can solve it**
+* If the submitter has no comments, assign the issue to your own name and update the progress in time
+* If it is a relatively large feature, try to output the design document first and follow the [Luckysheet RFC](https://github.com/mengshukeji/Luckysheet-rfcs) process for others to review
+* Develop the code and submit the code to github
+
+## How to submit code
+
+1. Fork to own warehouse
+
+Go to the Github page of [Luckysheet](https://github.com/mengshukeji/Luckysheet), and click the Fork button in the upper right corner to proceed.
+
+2. Git clone to local
+
+```shell
+git clone https://github.com/|
+
+
+
+ 雄安智评云数字科技有限公司 + |
+
+
+
+
+ Code the Future + |
+
+
+
+
+ 吉客云 + |
+
+
+
+
+ 华为 + |
+
| + | ++ | ++ | ++ | +
| |
+
+### Patreon和OpenCollective有什么区别？
+
+通过Patreon捐赠的资金将直接用于支持menshshukeji在Luckysheet上的工作。 通过OpenCollective捐赠的资金由透明费用管理，将用于补偿核心团队成员的工作和费用或赞助社区活动。 通过在任一平台上捐款，您的姓名/徽标将得到适当的认可和曝光。
+
+## 赞助者列表
+
+（按时间顺序排列）
+- *勇 ¥ 30
+- 虚我 ¥ 200
+- 甜党 ¥ 50
+- Alphabet(Google)-gcf ¥ 1
+- **平 ¥ 100
+- **东 ¥ 10
+- debugger ¥ 20
+- 烦了烦 ¥ 10
+- 文顶顶 ¥ 200
+- yangxshn ¥ 10
+- 爱乐 ¥ 100
+- 小李飞刀刀 ¥ 66
+- 张铭 ¥ 200
+- 曹治军 ¥ 1
+- *特 ¥ 10
+- **权 ¥ 9.9
+- **sdmq ¥ 20
+- *旭 ¥ 10
+- Quentin ¥ 20
+- 周宇凡 ¥ 100
+- *超 ¥ 10
+- 维宁 ¥ 100
+- hyy ¥ 20
+- 雨亭寒江月 ¥ 50
+- **功 ¥ 10
+- **光 ¥ 20
+- terrywan ¥ 100
+- 王晓洪 ¥ 10
+- Sun ¥ 10
+- 忧绣 ¥ 100
+- Jasonx ¥ 10
+- 国勇 ¥ 66.6
+- 郎志 ¥ 100
+- 匿名 ¥ 1
+- ni ¥ 100
+- 苏 ¥ 50
+- Mads_chan ¥ 1
+- LK ¥ 100
+- 智连方舟 李汪石 ¥ 168
+- **发 ¥ 260
+- *超 ¥ 10
+- *勇 ¥ 10
+- *腾 ¥ 15
+- 名字好难起 ¥ 20
+- 大山 ¥ 1
+- waiting ¥ 1000
+- **宇 ¥ 10.00
+- 刘小帅的哥哥 ¥ 20.00
+- 宁静致远 ¥ 10.00
+- Eleven ¥ 1.00
+- **帆 ¥ 188
+- henry ¥ 100
+- .波罗 ¥ 50
+- 花落有家 ¥ 50
+- 踏遍南水北山 ¥ 1
+- LC ¥ 5
+- **明 ¥ 8.80
+- *军 ¥ 20
+- 张彪 ¥ 50
+- 企业文档云@肖敏 ¥ 10
+- 匿名 ¥ 50
+- 逍遥行 ¥ 10
+- z.wasaki ¥ 50
+- Make Children ¥ 20
+- Foam ¥ 20
+- 奥特曼( o|o)ノ三 ¥ 50
+- **凯 ¥ 10
+- **兵 ¥ 20
+- **川 ¥ 1
+- 二万 ¥ 50
+- 蔚然成林 ¥ 10
+- 邹杰 ¥ 10
+- 张永强 ¥ 50
+- 鱼得水 ¥ 50
+- Ccther ¥ 1
+- Eric Cheng ¥ 10
+- 佚名 ¥ 1
+- 花叶 ¥ 50
+- GT ¥ 20
+- 菜菜心 ¥ 10
+- fisher ¥ 1
+- JC ¥ 5
+- 佚名 ¥ 20
+- 独孤一剑 ¥ 50
+- mxt ¥ 20
+- 一叶迷山 ¥ 100
+- Jeff ¥ 100
+- 八千多条狗🐶 ¥ 100
+- 晓峰 ¥ 10
+- 戒 ¥ 1
+- 浪里个浪 ¥ 1
+- 回调函数 ¥ 50
+- 赖瓜子 ¥ 5
+- Milo•J ¥ 20
+- 可道云 ¥ 200
+- *程 ¥ 10
+- 来一杯卡布酸奶 ¥ 5
+- 刘久胜 ¥ 100
+- 快意江湖 ¥ 50
+- *新 ¥ 9.9
+- **龙 ¥ 100
\ No newline at end of file
diff --git a/docs/zh/guide/FAQ.md b/docs/zh/guide/FAQ.md
index 5954cafb401900f4c6aa492cf59dc85fff2e742b..0b2bce2f0957cb347c606b3136224a087d47b128 100644
--- a/docs/zh/guide/FAQ.md
+++ b/docs/zh/guide/FAQ.md
@@ -1,10 +1,10 @@
# 常见问题
-本章内容搜集了大家反馈的常见问题，如果官方文档和此列表都不能解答您的疑问，推荐到[官方论坛](https://support.qq.com/product/288322)反馈
+本章内容搜集了大家反馈的常见问题，如果官方文档和此列表都不能解答您的疑问，推荐到[官方论坛](https://github.com/mengshukeji/Luckysheet/discussions)反馈
-## **Q** luckysheetfile中的data和celldata有什么区别？
+## luckysheetfile中的data和celldata有什么区别？
-**A** : 表格初始化时使用一维数组格式的 [celldata](/zh/guide/sheet.html#celldata)，初始化完成后转化为二维数组格式的data作为存储更新使用，celldata不再使用。
+**A**：表格初始化时使用一维数组格式的 [celldata](/zh/guide/sheet.html#celldata)，初始化完成后转化为二维数组格式的data作为存储更新使用，celldata不再使用。
如果需要将`data`拿出来作为初始化数据，则需要执行 [transToCellData(data)](/zh/guide/api.html#transtocelldata-data-setting)转换为celldata数据。
其中`{ r, c, v }`格式的celldata转换为二维数组使用的是[transToData(celldata)](/zh/guide/api.html#transtodata-celldata-setting)
@@ -20,68 +20,67 @@ luckysheet.transToData(celldata)
------------
-## **Q** 单元格的类型有哪些？
+## 单元格的类型有哪些？
-**A** : 参考[单元格格式列表](/zh/guide/cell.html),例举了可用的单元格格式
+**A**：参考[单元格格式列表](/zh/guide/cell.html),例举了可用的单元格格式
------------
-## **Q** 如何在Vue/React项目中使用Luckysheet？
-
-**<link rel="stylesheet" href="./iconfont.css">
<span class="iconfont icon-xxx"></span>
+<span class="iconfont luckysheet-iconfont-xxx"></span>
"
@@ -1761,882 +1761,882 @@
-
链接
- #icon-lianjie
+ #luckysheet-iconfont-lianjie
-
打印区域
- #icon-dayinquyu
+ #luckysheet-iconfont-dayinquyu
-
打印页面配置
- #icon-dayinyemianpeizhi
+ #luckysheet-iconfont-dayinyemianpeizhi
-
打印标题
- #icon-dayinbiaoti
+ #luckysheet-iconfont-dayinbiaoti
-
分页预览
- #icon-fenyeyulan
+ #luckysheet-iconfont-fenyeyulan
-
普通
- #icon-putong
+ #luckysheet-iconfont-putong
-
页面布局
- #icon-yemianbuju
+ #luckysheet-iconfont-yemianbuju
-
表格锁定
- #icon-biaogesuoding
+ #luckysheet-iconfont-biaogesuoding
-
转到
- #icon-zhuandao1
+ #luckysheet-iconfont-zhuandao1
-
右箭头
- #icon-youjiantou
+ #luckysheet-iconfont-youjiantou
-
菜单
- #icon-caidan2
+ #luckysheet-iconfont-caidan2
-
替换
- #icon-tihuan
+ #luckysheet-iconfont-tihuan
-
冻结
- #icon-dongjie1
+ #luckysheet-iconfont-dongjie1
-
剪
- #icon-jian1
+ #luckysheet-iconfont-jian1
-
加
- #icon-jia1
+ #luckysheet-iconfont-jia1
-
溢出
- #icon-yichu1
+ #luckysheet-iconfont-yichu1
-
升序
- #icon-shengxu1
+ #luckysheet-iconfont-shengxu1
-
内框线
- #icon-neikuangxian
+ #luckysheet-iconfont-neikuangxian
-
清除筛选
- #icon-qingchushaixuan
+ #luckysheet-iconfont-qingchushaixuan
-
文本向上
- #icon-wenbenxiangshang
+ #luckysheet-iconfont-wenbenxiangshang
-
降序
- #icon-jiangxu1
+ #luckysheet-iconfont-jiangxu1
-
内框横线
- #icon-neikuanghengxian
+ #luckysheet-iconfont-neikuanghengxian
-
内框竖线
- #icon-neikuangshuxian
+ #luckysheet-iconfont-neikuangshuxian
-
自定义排序
- #icon-zidingyipaixu
+ #luckysheet-iconfont-zidingyipaixu
-
logo2
- #icon-logo2
+ #luckysheet-iconfont-logo2
-
logo
- #icon-logo
+ #luckysheet-iconfont-logo
-
文本倾斜
- #icon-wenbenqingxie1
+ #luckysheet-iconfont-wenbenqingxie1
-
加粗
- #icon-jiacu
+ #luckysheet-iconfont-jiacu
-
搜索
- #icon-sousuo
+ #luckysheet-iconfont-sousuo
-
关闭
- #icon-guanbi
+ #luckysheet-iconfont-guanbi
-
下一个
- #icon-xiayige
+ #luckysheet-iconfont-xiayige
-
下拉
- #icon-xiala
+ #luckysheet-iconfont-xiala
-
文本颜色
- #icon-wenbenyanse
+ #luckysheet-iconfont-wenbenyanse
-
上一个
- #icon-shangyige
+ #luckysheet-iconfont-shangyige
-
数据透视
- #icon-shujutoushi
+ #luckysheet-iconfont-shujutoushi
-
填充
- #icon-tianchong
+ #luckysheet-iconfont-tianchong
-
增加小数位
- #icon-zengjiaxiaoshuwei
+ #luckysheet-iconfont-zengjiaxiaoshuwei
-
编辑2
- #icon-bianji2
+ #luckysheet-iconfont-bianji2
-
截屏
- #icon-jieping
+ #luckysheet-iconfont-jieping
-
减小小数位
- #icon-jianxiaoxiaoshuwei
+ #luckysheet-iconfont-jianxiaoxiaoshuwei
-
菜单
- #icon-caidan
+ #luckysheet-iconfont-caidan
-
数据库
- #icon-shujuku
+ #luckysheet-iconfont-shujuku
-
无边框
- #icon-wubiankuang
+ #luckysheet-iconfont-wubiankuang
-
编辑
- #icon-bianji
+ #luckysheet-iconfont-bianji
-
清除样式
- #icon-qingchuyangshi
+ #luckysheet-iconfont-qingchuyangshi
-
删除
- #icon-shanchu
+ #luckysheet-iconfont-shanchu
-
文本居中对齐
- #icon-wenbenjuzhongduiqi
+ #luckysheet-iconfont-wenbenjuzhongduiqi
-
打印
- #icon-dayin
+ #luckysheet-iconfont-dayin
-
文本分割
- #icon-wenbenfenge
+ #luckysheet-iconfont-wenbenfenge
-
函数‘
- #icon-hanshu
+ #luckysheet-iconfont-hanshu
-
降序
- #icon-jiangxu
+ #luckysheet-iconfont-jiangxu
-
顶部对齐
- #icon-dingbuduiqi
+ #luckysheet-iconfont-dingbuduiqi
-
图片
- #icon-tupian
+ #luckysheet-iconfont-tupian
-
向下90
- #icon-xiangxia90
+ #luckysheet-iconfont-xiangxia90
-
竖排文字
- #icon-shupaiwenzi
+ #luckysheet-iconfont-shupaiwenzi
-
全加边框
- #icon-quanjiabiankuang
+ #luckysheet-iconfont-quanjiabiankuang
-
升序
- #icon-shengxu
+ #luckysheet-iconfont-shengxu
-
裁剪
- #icon-caijian
+ #luckysheet-iconfont-caijian
-
金额
- #icon-jine
+ #luckysheet-iconfont-jine
-
菜单1
- #icon-caidan1
+ #luckysheet-iconfont-caidan1
-
取消合并
- #icon-quxiaohebing
+ #luckysheet-iconfont-quxiaohebing
-
文本下划线
- #icon-wenbenxiahuaxian
+ #luckysheet-iconfont-wenbenxiahuaxian
-
上边框
- #icon-shangbiankuang
+ #luckysheet-iconfont-shangbiankuang
-
定位
- #icon-dingwei
+ #luckysheet-iconfont-dingwei
-
四周加边框
- #icon-sizhoujiabiankuang
+ #luckysheet-iconfont-sizhoujiabiankuang
-
侧边栏收起
- #icon-cebianlanshouqi
+ #luckysheet-iconfont-cebianlanshouqi
-
合并
- #icon-hebing
+ #luckysheet-iconfont-hebing
-
向上倾斜
- #icon-xiangshangqingxie
+ #luckysheet-iconfont-xiangshangqingxie
-
水平对齐
- #icon-shuipingduiqi
+ #luckysheet-iconfont-shuipingduiqi
-
文本删除线
- #icon-wenbenshanchuxian
+ #luckysheet-iconfont-wenbenshanchuxian
-
文本右对齐
- #icon-wenbenyouduiqi
+ #luckysheet-iconfont-wenbenyouduiqi
-
前进
- #icon-qianjin
+ #luckysheet-iconfont-qianjin
-
图表
- #icon-tubiao
+ #luckysheet-iconfont-tubiao
-
右边框
- #icon-youbiankuang
+ #luckysheet-iconfont-youbiankuang
-
百分号
- #icon-baifenhao
+ #luckysheet-iconfont-baifenhao
-
格式刷
- #icon-geshishua
+ #luckysheet-iconfont-geshishua
-
保存
- #icon-baocun
+ #luckysheet-iconfont-baocun
-
数据验证
- #icon-shujuyanzheng
+ #luckysheet-iconfont-shujuyanzheng
-
截断
- #icon-jieduan
+ #luckysheet-iconfont-jieduan
-
格式条件
- #icon-geshitiaojian
+ #luckysheet-iconfont-geshitiaojian
-
自动换行
- #icon-zidonghuanhang
+ #luckysheet-iconfont-zidonghuanhang
-
侧边栏展开
- #icon-cebianlanzhankai
+ #luckysheet-iconfont-cebianlanzhankai
-
筛选2
- #icon-shaixuan2
+ #luckysheet-iconfont-shaixuan2
-
向下倾斜
- #icon-xiangxiaqingxie
+ #luckysheet-iconfont-xiangxiaqingxie
-
溢出
- #icon-yichu
+ #luckysheet-iconfont-yichu
-
垂直合并
- #icon-chuizhihebing
+ #luckysheet-iconfont-chuizhihebing
-
文本分散对齐
- #icon-wenbenfensanduiqi
+ #luckysheet-iconfont-wenbenfensanduiqi
-
左边框
- #icon-zuobiankuang
+ #luckysheet-iconfont-zuobiankuang
-
分页查看
- #icon-fenyechakan
+ #luckysheet-iconfont-fenyechakan
-
运行
- #icon-yunhang
+ #luckysheet-iconfont-yunhang
-
列
- #icon-lie
+ #luckysheet-iconfont-lie
-
全屏
- #icon-quanping
+ #luckysheet-iconfont-quanping
-
筛选
- #icon-shaixuan
+ #luckysheet-iconfont-shaixuan
-
更新
- #icon-gengxin
+ #luckysheet-iconfont-gengxin
-
清除
- #icon-qingchu
+ #luckysheet-iconfont-qingchu
-
行
- #icon-hang
+ #luckysheet-iconfont-hang
-
注释
- #icon-zhushi
+ #luckysheet-iconfont-zhushi
-
剪
- #icon-jian
+ #luckysheet-iconfont-jian
-
计算
- #icon-jisuan
+ #luckysheet-iconfont-jisuan
-
加
- #icon-jia
+ #luckysheet-iconfont-jia
-
底部对齐
- #icon-dibuduiqi
+ #luckysheet-iconfont-dibuduiqi
-
向上90
- #icon-xiangshang90
+ #luckysheet-iconfont-xiangshang90
-
无选装
- #icon-wuxuanzhuang
+ #luckysheet-iconfont-wuxuanzhuang
-
显示隐藏网格
- #icon-xianshiyincangwangge
+ #luckysheet-iconfont-xianshiyincangwangge
-
冻结
- #icon-dongjie
+ #luckysheet-iconfont-dongjie
-
文本左对齐
- #icon-wenbenzuoduiqi
+ #luckysheet-iconfont-wenbenzuoduiqi
-
后退
- #icon-houtui
+ #luckysheet-iconfont-houtui
-
水平合并
- #icon-shuipinghebing
+ #luckysheet-iconfont-shuipinghebing
-
下边框
- #icon-xiabiankuang
+ #luckysheet-iconfont-xiabiankuang
-
设置
- #icon-shezhi
+ #luckysheet-iconfont-shezhi
diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css
index 34103a26d49858cebbc1bb6dbf88ef56f98b1fec..d76bed6978b89c399052edd3638e7b794ff46c99 100644
--- a/src/assets/iconfont/iconfont.css
+++ b/src/assets/iconfont/iconfont.css
@@ -1,10 +1,10 @@
@font-face {font-family: "iconfont";
- src: url('iconfont.eot?t=1603792364334'); /* IE9 */
- src: url('iconfont.eot?t=1603792364334#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
- url('iconfont.woff?t=1603792364334') format('woff'),
- url('iconfont.ttf?t=1603792364334') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
- url('iconfont.svg?t=1603792364334#iconfont') format('svg'); /* iOS 4.1- */
+ src: url('iconfont.eot?t=1605236775724'); /* IE9 */
+ src: url('iconfont.eot?t=1605236775724#iefix') format('embedded-opentype'), /* IE6-IE8 */
+ url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+ url('iconfont.woff?t=1605236775724') format('woff'),
+ url('iconfont.ttf?t=1605236775724') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+ url('iconfont.svg?t=1605236775724#iconfont') format('svg'); /* iOS 4.1- */
}
.iconfont {
@@ -15,443 +15,443 @@
-moz-osx-font-smoothing: grayscale;
}
-.icon-lianjie:before {
+.luckysheet-iconfont-lianjie:before {
content: "\e7f8";
}
-.icon-dayinquyu:before {
+.luckysheet-iconfont-dayinquyu:before {
content: "\e7f5";
}
-.icon-dayinyemianpeizhi:before {
+.luckysheet-iconfont-dayinyemianpeizhi:before {
content: "\e7f6";
}
-.icon-dayinbiaoti:before {
+.luckysheet-iconfont-dayinbiaoti:before {
content: "\e7f7";
}
-.icon-fenyeyulan:before {
+.luckysheet-iconfont-fenyeyulan:before {
content: "\e7f2";
}
-.icon-putong:before {
+.luckysheet-iconfont-putong:before {
content: "\e7f3";
}
-.icon-yemianbuju:before {
+.luckysheet-iconfont-yemianbuju:before {
content: "\e7f4";
}
-.icon-biaogesuoding:before {
+.luckysheet-iconfont-biaogesuoding:before {
content: "\e7ee";
}
-.icon-zhuandao1:before {
+.luckysheet-iconfont-zhuandao1:before {
content: "\e7f1";
}
-.icon-youjiantou:before {
+.luckysheet-iconfont-youjiantou:before {
content: "\e7ed";
}
-.icon-caidan2:before {
+.luckysheet-iconfont-caidan2:before {
content: "\e7ef";
}
-.icon-tihuan:before {
+.luckysheet-iconfont-tihuan:before {
content: "\e7f0";
}
-.icon-dongjie1:before {
+.luckysheet-iconfont-dongjie1:before {
content: "\e7e1";
}
-.icon-jian1:before {
+.luckysheet-iconfont-jian1:before {
content: "\e7e2";
}
-.icon-jia1:before {
+.luckysheet-iconfont-jia1:before {
content: "\e7e3";
}
-.icon-yichu1:before {
+.luckysheet-iconfont-yichu1:before {
content: "\e7e4";
}
-.icon-shengxu1:before {
+.luckysheet-iconfont-shengxu1:before {
content: "\e7e5";
}
-.icon-neikuangxian:before {
+.luckysheet-iconfont-neikuangxian:before {
content: "\e7e6";
}
-.icon-qingchushaixuan:before {
+.luckysheet-iconfont-qingchushaixuan:before {
content: "\e7e7";
}
-.icon-wenbenxiangshang:before {
+.luckysheet-iconfont-wenbenxiangshang:before {
content: "\e7e8";
}
-.icon-jiangxu1:before {
+.luckysheet-iconfont-jiangxu1:before {
content: "\e7e9";
}
-.icon-neikuanghengxian:before {
+.luckysheet-iconfont-neikuanghengxian:before {
content: "\e7ea";
}
-.icon-neikuangshuxian:before {
+.luckysheet-iconfont-neikuangshuxian:before {
content: "\e7eb";
}
-.icon-zidingyipaixu:before {
+.luckysheet-iconfont-zidingyipaixu:before {
content: "\e7ec";
}
-.icon-logo2:before {
+.luckysheet-iconfont-logo2:before {
content: "\e7df";
}
-.icon-logo:before {
+.luckysheet-iconfont-logo:before {
content: "\e7e0";
}
-.icon-wenbenqingxie1:before {
+.luckysheet-iconfont-wenbenqingxie1:before {
content: "\e7de";
}
-.icon-jiacu:before {
+.luckysheet-iconfont-jiacu:before {
content: "\e7d9";
}
-.icon-sousuo:before {
+.luckysheet-iconfont-sousuo:before {
content: "\e78a";
}
-.icon-guanbi:before {
+.luckysheet-iconfont-guanbi:before {
content: "\e78b";
}
-.icon-xiayige:before {
+.luckysheet-iconfont-xiayige:before {
content: "\e78c";
}
-.icon-xiala:before {
+.luckysheet-iconfont-xiala:before {
content: "\e78d";
}
-.icon-wenbenyanse:before {
+.luckysheet-iconfont-wenbenyanse:before {
content: "\e78e";
}
-.icon-shangyige:before {
+.luckysheet-iconfont-shangyige:before {
content: "\e78f";
}
-.icon-shujutoushi:before {
+.luckysheet-iconfont-shujutoushi:before {
content: "\e790";
}
-.icon-tianchong:before {
+.luckysheet-iconfont-tianchong:before {
content: "\e791";
}
-.icon-zengjiaxiaoshuwei:before {
+.luckysheet-iconfont-zengjiaxiaoshuwei:before {
content: "\e792";
}
-.icon-bianji2:before {
+.luckysheet-iconfont-bianji2:before {
content: "\e793";
}
-.icon-jieping:before {
+.luckysheet-iconfont-jieping:before {
content: "\e794";
}
-.icon-jianxiaoxiaoshuwei:before {
+.luckysheet-iconfont-jianxiaoxiaoshuwei:before {
content: "\e796";
}
-.icon-caidan:before {
+.luckysheet-iconfont-caidan:before {
content: "\e797";
}
-.icon-shujuku:before {
+.luckysheet-iconfont-shujuku:before {
content: "\e798";
}
-.icon-wubiankuang:before {
+.luckysheet-iconfont-wubiankuang:before {
content: "\e799";
}
-.icon-bianji:before {
+.luckysheet-iconfont-bianji:before {
content: "\e79a";
}
-.icon-qingchuyangshi:before {
+.luckysheet-iconfont-qingchuyangshi:before {
content: "\e79b";
}
-.icon-shanchu:before {
+.luckysheet-iconfont-shanchu:before {
content: "\e79c";
}
-.icon-wenbenjuzhongduiqi:before {
+.luckysheet-iconfont-wenbenjuzhongduiqi:before {
content: "\e79d";
}
-.icon-dayin:before {
+.luckysheet-iconfont-dayin:before {
content: "\e79e";
}
-.icon-wenbenfenge:before {
+.luckysheet-iconfont-wenbenfenge:before {
content: "\e79f";
}
-.icon-hanshu:before {
+.luckysheet-iconfont-hanshu:before {
content: "\e7a0";
}
-.icon-jiangxu:before {
+.luckysheet-iconfont-jiangxu:before {
content: "\e7a1";
}
-.icon-dingbuduiqi:before {
+.luckysheet-iconfont-dingbuduiqi:before {
content: "\e7a2";
}
-.icon-tupian:before {
+.luckysheet-iconfont-tupian:before {
content: "\e7a3";
}
-.icon-xiangxia90:before {
+.luckysheet-iconfont-xiangxia90:before {
content: "\e7a4";
}
-.icon-shupaiwenzi:before {
+.luckysheet-iconfont-shupaiwenzi:before {
content: "\e7a5";
}
-.icon-quanjiabiankuang:before {
+.luckysheet-iconfont-quanjiabiankuang:before {
content: "\e7a6";
}
-.icon-shengxu:before {
+.luckysheet-iconfont-shengxu:before {
content: "\e7a7";
}
-.icon-caijian:before {
+.luckysheet-iconfont-caijian:before {
content: "\e7a8";
}
-.icon-jine:before {
+.luckysheet-iconfont-jine:before {
content: "\e7a9";
}
-.icon-caidan1:before {
+.luckysheet-iconfont-caidan1:before {
content: "\e7aa";
}
-.icon-quxiaohebing:before {
+.luckysheet-iconfont-quxiaohebing:before {
content: "\e7ab";
}
-.icon-wenbenxiahuaxian:before {
+.luckysheet-iconfont-wenbenxiahuaxian:before {
content: "\e7ac";
}
-.icon-shangbiankuang:before {
+.luckysheet-iconfont-shangbiankuang:before {
content: "\e7ad";
}
-.icon-dingwei:before {
+.luckysheet-iconfont-dingwei:before {
content: "\e7ae";
}
-.icon-sizhoujiabiankuang:before {
+.luckysheet-iconfont-sizhoujiabiankuang:before {
content: "\e7af";
}
-.icon-cebianlanshouqi:before {
+.luckysheet-iconfont-cebianlanshouqi:before {
content: "\e7b0";
}
-.icon-hebing:before {
+.luckysheet-iconfont-hebing:before {
content: "\e7b1";
}
-.icon-xiangshangqingxie:before {
+.luckysheet-iconfont-xiangshangqingxie:before {
content: "\e7b2";
}
-.icon-shuipingduiqi:before {
+.luckysheet-iconfont-shuipingduiqi:before {
content: "\e7b3";
}
-.icon-wenbenshanchuxian:before {
+.luckysheet-iconfont-wenbenshanchuxian:before {
content: "\e7b4";
}
-.icon-wenbenyouduiqi:before {
+.luckysheet-iconfont-wenbenyouduiqi:before {
content: "\e7b5";
}
-.icon-qianjin:before {
+.luckysheet-iconfont-qianjin:before {
content: "\e7b6";
}
-.icon-tubiao:before {
+.luckysheet-iconfont-tubiao:before {
content: "\e7b7";
}
-.icon-youbiankuang:before {
+.luckysheet-iconfont-youbiankuang:before {
content: "\e7b8";
}
-.icon-baifenhao:before {
+.luckysheet-iconfont-baifenhao:before {
content: "\e7b9";
}
-.icon-geshishua:before {
+.luckysheet-iconfont-geshishua:before {
content: "\e7ba";
}
-.icon-baocun:before {
+.luckysheet-iconfont-baocun:before {
content: "\e7bb";
}
-.icon-shujuyanzheng:before {
+.luckysheet-iconfont-shujuyanzheng:before {
content: "\e7bc";
}
-.icon-jieduan:before {
+.luckysheet-iconfont-jieduan:before {
content: "\e7bd";
}
-.icon-geshitiaojian:before {
+.luckysheet-iconfont-geshitiaojian:before {
content: "\e7be";
}
-.icon-zidonghuanhang:before {
+.luckysheet-iconfont-zidonghuanhang:before {
content: "\e7bf";
}
-.icon-cebianlanzhankai:before {
+.luckysheet-iconfont-cebianlanzhankai:before {
content: "\e7c0";
}
-.icon-shaixuan2:before {
+.luckysheet-iconfont-shaixuan2:before {
content: "\e7c1";
}
-.icon-xiangxiaqingxie:before {
+.luckysheet-iconfont-xiangxiaqingxie:before {
content: "\e7c2";
}
-.icon-yichu:before {
+.luckysheet-iconfont-yichu:before {
content: "\e7c3";
}
-.icon-chuizhihebing:before {
+.luckysheet-iconfont-chuizhihebing:before {
content: "\e7c4";
}
-.icon-wenbenfensanduiqi:before {
+.luckysheet-iconfont-wenbenfensanduiqi:before {
content: "\e7c5";
}
-.icon-zuobiankuang:before {
+.luckysheet-iconfont-zuobiankuang:before {
content: "\e7c6";
}
-.icon-fenyechakan:before {
+.luckysheet-iconfont-fenyechakan:before {
content: "\e7c7";
}
-.icon-yunhang:before {
+.luckysheet-iconfont-yunhang:before {
content: "\e7c8";
}
-.icon-lie:before {
+.luckysheet-iconfont-lie:before {
content: "\e7c9";
}
-.icon-quanping:before {
+.luckysheet-iconfont-quanping:before {
content: "\e7ca";
}
-.icon-shaixuan:before {
+.luckysheet-iconfont-shaixuan:before {
content: "\e7cb";
}
-.icon-gengxin:before {
+.luckysheet-iconfont-gengxin:before {
content: "\e7cc";
}
-.icon-qingchu:before {
+.luckysheet-iconfont-qingchu:before {
content: "\e7cd";
}
-.icon-hang:before {
+.luckysheet-iconfont-hang:before {
content: "\e7ce";
}
-.icon-zhushi:before {
+.luckysheet-iconfont-zhushi:before {
content: "\e7cf";
}
-.icon-jian:before {
+.luckysheet-iconfont-jian:before {
content: "\e7d0";
}
-.icon-jisuan:before {
+.luckysheet-iconfont-jisuan:before {
content: "\e7d1";
}
-.icon-jia:before {
+.luckysheet-iconfont-jia:before {
content: "\e7d2";
}
-.icon-dibuduiqi:before {
+.luckysheet-iconfont-dibuduiqi:before {
content: "\e7d3";
}
-.icon-xiangshang90:before {
+.luckysheet-iconfont-xiangshang90:before {
content: "\e7d4";
}
-.icon-wuxuanzhuang:before {
+.luckysheet-iconfont-wuxuanzhuang:before {
content: "\e7d5";
}
-.icon-xianshiyincangwangge:before {
+.luckysheet-iconfont-xianshiyincangwangge:before {
content: "\e7d6";
}
-.icon-dongjie:before {
+.luckysheet-iconfont-dongjie:before {
content: "\e7d7";
}
-.icon-wenbenzuoduiqi:before {
+.luckysheet-iconfont-wenbenzuoduiqi:before {
content: "\e7d8";
}
-.icon-houtui:before {
+.luckysheet-iconfont-houtui:before {
content: "\e7da";
}
-.icon-shuipinghebing:before {
+.luckysheet-iconfont-shuipinghebing:before {
content: "\e7db";
}
-.icon-xiabiankuang:before {
+.luckysheet-iconfont-xiabiankuang:before {
content: "\e7dc";
}
-.icon-shezhi:before {
+.luckysheet-iconfont-shezhi:before {
content: "\e7dd";
}
diff --git a/src/assets/iconfont/iconfont.eot b/src/assets/iconfont/iconfont.eot
index 1a43660ec577d9dffc1baaccf5f26ba1ade24755..7cc74131abf21b5974ddfcba7e34d2c84c9129aa 100644
Binary files a/src/assets/iconfont/iconfont.eot and b/src/assets/iconfont/iconfont.eot differ
diff --git a/src/assets/iconfont/iconfont.js b/src/assets/iconfont/iconfont.js
index 1c12a401d32ea56c6be73a54965104154893c4d4..803f0f592c71846b62f9ec1590270e30f5dc1282 100644
--- a/src/assets/iconfont/iconfont.js
+++ b/src/assets/iconfont/iconfont.js
@@ -1 +1 @@
-!function(h){var a,l,v,i,z,o,t='',M=(M=document.getElementsByTagName("script"))[M.length-1].getAttribute("data-injectcss");if(M&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}function p(){z||(z=!0,v())}a=function(){var h,a,l,v;(v=document.createElement("div")).innerHTML=t,t=null,(l=v.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",h=l,(a=document.body).firstChild?(v=h,(l=a.firstChild).parentNode.insertBefore(v,l)):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),a()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(v=a,i=h.document,z=!1,(o=function(){try{i.documentElement.doScroll("left")}catch(h){return void setTimeout(o,50)}p()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,p())})}(window);
\ No newline at end of file
+!function(h){var l,a,v,i,t,z,o='',M=(M=document.getElementsByTagName("script"))[M.length-1].getAttribute("data-injectcss");if(M&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(h){console&&console.log(h)}}function e(){t||(t=!0,v())}l=function(){var h,l,a,v;(v=document.createElement("div")).innerHTML=o,o=null,(a=v.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",h=a,(l=document.body).firstChild?(v=h,(a=l.firstChild).parentNode.insertBefore(v,a)):l.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),l()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(v=l,i=h.document,t=!1,(z=function(){try{i.documentElement.doScroll("left")}catch(h){return void setTimeout(z,50)}e()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,e())})}(window);
\ No newline at end of file
diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json
index 141f6ae8ed357cc4d7d05760307e74c4923ee0c3..3d547f72695a324c7fcd349b8fa165f89de2a94c 100644
--- a/src/assets/iconfont/iconfont.json
+++ b/src/assets/iconfont/iconfont.json
@@ -2,7 +2,7 @@
"id": "1990368",
"name": "lucksheet",
"font_family": "iconfont",
- "css_prefix_text": "icon-",
+ "css_prefix_text": "luckysheet-iconfont-",
"description": "",
"glyphs": [
{
diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf
index 1bb96c99767497999c485fd63a57de95ba2e3a5f..aadcc090259eb588177c4f8ba66df4bbd0d53566 100644
Binary files a/src/assets/iconfont/iconfont.ttf and b/src/assets/iconfont/iconfont.ttf differ
diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff
index 14357fc56d3cd4c557d3e9310a02baa474e44efc..cebb184a1ab10a674095fc93d4dc5e36779cfaf5 100644
Binary files a/src/assets/iconfont/iconfont.woff and b/src/assets/iconfont/iconfont.woff differ
diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2
index d309dc80a2a12924edc65c35d07d8dce548830a7..6a1edbcb844d2db9a24b26e70f7b9465a82374ff 100644
Binary files a/src/assets/iconfont/iconfont.woff2 and b/src/assets/iconfont/iconfont.woff2 differ
diff --git a/src/config.js b/src/config.js
index 31cb7ddf21b4c9aed9708f5f92bfaaf1a1fb01a5..c5ae6a66efec84cca45b6553cf74213fd2581ac7 100644
--- a/src/config.js
+++ b/src/config.js
@@ -3,6 +3,7 @@
*/
export default {
container: "luckysheet", //容器的ID
+ loading:{}, //自定义loading
column: 60, //空表格默认的列数量
row: 84, //空表格默认的行数据量
allowCopy: true, //是否允许拷贝
@@ -14,9 +15,9 @@ export default {
pointEditUpdate: null, //编辑器表格更新函数
pointEditZoom: 1, //编辑器表格编辑时缩放比例
// menu: "undo|redo|freezenrow|freezencolumn|download|share|chart|pivot",
- data: [{ "name": "Sheet1", color: "", "status": "1", "order": "0", "data": [], "config": {}, "index":0 }, { "name": "Sheet2", color: "", "status": "0", "order": "1", "data": [], "config": {}, "index":1 }, { "name": "Sheet3", color: "", "status": "0", "order": "2", "data": [], "config": {}, "index":2 }], //客户端sheet数据[shee1, sheet2, sheet3]
+ data: [{ "name": "Sheet1", color: "", "status": "1", "order": "0", "data": [], "config": {}, "index":0 }, { "name": "Sheet2", color: "", "status": "0", "order": "1", "data": [], "config": {}, "index":1 }, { "name": "Sheet3", color: "", "status": "0", "order": "2", "data": [], "config": {}, "index":2 }], //客户端sheet数据[sheet1, sheet2, sheet3]
title: "Luckysheet Demo", //表格的名称
- userInfo: ' rabbit', //右上角的用户信息展示样式
+ userInfo:false,// 右上角的用户信息展示样式，支持 1. boolean类型：false:不展示，ture:展示默认 ' rabbit' ，2. HTML模板字符串或者普通字符串，如：' Lucky'或者'用户名'， 3. 对象格式，设置 userImage：用户头像地址 和 userName：用户名 4. 不设置或者设置undefined同设置false
userMenuItem: [{url:"www.baidu.com", "icon":'', "name":"我的表格"}, {url:"www.baidu.com", "icon":'', "name":"退出登陆"}], //点击右上角的用户信息弹出的菜单
myFolderUrl: "www.baidu.com", //左上角<返回按钮的链接
config: {}, //表格行高、列宽、合并单元格、公式等设置
@@ -31,9 +32,9 @@ export default {
allowUpdate: false, //是否允许编辑后的后台更新
functionButton: "", //右上角功能按钮，例如' '
showConfigWindowResize: true, //图表和数据透视表的配置会在右侧弹出，设置弹出后表格是否会自动缩进
- enableAddRow: true,//允许增加行
- enableAddCol: true,//允许增加列
- enablePage: false,//允许加载下一页
+ enableAddRow: true,//允许添加行
+ enableAddBackTop: true,//允许回到顶部
+ // enablePage: false,//允许加载下一页
autoFormatw: false, //自动格式化超过4位数的数字为 亿万格式 例：true or "true" or "TRUE"
accuracy: undefined, //设置传输来的数值的精确位数，小数点后n位 传参数为数字或数字字符串，例： "0" 或 0
pageInfo:{
@@ -53,18 +54,17 @@ export default {
plugins: [], //plugins, e.g. ['chart']
forceCalculation:false,//强制刷新公式，公式较多会有性能问题，慎用
rowHeaderWidth: 46,
- columeHeaderHeight: 20,
+ columnHeaderHeight: 20,
defaultColWidth:73,
defaultRowHeight:19,
defaultFontSize:10,
-
- showRowBar:true, //是否显示行号区域
- showColumnBar:true, //是否显示列号区域
+ limitSheetNameLength:true, //是否限制工作表名的长度
+ defaultSheetNameMaxLength:31, //默认工作表名称的最大长度
sheetFormulaBar:true, //是否显示公式栏
showtoolbarConfig:{}, //自定义工具栏
showsheetbarConfig:{}, //自定义底部sheet页
showstatisticBarConfig:{}, //自定义计数栏
- sheetBottomConfig:{}, //自定义添加行和回到顶部
cellRightClickConfig:{}, //自定义单元格右键菜单
sheetRightClickConfig:{}, //自定义底部sheet页右击菜单
-}
\ No newline at end of file
+ imageUpdateMethodConfig:{}, //自定义图片同步方式
+}
diff --git a/src/controllers/alternateformat.js b/src/controllers/alternateformat.js
index da15a7471cd3631e6eb97c2b9d5a56dd82b59a17..5c0cf8f761e57e2435112a4c35d346490c7c3a8d 100644
--- a/src/controllers/alternateformat.js
+++ b/src/controllers/alternateformat.js
@@ -1205,7 +1205,7 @@ const alternateformat = {
},
ref: function(historyRules, currentRules){
if (Store.clearjfundo) {
- Store.jfundo = [];
+ Store.jfundo.length = 0;
let redo = {};
redo["type"] = "updateAF";
diff --git a/src/controllers/cellDatePickerCtrl.js b/src/controllers/cellDatePickerCtrl.js
index 41089334d9efc8d35af6229f6dabb94554addcb3..53a4eba46c2660dd616fef6add392d0594b49dc5 100644
--- a/src/controllers/cellDatePickerCtrl.js
+++ b/src/controllers/cellDatePickerCtrl.js
@@ -1,19 +1,53 @@
import menuButton from './menuButton';
import formula from '../global/formula';
import Store from '../store';
+import flatpickr from 'flatpickr'
+import dayjs from "dayjs";
+import { update, datenum_local } from '../global/format';
+import { setCellValue, setCellFormat } from '../global/api';
+
+const fitFormat = (formatStr) => {
+ let dateFormat = formatStr.replace(/y/g, 'Y');
+ dateFormat = dateFormat.replace(/d/g, 'D');
+ dateFormat = dateFormat.replace(/h/g, 'H');
+
+ dateFormat = dateFormat.replace(/上午\/下午/g, 'A');
+ dateFormat = dateFormat.replace(/上午/g, 'A');
+ dateFormat = dateFormat.replace(/下午/g, 'A');
+
+ dateFormat = dateFormat.replace(/AM\/PM/g, 'A');
+ dateFormat = dateFormat.replace(/AM/g, 'A');
+ dateFormat = dateFormat.replace(/PM/g, 'A');
+ dateFormat = dateFormat.replace(/\"/g, '');
+
+ if (dateFormat.includes('A')) {
+ dateFormat = dateFormat.replace(/H/g, 'h');
+ }
+ return dateFormat
+}
const cellDatePickerCtrl = {
- cellFocus: function(r, c, value){
+ cellFocus: function (r, c, cell) {
let row = Store.visibledatarow[r],
row_pre = r == 0 ? 0 : Store.visibledatarow[r - 1];
let col = Store.visibledatacolumn[c],
col_pre = c == 0 ? 0 : Store.visibledatacolumn[c - 1];
let margeset = menuButton.mergeborer(Store.flowdata, r, c);
- if(!!margeset){
+ let type = cell.ct.fa || 'YYYY-MM-DD';
+ let defaultDate = update('yyyy-MM-dd hh:mm:ss', cell.v);
+ let dateFormat = fitFormat(type);
+ let enableTime = false;
+ let noCalendar = false;
+ let enableSeconds = false;
+ let time_24hr = true;
+ let hasChineseTime = false;
+
+
+ if (!!margeset) {
row = margeset.row[1];
row_pre = margeset.row[0];
-
+
col = margeset.column[1];
col_pre = margeset.column[0];
}
@@ -25,17 +59,57 @@ const cellDatePickerCtrl = {
top: row_pre
})
- $("#cellDatePickerBtn").daterangepicker({
- singleDatePicker: true,
- startDate: moment(value),
- endDate: moment(value)
- }, function(start) {
- $("#luckysheet-rich-text-editor").html(start.format('YYYY-MM-DD'));
- formula.updatecell(Store.luckysheetCellUpdate[0], Store.luckysheetCellUpdate[1]);
- })
+ if (/[上午下午]/.test(type)) {
+ hasChineseTime = true
+ }
+ if (/[Hhms]/.test(dateFormat)) {
+ enableTime = true;
+ }
+ if (!/[YMD]/.test(dateFormat)) {
+ noCalendar = true;
+ }
+ if (/s/.test(dateFormat)) {
+ enableSeconds = true;
+ }
+ if (/A/.test(dateFormat)) {
+ time_24hr = false;
+ }
+
+ const fp = flatpickr('#luckysheet-input-box', {
+ allowInput: false,
+ noCalendar,
+ enableSeconds,
+ enableTime,
+ dateFormat,
+ time_24hr,
+ defaultDate,
+ onClose() {
+ setTimeout(() => {
+ fp.destroy()
+ }, 0);
+ },
+ parseDate: (datestr, format) => {
+ return dayjs(datestr).toDate();
+ },
+ formatDate: (date, format, locale) => {
+ if (hasChineseTime) {
+ return dayjs(date).format(format).replace('AM', '上午').replace('PM', '下午')
+ }
+ return dayjs(date).format(format);
+ },
+ onChange: function (selectedDates, dateStr) {
+ let currentVal = datenum_local(new Date(selectedDates))
+ $("#luckysheet-rich-text-editor").html(dateStr);
+ setCellValue(r, c, currentVal, { isRefresh: false })
+ setCellFormat(r, c, 'ct', cell.ct)
+ if (!enableTime) {
+ formula.updatecell(Store.luckysheetCellUpdate[0], Store.luckysheetCellUpdate[1]);
+ }
+ }
+ });
- $("#cellDatePickerBtn").click();
+ $("#luckysheet-input-box").click();
},
}
-export default cellDatePickerCtrl;
\ No newline at end of file
+export default cellDatePickerCtrl;
diff --git a/src/controllers/conditionformat.js b/src/controllers/conditionformat.js
index f39db53e80ee9a71628835d820b28c7c60d87d00..90f9e1511638e56912520ecdc90d1b9794887409 100644
--- a/src/controllers/conditionformat.js
+++ b/src/controllers/conditionformat.js
@@ -13,6 +13,7 @@ import sheetmanage from './sheetmanage';
import locale from '../locale/locale';
import {checkProtectionFormatCells} from './protection';
import Store from '../store';
+import dayjs from 'dayjs'
//条件格式
const conditionformat = {
@@ -23,25 +24,29 @@ const conditionformat = {
return `
-
+
${conditionformat_Text.ruleTypeItem1}
-
+
${conditionformat_Text.ruleTypeItem2}
-
+
${conditionformat_Text.ruleTypeItem3}
-
+
${conditionformat_Text.ruleTypeItem4}
-
+
${conditionformat_Text.ruleTypeItem5}
+
+
+ ${conditionformat_Text.ruleTypeItem6}
+
`;
},
textCellColorHtml: function(){
@@ -83,10 +88,10 @@ const conditionformat = {
{ "format": ["rgb(99, 190, 123)", "rgb(252, 252, 255)", "rgb(248, 105, 107)"] }, //绿-白-红色阶
{ "format": ["rgb(248, 105, 107)", "rgb(252, 252, 255)", "rgb(99, 190, 123)"] }, //红-白-绿色阶
-
+
{ "format": ["rgb(90, 138, 198)", "rgb(252, 252, 255)", "rgb(248, 105, 107)"] }, //蓝-白-红色阶
{ "format": ["rgb(248, 105, 107)", "rgb(252, 252, 255)", "rgb(90, 138, 198)"] }, //红-白-蓝色阶
-
+
{ "format": ["rgb(252, 252, 255)", "rgb(248, 105, 107)"] }, //白-红色阶
{ "format": ["rgb(248, 105, 107)", "rgb(252, 252, 255)"] }, //红-白色阶
@@ -114,11 +119,11 @@ const conditionformat = {
if(!checkProtectionFormatCells(Store.currentSheetIndex)){
return;
}
-
+
//保存之前的规则
let fileH = $.extend(true, [], Store.luckysheetfile);
let historyRules = _this.getHistoryRules(fileH);
-
+
//保存当前的规则
let fileClone = $.extend(true, [], _this.fileClone);
for(let c = 0; c < fileClone.length; c++){
@@ -128,10 +133,10 @@ const conditionformat = {
let fileC = $.extend(true, [], Store.luckysheetfile);
let currentRules = _this.getCurrentRules(fileC);
-
+
//刷新一次表格
_this.ref(historyRules, currentRules);
-
+
//隐藏一些dom
$("#luckysheet-modal-dialog-mask").hide();
$("#luckysheet-administerRule-dialog").hide();
@@ -171,28 +176,28 @@ const conditionformat = {
let r1 = range[s].row[0], r2 = range[s].row[1];
let c1 = range[s].column[0], c2 = range[s].column[1];
- let row = Store.visibledatarow[r2],
+ let row = Store.visibledatarow[r2],
row_pre = r1 - 1 == -1 ? 0 : Store.visibledatarow[r1 - 1];
- let col = Store.visibledatacolumn[c2],
+ let col = Store.visibledatacolumn[c2],
col_pre = c1 - 1 == -1 ? 0 : Store.visibledatacolumn[c1 - 1];
- _this.selectRange.push({
- "left": col_pre,
- "width": col - col_pre - 1,
- "top": row_pre,
- "height": row - row_pre - 1,
- "left_move": col_pre,
- "width_move": col - col_pre - 1,
- "top_move": row_pre,
- "height_move": row - row_pre - 1,
- "row": [r1, r2],
- "column": [c1, c2],
- "row_focus": r1,
- "column_focus": c1
+ _this.selectRange.push({
+ "left": col_pre,
+ "width": col - col_pre - 1,
+ "top": row_pre,
+ "height": row - row_pre - 1,
+ "left_move": col_pre,
+ "width_move": col - col_pre - 1,
+ "top_move": row_pre,
+ "height_move": row - row_pre - 1,
+ "row": [r1, r2],
+ "column": [c1, c2],
+ "row_focus": r1,
+ "column_focus": c1
});
}
}
-
+
selectionCopyShow(_this.selectRange);
});
$(document).off("click.CFmultiRangeConfirm").on("click.CFmultiRangeConfirm", "#luckysheet-multiRange-dialog-confirm", function(){
@@ -204,7 +209,7 @@ const conditionformat = {
let sheetIndex = $("#luckysheet-administerRule-dialog .chooseSheet option:selected").val();
_this.fileClone[getSheetIndex(sheetIndex)]["luckysheet_conditionformat_save"][dataItem].cellrange = _this.getRangeByTxt(v);
-
+
$("#luckysheet-modal-dialog-mask").show();
$("#luckysheet-administerRule-dialog").show();
@@ -223,14 +228,14 @@ const conditionformat = {
let range = [];
selectionCopyShow(range);
});
-
+
// 新建规则
$(document).off("click.CFnewConditionRule").on("click.CFnewConditionRule", "#newConditionRule", function(){
let sheetIndex = $("#luckysheet-administerRule-dialog .chooseSheet option:selected").val();
if(!checkProtectionFormatCells(sheetIndex)){
return;
}
-
+
if(Store.luckysheet_select_save.length == 0){
if(isEditMode()){
alert(conditionformat_Text.pleaseSelectRange);
@@ -240,19 +245,19 @@ const conditionformat = {
}
return;
}
-
+
_this.newConditionRuleDialog(1);
});
$(document).off("click.CFnewConditionRuleConfirm").on("click.CFnewConditionRuleConfirm", "#luckysheet-newConditionRule-dialog-confirm", function(){
-
+
if(!checkProtectionFormatCells(Store.currentSheetIndex)){
return;
}
-
+
let index = $("#luckysheet-newConditionRule-dialog .ruleTypeItem.on").index();
let type1 = $("#luckysheet-newConditionRule-dialog #type1 option:selected").val();
let type2 = $("#luckysheet-newConditionRule-dialog ." + type1 + "Box #type2 option:selected").val();
-
+
let format, rule;
if(index == 0){
if(type1 == "dataBar"){ //数据条
@@ -266,8 +271,8 @@ const conditionformat = {
}
rule = {
- "type": "dataBar",
- "cellrange": $.extend(true, [], Store.luckysheet_select_save),
+ "type": "dataBar",
+ "cellrange": $.extend(true, [], Store.luckysheet_select_save),
"format": format
};
}
@@ -284,8 +289,8 @@ const conditionformat = {
}
rule = {
- "type": "colorGradation",
- "cellrange": $.extend(true, [], Store.luckysheet_select_save),
+ "type": "colorGradation",
+ "cellrange": $.extend(true, [], Store.luckysheet_select_save),
"format": format
};
}
@@ -295,14 +300,14 @@ const conditionformat = {
let top = $(this).parents("#luckysheet-newConditionRule-dialog").find(".iconsBox .model").attr("data-top");
format = {
- "len": len,
+ "len": len,
"leftMin": leftMin,
"top": top
};
rule = {
- "type": "icons",
- "cellrange": $.extend(true, [], Store.luckysheet_select_save),
+ "type": "icons",
+ "cellrange": $.extend(true, [], Store.luckysheet_select_save),
"format": format
};
}
@@ -330,7 +335,7 @@ const conditionformat = {
if(r1 == r2 && c1 == c2){
v1 = getcellvalue(r1, c1, Store.flowdata);
-
+
conditionRange.push({ "row": rangeArr1[0].row, "column": rangeArr1[0].column });
conditionValue.push(v1);
}
@@ -360,7 +365,7 @@ const conditionformat = {
if(r1 == r2 && c1 == c2){
v2 = getcellvalue(r1, c1, Store.flowdata);
-
+
conditionRange.push({ "row": rangeArr2[0].row, "column": rangeArr2[0].column });
conditionValue.push(v2);
}
@@ -395,7 +400,7 @@ const conditionformat = {
if(r1 == r2 && c1 == c2){
v = getcellvalue(r1, c1, Store.flowdata);
-
+
conditionRange.push({ "row": rangeArr[0].row, "column": rangeArr[0].column });
conditionValue.push(v);
}
@@ -433,7 +438,7 @@ const conditionformat = {
if(r1 == r2 && c1 == c2){
v = getcellvalue(r1, c1, Store.flowdata);
-
+
conditionRange.push({ "row": rangeArr[0].row, "column": rangeArr[0].column });
conditionValue.push(v);
}
@@ -462,7 +467,7 @@ const conditionformat = {
_this.infoDialog(conditionformat_Text.pleaseSelectADate, "");
return;
}
-
+
conditionValue.push(v);
}
}
@@ -492,7 +497,7 @@ const conditionformat = {
_this.infoDialog(conditionformat_Text.pleaseEnterInteger, "");
return;
}
-
+
conditionValue.push(parseInt(v));
}
else if(index == 3){ //平均值
@@ -509,6 +514,19 @@ const conditionformat = {
conditionName = "duplicateValue";
conditionValue.push(type1);
}
+ else if(index == 5){ //公式
+ conditionName = "formula";
+
+ //条件值
+ let v = $("#luckysheet-newConditionRule-dialog #formulaConditionVal input").val().trim();
+
+ if(v == ""){
+ _this.infoDialog("Condition value cannot be empty!", "");
+ return;
+ }
+
+ conditionValue.push(v);
+ }
//格式颜色
let textcolor;
@@ -516,44 +534,44 @@ const conditionformat = {
textcolor = $("#luckysheet-newConditionRule-dialog #textcolorshow").spectrum("get").toHexString();
}
else{
- textcolor = null;
+ textcolor = null;
}
-
+
let cellcolor;
if($("#luckysheet-newConditionRule-dialog #checkCellColor").is(":checked")){
cellcolor = $("#luckysheet-newConditionRule-dialog #cellcolorshow").spectrum("get").toHexString();
}
else{
- cellcolor = null;
+ cellcolor = null;
}
format = {
- "textColor": textcolor,
+ "textColor": textcolor,
"cellColor": cellcolor
};
rule = {
"type": "default",
"cellrange": $.extend(true, [], Store.luckysheet_select_save),
- "format": format,
- "conditionName": conditionName,
- "conditionRange": conditionRange,
- "conditionValue": conditionValue
+ "format": format,
+ "conditionName": conditionName,
+ "conditionRange": conditionRange,
+ "conditionValue": conditionValue
};
}
$("#luckysheet-newConditionRule-dialog").hide();
-
+
//新建规则的入口
let source = $(this).attr("data-source");
-
+
if(source == 0){
$("#luckysheet-modal-dialog-mask").hide();
-
+
//保存之前的规则
let fileH = $.extend(true, [], Store.luckysheetfile);
let historyRules = _this.getHistoryRules(fileH);
-
+
//保存当前的规则
let ruleArr = Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)]["luckysheet_conditionformat_save"] == undefined ? [] : Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)]["luckysheet_conditionformat_save"];
ruleArr.push(rule);
@@ -561,7 +579,7 @@ const conditionformat = {
let fileC = $.extend(true, [], Store.luckysheetfile);
let currentRules = _this.getCurrentRules(fileC);
-
+
//刷新一次表格
_this.ref(historyRules, currentRules);
@@ -575,7 +593,7 @@ const conditionformat = {
let ruleArr = !!_this.fileClone[getSheetIndex(Store.currentSheetIndex)]["luckysheet_conditionformat_save"] ? _this.fileClone[getSheetIndex(Store.currentSheetIndex)]["luckysheet_conditionformat_save"] : [];
ruleArr.push(rule);
_this.fileClone[getSheetIndex(Store.currentSheetIndex)]["luckysheet_conditionformat_save"] = ruleArr;
-
+
//新建规则隐藏，管理规则显示
_this.administerRuleDialog();
}
@@ -589,25 +607,25 @@ const conditionformat = {
if(source == 1){
$("#luckysheet-administerRule-dialog").show();
}
-
+
//新建规则隐藏
$("#luckysheet-newConditionRule-dialog").hide();
-
+
//隐藏虚线框
$("#luckysheet-formula-functionrange-select").hide();
$("#luckysheet-row-count-show").hide();
- $("#luckysheet-column-count-show").hide();
+ $("#luckysheet-column-count-show").hide();
});
-
+
// 编辑规则
$(document).off("click.CFeditorConditionRule").on("click.CFeditorConditionRule", "#editorConditionRule", function(){
let sheetIndex = $("#luckysheet-administerRule-dialog .chooseSheet option:selected").val();
-
+
if(!checkProtectionFormatCells(sheetIndex)){
return;
}
-
+
let itemIndex = $("#luckysheet-administerRule-dialog .ruleList .listBox .item.on").attr("data-item");
let rule = {
@@ -624,7 +642,7 @@ const conditionformat = {
let type2 = $("#luckysheet-editorConditionRule-dialog ." + type1 + "Box #type2 option:selected").val();
let cellrange = _this.editorRule["data"].cellrange;
-
+
let format, rule;
if(index == 0){
if(type1 == "dataBar"){ //数据条
@@ -638,8 +656,8 @@ const conditionformat = {
}
rule = {
- "type": "dataBar",
- "cellrange": cellrange,
+ "type": "dataBar",
+ "cellrange": cellrange,
"format": format
};
}
@@ -656,8 +674,8 @@ const conditionformat = {
}
rule = {
- "type": "colorGradation",
- "cellrange": cellrange,
+ "type": "colorGradation",
+ "cellrange": cellrange,
"format": format
};
}
@@ -667,14 +685,14 @@ const conditionformat = {
let top = $(this).parents("#luckysheet-editorConditionRule-dialog").find(".iconsBox .model").attr("data-top");
format = {
- "len": len,
+ "len": len,
"leftMin": leftMin,
"top": top
};
rule = {
- "type": "icons",
- "cellrange": cellrange,
+ "type": "icons",
+ "cellrange": cellrange,
"format": format
};
}
@@ -702,7 +720,7 @@ const conditionformat = {
if(r1 == r2 && c1 == c2){
v1 = getcellvalue(r1, c1, Store.flowdata);
-
+
conditionRange.push({ "row": rangeArr1[0].row, "column": rangeArr1[0].column });
conditionValue.push(v1);
}
@@ -732,7 +750,7 @@ const conditionformat = {
if(r1 == r2 && c1 == c2){
v2 = getcellvalue(r1, c1, Store.flowdata);
-
+
conditionRange.push({ "row": rangeArr2[0].row, "column": rangeArr2[0].column });
conditionValue.push(v2);
}
@@ -767,7 +785,7 @@ const conditionformat = {
if(r1 == r2 && c1 == c2){
v = getcellvalue(r1, c1, Store.flowdata);
-
+
conditionRange.push({ "row": rangeArr[0].row, "column": rangeArr[0].column });
conditionValue.push(v);
}
@@ -805,7 +823,7 @@ const conditionformat = {
if(r1 == r2 && c1 == c2){
v = getcellvalue(r1, c1, Store.flowdata);
-
+
conditionRange.push({ "row": rangeArr[0].row, "column": rangeArr[0].column });
conditionValue.push(v);
}
@@ -834,7 +852,7 @@ const conditionformat = {
_this.infoDialog(conditionformat_Text.pleaseSelectADate, "");
return;
}
-
+
conditionValue.push(v);
}
}
@@ -864,7 +882,7 @@ const conditionformat = {
_this.infoDialog(conditionformat_Text.pleaseEnterInteger, "");
return;
}
-
+
conditionValue.push(v);
}
else if(index == 3){ //平均值
@@ -881,6 +899,19 @@ const conditionformat = {
conditionName = "duplicateValue";
conditionValue.push(type1);
}
+ else if(index == 5){ //公式
+ conditionName = "formula";
+
+ //条件值
+ let v = $("#luckysheet-editorConditionRule-dialog #formulaConditionVal input").val().trim();
+ console.log(v)
+ if(v == ""){
+ _this.infoDialog("Condition value cannot be empty!", "");
+ return;
+ }
+
+ conditionValue.push(v);
+ }
//格式颜色
let textcolor;
@@ -888,29 +919,29 @@ const conditionformat = {
textcolor = $("#luckysheet-editorConditionRule-dialog #textcolorshow").spectrum("get").toHexString();
}
else{
- textcolor = null;
+ textcolor = null;
}
-
+
let cellcolor;
if($("#luckysheet-editorConditionRule-dialog #checkCellColor").is(":checked")){
cellcolor = $("#luckysheet-editorConditionRule-dialog #cellcolorshow").spectrum("get").toHexString();
}
else{
- cellcolor = null;
+ cellcolor = null;
}
format = {
- "textColor": textcolor,
+ "textColor": textcolor,
"cellColor": cellcolor
};
rule = {
"type": "default",
"cellrange": cellrange,
- "format": format,
- "conditionName": conditionName,
- "conditionRange": conditionRange,
- "conditionValue": conditionValue
+ "format": format,
+ "conditionName": conditionName,
+ "conditionRange": conditionRange,
+ "conditionValue": conditionValue
};
}
@@ -918,7 +949,7 @@ const conditionformat = {
let sheetIndex = _this.editorRule["sheetIndex"];
let itemIndex = _this.editorRule["itemIndex"];
_this.fileClone[getSheetIndex(sheetIndex)]["luckysheet_conditionformat_save"][itemIndex] = rule;
-
+
//编辑规则隐藏，管理规则显示
$("#luckysheet-editorConditionRule-dialog").hide();
_this.administerRuleDialog();
@@ -936,7 +967,7 @@ const conditionformat = {
// 新建规则、编辑规则 类型切换
$(document).off("click.CFnewEditorRuleItem").on("click.CFnewEditorRuleItem", ".luckysheet-newEditorRule-dialog .ruleTypeItem", function(){
$(this).addClass("on").siblings().removeClass("on");
-
+
let index = $(this).index();
$(this).parents(".luckysheet-newEditorRule-dialog").find(".ruleExplainBox").html(_this.getRuleExplain(index));
@@ -956,7 +987,7 @@ const conditionformat = {
$(document).off("change.CFnewEditorRuleType2").on("change.CFnewEditorRuleType2", ".luckysheet-newEditorRule-dialog #type2", function(){
let type1 = $(this).parents(".luckysheet-newEditorRule-dialog").find("#type1 option:selected").val();
- if(type1 == "colorGradation"){
+ if(type1 == "colorGradation"){
let type2 = $(this).find("option:selected").val();
if(type2 == "threeColor"){
@@ -1001,34 +1032,34 @@ const conditionformat = {
// 删除规则
$(document).off("click.CFdeleteConditionRule").on("click.CFdeleteConditionRule", "#deleteConditionRule", function(){
let sheetIndex = $("#luckysheet-administerRule-dialog .chooseSheet option:selected").val();
-
+
if(!checkProtectionFormatCells(sheetIndex)){
return;
}
-
+
let itemIndex = $("#luckysheet-administerRule-dialog .ruleList .listBox .item.on").attr("data-item");
_this.fileClone[getSheetIndex(sheetIndex)]["luckysheet_conditionformat_save"].splice(itemIndex, 1);
_this.administerRuleDialog();
});
-
+
// 规则子菜单弹出层 点击确定修改样式
$(document).off("click.CFdefault").on("click.CFdefault", "#luckysheet-conditionformat-dialog-confirm", function(){
-
+
if(!checkProtectionFormatCells(Store.currentSheetIndex)){
return;
}
-
+
//条件名称
let conditionName = $("#luckysheet-conditionformat-dialog .box").attr("data-itemvalue");
-
+
//条件单元格
let conditionRange = [];
-
+
//条件值
let conditionValue = [];
if(conditionName == "greaterThan" || conditionName == "lessThan" || conditionName == "equal" || conditionName == "textContains"){
let v = $("#luckysheet-conditionformat-dialog #conditionVal").val().trim();
-
+
//条件值是否是选区
let rangeArr = _this.getRangeByTxt(v);
if(rangeArr.length > 1){
@@ -1041,7 +1072,7 @@ const conditionformat = {
if(r1 == r2 && c1 == c2){
v = getcellvalue(r1, c1, Store.flowdata);
-
+
conditionRange.push({ "row": rangeArr[0].row, "column": rangeArr[0].column });
conditionValue.push(v);
}
@@ -1076,7 +1107,7 @@ const conditionformat = {
if(r1 == r2 && c1 == c2){
v1 = getcellvalue(r1, c1, Store.flowdata);
-
+
conditionRange.push({ "row": rangeArr1[0].row, "column": rangeArr1[0].column });
conditionValue.push(v1);
}
@@ -1106,7 +1137,7 @@ const conditionformat = {
if(r1 == r2 && c1 == c2){
v2 = getcellvalue(r1, c1, Store.flowdata);
-
+
conditionRange.push({ "row": rangeArr2[0].row, "column": rangeArr2[0].column });
conditionValue.push(v2);
}
@@ -1161,7 +1192,7 @@ const conditionformat = {
textcolor = $("#textcolorshow").spectrum("get").toHexString();
}
else{
- textcolor = null;
+ textcolor = null;
}
let cellcolor;
@@ -1169,24 +1200,24 @@ const conditionformat = {
cellcolor = $("#cellcolorshow").spectrum("get").toHexString();
}
else{
- cellcolor = null;
+ cellcolor = null;
}
//保存之前的规则
let fileH = $.extend(true, [], Store.luckysheetfile);
let historyRules = _this.getHistoryRules(fileH);
-
+
//保存当前的规则
let rule = {
"type": "default",
"cellrange": $.extend(true, [], Store.luckysheet_select_save),
"format": {
- "textColor": textcolor,
+ "textColor": textcolor,
"cellColor": cellcolor
- },
- "conditionName": conditionName,
- "conditionRange": conditionRange,
- "conditionValue": conditionValue
+ },
+ "conditionName": conditionName,
+ "conditionRange": conditionRange,
+ "conditionValue": conditionValue
};
let ruleArr = Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)]["luckysheet_conditionformat_save"] == undefined ? [] : Store.luckysheetfile[getSheetIndex(Store.currentSheetIndex)]["luckysheet_conditionformat_save"];
ruleArr.push(rule);
@@ -1194,10 +1225,10 @@ const conditionformat = {
let fileC = $.extend(true, [], Store.luckysheetfile);
let currentRules = _this.getCurrentRules(fileC);
-
+
//刷新一次表格
_this.ref(historyRules, currentRules);
-
+
//隐藏一些dom
$("#luckysheet-modal-dialog-mask").hide();
$("#luckysheet-conditionformat-dialog").hide();
@@ -1207,7 +1238,7 @@ const conditionformat = {
server.saveParam("all", Store.currentSheetIndex, ruleArr, { "k": "luckysheet_conditionformat_save" });
}
});
-
+
// 图标集弹出层 选择
$(document).off("click.CFicons").on("click.CFicons", "#luckysheet-CFicons-dialog .item", function(){
$("#luckysheet-modal-dialog-mask").hide();
@@ -1216,7 +1247,7 @@ const conditionformat = {
if(Store.luckysheet_select_save.length > 0){
let cellrange = $.extend(true, [], Store.luckysheet_select_save);
let format = {
- "len": $(this).attr("data-len"),
+ "len": $(this).attr("data-len"),
"leftMin": $(this).attr("data-leftMin"),
"top": $(this).attr("data-top")
}
@@ -1224,32 +1255,45 @@ const conditionformat = {
_this.updateItem("icons", cellrange, format);
}
});
-
+
// 选择单元格
$(document).on("click", ".range .fa-table", function(){
let id = $(this).parents(".luckysheet-modal-dialog").attr("id");
$("#" + id).hide();
//入口
let source;
+
if(id == "luckysheet-conditionformat-dialog"){
- if($(this).siblings("input").attr("id") == "conditionVal"){
+ let $id = $(this).siblings("input").attr("id");
+
+ if($id == "conditionVal"){
source = "0_1";
}
else{
- source = "0_2";
+ source = "0_2";
}
}
else if(id == "luckysheet-newConditionRule-dialog"){
- if($(this).parents(".range").attr("id") == "conditionVal"){
- source = "1_1";
+ let $id = $(this).parents(".range").attr("id");
+
+ if($id == "formulaConditionVal"){
+ source = "1_0";
+ }
+ else if($id == "conditionVal"){
+ source = "1_1";
}
else{
source = "1_2";
}
}
else if(id == "luckysheet-editorConditionRule-dialog"){
- if($(this).parents(".range").attr("id") == "conditionVal"){
- source = "2_1";
+ let $id = $(this).parents(".range").attr("id");
+
+ if($id == "formulaConditionVal"){
+ source = "2_0";
+ }
+ else if($id == "conditionVal"){
+ source = "2_1";
}
else{
source = "2_2";
@@ -1267,7 +1311,7 @@ const conditionformat = {
let source = $(this).attr("data-source");
let v = $(this).parents("#luckysheet-singleRange-dialog").find("input").val();
-
+
if(source == "0_1"){
$("#luckysheet-conditionformat-dialog").show();
$("#luckysheet-conditionformat-dialog #conditionVal").val(v);
@@ -1276,6 +1320,10 @@ const conditionformat = {
$("#luckysheet-conditionformat-dialog").show();
$("#luckysheet-conditionformat-dialog #conditionVal2").val(v);
}
+ else if(source == "1_0"){
+ $("#luckysheet-newConditionRule-dialog").show();
+ $("#luckysheet-newConditionRule-dialog #formulaConditionVal input").val(v);
+ }
else if(source == "1_1"){
$("#luckysheet-newConditionRule-dialog").show();
$("#luckysheet-newConditionRule-dialog #conditionVal input").val(v);
@@ -1284,6 +1332,10 @@ const conditionformat = {
$("#luckysheet-newConditionRule-dialog").show();
$("#luckysheet-newConditionRule-dialog #conditionVal2 input").val(v);
}
+ else if(source == "2_0"){
+ $("#luckysheet-editorConditionRule-dialog").show();
+ $("#luckysheet-editorConditionRule-dialog #formulaConditionVal input").val(v);
+ }
else if(source == "2_1"){
$("#luckysheet-editorConditionRule-dialog").show();
$("#luckysheet-editorConditionRule-dialog #conditionVal input").val(v);
@@ -1304,21 +1356,21 @@ const conditionformat = {
if(source == "0_1" || source == "0_2"){
$("#luckysheet-conditionformat-dialog").show();
}
- else if(source == "1_1" || source == "1_2"){
+ else if(source == "1_0" || source == "1_1" || source == "1_2"){
$("#luckysheet-newConditionRule-dialog").show();
}
- else if(source == "2_1" || source == "2_2"){
+ else if(source == "2_0" || source == "2_1" || source == "2_2"){
$("#luckysheet-editorConditionRule-dialog").show();
}
let range = [];
selectionCopyShow(range);
});
-
+
// 弹出层右上角关闭按钮
$(document).on("click", ".luckysheet-modal-dialog-title-close", function(){
let id = $(this).parents(".luckysheet-modal-dialog").attr("id");
-
+
//新建规则弹出层
if(id == "luckysheet-newConditionRule-dialog"){
let source = $("#" + id).find("#luckysheet-newConditionRule-dialog-close").attr("data-source");
@@ -1327,7 +1379,7 @@ const conditionformat = {
$("#luckysheet-administerRule-dialog").show();
}
}
-
+
//编辑规则弹出层
if(id == "luckysheet-editorConditionRule-dialog"){
$("#luckysheet-administerRule-dialog").show();
@@ -1379,26 +1431,26 @@ const conditionformat = {
const conditionformat_Text = locale().conditionformat;
- $("body").append(replaceHtml(modelHTML, {
- "id": "luckysheet-singleRange-dialog",
- "addclass": "luckysheet-singleRange-dialog",
- "title": conditionformat_Text.selectCell,
- "content": ``,
+ $("body").append(replaceHtml(modelHTML, {
+ "id": "luckysheet-singleRange-dialog",
+ "addclass": "luckysheet-singleRange-dialog",
+ "title": conditionformat_Text.selectCell,
+ "content": ``,
"botton": `
- `,
- "style": "z-index:100003"
+ `,
+ "style": "z-index:100003"
}));
let $t = $("#luckysheet-singleRange-dialog")
.find(".luckysheet-modal-dialog-content")
.css("min-width", 300)
- .end(),
- myh = $t.outerHeight(),
+ .end(),
+ myh = $t.outerHeight(),
myw = $t.outerWidth();
let winw = $(window).width(), winh = $(window).height();
let scrollLeft = $(document).scrollLeft(), scrollTop = $(document).scrollTop();
- $("#luckysheet-singleRange-dialog").css({
- "left": (winw + scrollLeft - myw) / 2,
- "top": (winh + scrollTop - myh) / 3
+ $("#luckysheet-singleRange-dialog").css({
+ "left": (winw + scrollLeft - myw) / 2,
+ "top": (winh + scrollTop - myh) / 3
}).show();
},
multiRangeDialog: function(dataItem, value){
@@ -1409,26 +1461,26 @@ const conditionformat = {
const conditionformat_Text = locale().conditionformat;
- $("body").append(replaceHtml(modelHTML, {
- "id": "luckysheet-multiRange-dialog",
- "addclass": "luckysheet-multiRange-dialog",
- "title": conditionformat_Text.selectRange,
- "content": ``,
+ $("body").append(replaceHtml(modelHTML, {
+ "id": "luckysheet-multiRange-dialog",
+ "addclass": "luckysheet-multiRange-dialog",
+ "title": conditionformat_Text.selectRange,
+ "content": ``,
"botton": `
- `,
- "style": "z-index:100003"
+ `,
+ "style": "z-index:100003"
}));
let $t = $("#luckysheet-multiRange-dialog")
.find(".luckysheet-modal-dialog-content")
.css("min-width", 300)
- .end(),
- myh = $t.outerHeight(),
+ .end(),
+ myh = $t.outerHeight(),
myw = $t.outerWidth();
let winw = $(window).width(), winh = $(window).height();
let scrollLeft = $(document).scrollLeft(), scrollTop = $(document).scrollTop();
- $("#luckysheet-multiRange-dialog").css({
- "left": (winw + scrollLeft - myw) / 2,
- "top": (winh + scrollTop - myh) / 3
+ $("#luckysheet-multiRange-dialog").css({
+ "left": (winw + scrollLeft - myw) / 2,
+ "top": (winh + scrollTop - myh) / 3
}).show();
selectionCopyShow(_this.getRangeByTxt(value));
@@ -1440,7 +1492,7 @@ const conditionformat = {
for(let s = 0; s < range.length; s++){
let r1 = range[s].row[0], r2 = range[s].row[1];
let c1 = range[s].column[0], c2 = range[s].column[1];
-
+
txt.push(getRangetxt(Store.currentSheetIndex, { "row": [r1, r2], "column": [c1, c2] }, Store.currentSheetIndex));
}
@@ -1460,7 +1512,7 @@ const conditionformat = {
}
else{
range = [];
- break;
+ break;
}
}
}
@@ -1469,7 +1521,6 @@ const conditionformat = {
range.push(formula.getcellrange(txt));
}
}
-
return range;
},
colorSelectInit: function(){
@@ -1520,31 +1571,31 @@ const conditionformat = {
const conditionformat_Text = locale().conditionformat;
- $("body").append(replaceHtml(modelHTML, {
- "id": "luckysheet-conditionformat-dialog",
- "addclass": "luckysheet-conditionformat-dialog",
- "title": title,
- "content": content,
+ $("body").append(replaceHtml(modelHTML, {
+ "id": "luckysheet-conditionformat-dialog",
+ "addclass": "luckysheet-conditionformat-dialog",
+ "title": title,
+ "content": content,
"botton": `
- `,
- "style": "z-index:100003"
+ `,
+ "style": "z-index:9999"
}));
let $t = $("#luckysheet-conditionformat-dialog")
.find(".luckysheet-modal-dialog-content")
.css("min-width", 300)
- .end(),
- myh = $t.outerHeight(),
+ .end(),
+ myh = $t.outerHeight(),
myw = $t.outerWidth();
let winw = $(window).width(), winh = $(window).height();
let scrollLeft = $(document).scrollLeft(), scrollTop = $(document).scrollTop();
- $("#luckysheet-conditionformat-dialog").css({
- "left": (winw + scrollLeft - myw) / 2,
- "top": (winh + scrollTop - myh) / 3
+ $("#luckysheet-conditionformat-dialog").css({
+ "left": (winw + scrollLeft - myw) / 2,
+ "top": (winh + scrollTop - myh) / 3
}).show();
-
+
_this.init();
_this.colorSelectInit();
-
+
if(title == locale().conditionformat.conditionformat_occurrenceDate){
_this.daterangeInit("luckysheet-conditionformat-dialog");
}
@@ -1611,25 +1662,25 @@ const conditionformat = {
", "value":"borderSize", "example":"more"}
@@ -1080,6 +1127,11 @@ const menuButton = {
// border choose menu
$menuButton.find(".luckysheet-cols-menuitem").click(function(){
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+ return
+ }
$menuButton.hide();
luckysheetContainerFocus();
@@ -1115,13 +1167,13 @@ const menuButton = {
"borderType": itemvalue,
"color": color,
"style": style,
- "range": Store.luckysheet_select_save
+ "range": $.extend(true, [], Store.luckysheet_select_save)
}
cfg["borderInfo"].push(borderInfo);
if (Store.clearjfundo) {
- Store.jfundo = [];
+ Store.jfundo.length = 0;
let redo = [];
@@ -1221,6 +1273,8 @@ const menuButton = {
//合并单元格
$("#luckysheet-icon-merge-button").click(function(){
+ const _locale = locale();
+ const locale_merge = _locale.merge;
if(!checkProtectionNotEnable(Store.currentSheetIndex)){
return;
@@ -1228,10 +1282,10 @@ const menuButton = {
if(selectIsOverlap()){
if(isEditMode()){
- alert("不能合并重叠区域");
+ alert(locale_merge.overlappingError);
}
else{
- tooltip.info("不能合并重叠区域", "");
+ tooltip.info(locale_merge.overlappingError, "");
}
return;
}
@@ -1254,10 +1308,10 @@ const menuButton = {
if(has_PartMC){
if(isEditMode()){
- alert("无法对部分合并单元格执行此操作");
+ alert(locale_merge.partiallyError);
}
else{
- tooltip.info("无法对部分合并单元格执行此操作", "");
+ tooltip.info(locale_merge.partiallyError, "");
}
return;
}
@@ -1287,7 +1341,7 @@ const menuButton = {
let menu = replaceHtml(_this.menu, { "id": "merge-menu", "item": itemset, "subclass": "", "sub": "" });
$("body").append(menu);
- $menuButton = $("#"+menuButtonId).width(110);
+ $menuButton = $("#"+menuButtonId);
_this.focus($menuButton);
$menuButton.find(".luckysheet-cols-menuitem").click(function(){
@@ -1368,9 +1422,9 @@ const menuButton = {
const _locale = locale();
const locale_align = _locale.align;
let itemdata = [
- {"text": locale_align.left, "value": "left", "example": ''},
- {"text": locale_align.center, "value": "center", "example": ''},
- {"text": locale_align.right, "value": "right", "example": ''}
+ {"text": locale_align.left, "value": "left", "example": ''},
+ {"text": locale_align.center, "value": "center", "example": ''},
+ {"text": locale_align.right, "value": "right", "example": ''}
];
// itemvalue to iconfont
@@ -1429,9 +1483,9 @@ const menuButton = {
const locale_align = _locale.align;
if($menuButton.length == 0){
let itemdata = [
- {"text": locale_align.top, "value": "top", "example": ''},
- {"text": locale_align.middle, "value": "middle", "example": ''},
- {"text": locale_align.bottom, "value": "bottom", "example": ''}
+ {"text": locale_align.top, "value": "top", "example": ''},
+ {"text": locale_align.middle, "value": "middle", "example": ''},
+ {"text": locale_align.bottom, "value": "bottom", "example": ''}
];
// itemvalue to iconfont
@@ -1481,9 +1535,9 @@ const menuButton = {
const _locale = locale();
const locale_textWrap = _locale.textWrap;
let itemdata = [
- {"text": locale_textWrap.overflow, "value": "overflow", "example": ''},
- {"text": locale_textWrap.wrap, "value": "wrap", "example": ''},
- {"text": locale_textWrap.clip, "value": "clip", "example": ''}
+ {"text": locale_textWrap.overflow, "value": "overflow", "example": ''},
+ {"text": locale_textWrap.wrap, "value": "wrap", "example": ''},
+ {"text": locale_textWrap.clip, "value": "clip", "example": ''}
];
// itemvalue to iconfont
@@ -1533,12 +1587,12 @@ const menuButton = {
const _locale = locale();
const locale_rotation = _locale.rotation;
let itemdata = [
- {"text": locale_rotation.none, "value": "none", "example": ''},
- {"text": locale_rotation.angleup, "value": "angleup", "example": ''},
- {"text": locale_rotation.angledown, "value": "angledown", "example": ''},
- {"text": locale_rotation.vertical, "value": "vertical", "example": ''},
- {"text": locale_rotation.rotationUp, "value": "rotation-up", "example": ''},
- {"text": locale_rotation.rotationDown, "value": "rotation-down", "example": ''},
+ {"text": locale_rotation.none, "value": "none", "example": ''},
+ {"text": locale_rotation.angleup, "value": "angleup", "example": ''},
+ {"text": locale_rotation.angledown, "value": "angledown", "example": ''},
+ {"text": locale_rotation.vertical, "value": "vertical", "example": ''},
+ {"text": locale_rotation.rotationUp, "value": "rotation-up", "example": ''},
+ {"text": locale_rotation.rotationDown, "value": "rotation-down", "example": ''},
];
// itemvalue to iconfont
@@ -1614,77 +1668,98 @@ const menuButton = {
let $t = $(this), itemvalue = $t.attr("itemvalue");
_this.focus($menuButton, itemvalue);
+ if (itemvalue === 'freezenCancel') {
+ $menuButton.find('.fa.fa-check').remove();
+ }
// store frozen
luckysheetFreezen.saveFrozen(itemvalue);
if(itemvalue == "freezenRow"){ //首行冻结
- let scrollTop = $("#luckysheet-cell-main").scrollTop();
- let row_st = luckysheet_searcharray(Store.visibledatarow, scrollTop);
- if(row_st == -1){
- row_st = 0;
- }
- let top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columeHeaderHeight;
- let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
- luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
-
- if (luckysheetFreezen.freezenverticaldata != null) {
- luckysheetFreezen.cancelFreezenVertical();
- luckysheetFreezen.createAssistCanvas();
- luckysheetrefreshgrid();
- }
+ frozenFirstRow();
+ // let scrollTop = $("#luckysheet-cell-main").scrollTop();
+ // let row_st = luckysheet_searcharray(Store.visibledatarow, scrollTop);
+ // if(row_st == -1){
+ // row_st = 0;
+ // }
+ // let top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight;
+ // let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+ // luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
+
+ // if (luckysheetFreezen.freezenverticaldata != null) {
+ // luckysheetFreezen.cancelFreezenVertical();
+ // luckysheetFreezen.createAssistCanvas();
+ // luckysheetrefreshgrid();
+ // }
- luckysheetFreezen.createFreezenHorizontal(freezenhorizontaldata, top);
- luckysheetFreezen.createAssistCanvas();
- luckysheetrefreshgrid();
+ // luckysheetFreezen.createFreezenHorizontal(freezenhorizontaldata, top);
+ // luckysheetFreezen.createAssistCanvas();
+ // luckysheetrefreshgrid();
}
else if(itemvalue == "freezenColumn"){ //首列冻结
- let scrollLeft = $("#luckysheet-cell-main").scrollLeft();
- let col_st = luckysheet_searcharray(Store.visibledatacolumn, scrollLeft);
- if(col_st == -1){
- col_st = 0;
- }
- let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
- let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
- luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
-
- if (luckysheetFreezen.freezenhorizontaldata != null) {
- luckysheetFreezen.cancelFreezenHorizontal();
- luckysheetFreezen.createAssistCanvas();
- luckysheetrefreshgrid();
- }
+ frozenFirstColumn();
+ // let scrollLeft = $("#luckysheet-cell-main").scrollLeft();
+ // let col_st = luckysheet_searcharray(Store.visibledatacolumn, scrollLeft);
+ // if(col_st == -1){
+ // col_st = 0;
+ // }
+ // let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
+ // let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+ // luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
+
+ // if (luckysheetFreezen.freezenhorizontaldata != null) {
+ // luckysheetFreezen.cancelFreezenHorizontal();
+ // luckysheetFreezen.createAssistCanvas();
+ // luckysheetrefreshgrid();
+ // }
- luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
- luckysheetFreezen.createAssistCanvas();
- luckysheetrefreshgrid();
+ // luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
+ // luckysheetFreezen.createAssistCanvas();
+ // luckysheetrefreshgrid();
}
else if(itemvalue == "freezenRC"){ //首行列冻结
- let scrollTop = $("#luckysheet-cell-main").scrollTop();
- let row_st = luckysheet_searcharray(Store.visibledatarow, scrollTop);
- if(row_st == -1){
- row_st = 0;
- }
- let top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columeHeaderHeight;
- let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
- luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
-
- luckysheetFreezen.createFreezenHorizontal(freezenhorizontaldata, top);
+ if (luckysheetFreezen.freezenRealFirstRowColumn) {
+ let row_st = 0;
+ let top = Store.visibledatarow[row_st] - 2 + Store.columnHeaderHeight;
+ let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+ luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
+
+ luckysheetFreezen.createFreezenHorizontal(freezenhorizontaldata, top);
+
+ let col_st = 0;
+ let left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth;
+ let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+ luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
+
+ luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
+ } else {
+ let scrollTop = $("#luckysheet-cell-main").scrollTop();
+ let row_st = luckysheet_searcharray(Store.visibledatarow, scrollTop);
+ if(row_st == -1){
+ row_st = 0;
+ }
+ let top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight;
+ let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+ luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
- let scrollLeft = $("#luckysheet-cell-main").scrollLeft();
- let col_st = luckysheet_searcharray(Store.visibledatacolumn, scrollLeft);
- if(col_st == -1){
- col_st = 0;
- }
- let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
- let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
- luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
+ luckysheetFreezen.createFreezenHorizontal(freezenhorizontaldata, top);
- luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
+ let scrollLeft = $("#luckysheet-cell-main").scrollLeft();
+ let col_st = luckysheet_searcharray(Store.visibledatacolumn, scrollLeft);
+ if(col_st == -1){
+ col_st = 0;
+ }
+ let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
+ let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+ luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
+ luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
+ }
luckysheetFreezen.createAssistCanvas();
luckysheetrefreshgrid();
}
else if(itemvalue == "freezenRowRange"){ //选区行冻结
+
if(Store.luckysheet_select_save == null || Store.luckysheet_select_save.length == 0){
if(isEditMode()){
alert(locale_freezen.noSeletionError);
@@ -1695,23 +1770,26 @@ const menuButton = {
return;
}
-
+ // 固定超出屏幕范围
+ let rangeTop = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1].top;
+ if (luckysheetFreezen.freezenRealFirstRowColumn && rangeTop > $("#luckysheet-cell-main").height()) {
+ return tooltip.info(locale_freezen.rangeRCOverErrorTitle, locale_freezen.rangeRCOverError);
+ }
let scrollTop = $("#luckysheet-cell-main").scrollTop();
let row_st = luckysheet_searcharray(Store.visibledatarow, scrollTop);
let last = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1];
let row_focus = last["row_focus"] == null ? last["row"][0] : last["row_focus"];
-
- if(row_focus > row_st){
- row_st = row_focus;
- }
-
- if(row_st == -1){
- row_st = 0;
+ row_st = Math.max(row_st - 1, row_focus - 1, 0);
+
+ let top,freezenhorizontaldata;
+ if (luckysheetFreezen.freezenRealFirstRowColumn) {
+ top = Store.visibledatarow[row_st] - 2 + Store.columnHeaderHeight;
+ freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+ } else {
+ top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight;
+ freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
}
-
- let top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columeHeaderHeight;
- let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
if (luckysheetFreezen.freezenverticaldata != null) {
@@ -1735,23 +1813,26 @@ const menuButton = {
return;
}
-
+ // 固定超出屏幕范围
+ let rangeLeft = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1].left;
+ if (luckysheetFreezen.freezenRealFirstRowColumn && rangeLeft > $("#luckysheet-cell-main").width()) {
+ return tooltip.info(locale_freezen.rangeRCOverErrorTitle, locale_freezen.rangeRCOverError);
+ }
let scrollLeft = $("#luckysheet-cell-main").scrollLeft();
let col_st = luckysheet_searcharray(Store.visibledatacolumn, scrollLeft);
let last = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1];
let column_focus = last["column_focus"] == null ? last["column"][0] : last["column_focus"];
-
- if(column_focus > col_st){
- col_st = column_focus;
- }
-
- if(col_st == -1){
- col_st = 0;
+ col_st = Math.max(col_st - 1, column_focus - 1, 0);
+
+ let left,freezenverticaldata;
+ if (luckysheetFreezen.freezenRealFirstRowColumn) {
+ left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth;
+ freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+ } else {
+ left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
+ freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
}
-
- let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
- let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
if (luckysheetFreezen.freezenhorizontaldata != null) {
@@ -1775,42 +1856,48 @@ const menuButton = {
return;
}
+
+ // 固定超出屏幕范围
+ let rangeTop = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1].top;
+ let rangeLeft = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1].left;
+ if (luckysheetFreezen.freezenRealFirstRowColumn && (rangeTop > $("#luckysheet-cell-main").height() || rangeLeft > $("#luckysheet-cell-main").width())) {
+ return tooltip.info(locale_freezen.rangeRCOverErrorTitle, locale_freezen.rangeRCOverError);
+ }
let scrollTop = $("#luckysheet-cell-main").scrollTop();
let row_st = luckysheet_searcharray(Store.visibledatarow, scrollTop);
let last = Store.luckysheet_select_save[Store.luckysheet_select_save.length - 1];
let row_focus = last["row_focus"] == null ? last["row"][0] : last["row_focus"];
-
- if(row_focus > row_st){
- row_st = row_focus;
- }
-
- if(row_st == -1){
- row_st = 0;
+ row_st = Math.max(row_st - 1, row_focus - 1, 0);
+
+ let top,freezenhorizontaldata;
+ if (luckysheetFreezen.freezenRealFirstRowColumn) {
+ top = Store.visibledatarow[row_st] - 2 + Store.columnHeaderHeight;
+ freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+ luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
+ } else {
+ top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columnHeaderHeight;
+ freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
+ luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
}
- let top = Store.visibledatarow[row_st] - 2 - scrollTop + Store.columeHeaderHeight;
- let freezenhorizontaldata = [Store.visibledatarow[row_st], row_st + 1, scrollTop, luckysheetFreezen.cutVolumn(Store.visibledatarow, row_st + 1), top];
- luckysheetFreezen.saveFreezen(freezenhorizontaldata, top, null, null);
-
luckysheetFreezen.createFreezenHorizontal(freezenhorizontaldata, top);
let scrollLeft = $("#luckysheet-cell-main").scrollLeft();
let col_st = luckysheet_searcharray(Store.visibledatacolumn, scrollLeft);
let column_focus = last["column_focus"] == null ? last["column"][0] : last["column_focus"];
-
- if(column_focus > col_st){
- col_st = column_focus;
- }
-
- if(col_st == -1){
- col_st = 0;
+ col_st = Math.max(col_st - 1, column_focus - 1, 0);
+
+ let left,freezenverticaldata;
+ if (luckysheetFreezen.freezenRealFirstRowColumn) {
+ left = Store.visibledatacolumn[col_st] - 2 + Store.rowHeaderWidth;
+ freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, 0, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
+ } else {
+ left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
+ freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
}
-
- let left = Store.visibledatacolumn[col_st] - 2 - scrollLeft + Store.rowHeaderWidth;
- let freezenverticaldata = [Store.visibledatacolumn[col_st], col_st + 1, scrollLeft, luckysheetFreezen.cutVolumn(Store.visibledatacolumn, col_st + 1), left];
luckysheetFreezen.saveFreezen(null, null, freezenverticaldata, left);
luckysheetFreezen.createFreezenVertical(freezenverticaldata, left);
@@ -1860,12 +1947,12 @@ const menuButton = {
const locale_sort = _locale.sort;
const locale_filter = _locale.filter;
let itemdata = [
- {"text": locale_sort.asc, "value": "asc", "example": ''},
- {"text": locale_sort.desc, "value": "desc", "example": ''},
- {"text": locale_sort.custom+"...", "value": "diysort", "example": ''},
+ {"text": locale_sort.asc, "value": "asc", "example": ''},
+ {"text": locale_sort.desc, "value": "desc", "example": ''},
+ {"text": locale_sort.custom+"...", "value": "diysort", "example": ''},
{"text": "", "value": "split", "example": ""},
- {"text": locale_filter.filter, "value": "filter", "example": ''},
- {"text": locale_filter.clearFilter, "value": "clearfilter", "example": ''}
+ {"text": locale_filter.filter, "value": "filter", "example": ''},
+ {"text": locale_filter.clearFilter, "value": "clearfilter", "example": ''}
];
let itemset = _this.createButtonMenu(itemdata);
@@ -1922,11 +2009,11 @@ const menuButton = {
const locale_findAndReplace = _locale.findAndReplace;
if($menuButton.length == 0){
let itemdata = [
- {"text": locale_findAndReplace.find+" ...", "value": "search", "example": ''},
- {"text": locale_findAndReplace.replace+" ...", "value": "replace", "example": ''},
- {"text": locale_findAndReplace.goto+" ...", "value": "goto", "example": ''},
+ {"text": locale_findAndReplace.find+" ...", "value": "search", "example": ''},
+ {"text": locale_findAndReplace.replace+" ...", "value": "replace", "example": ''},
+ // {"text": locale_findAndReplace.goto+" ...", "value": "goto", "example": ''},
{"text": "", "value": "split", "example": ""},
- {"text": locale_findAndReplace.location+" ...", "value": "location", "example": ''},
+ {"text": locale_findAndReplace.location+" ...", "value": "location", "example": ''},
{"text": locale_findAndReplace.formula, "value": "locationFormula", "example": locale_findAndReplace.locationExample},
{"text": locale_findAndReplace.date, "value": "locationConstantDate", "example": locale_findAndReplace.locationExample},
{"text": locale_findAndReplace.number, "value": "locationConstantNumber", "example": locale_findAndReplace.locationExample},
@@ -2168,19 +2255,11 @@ const menuButton = {
e.stopPropagation();
}).click(function(e){
let d = editor.deepCopyFlowData(Store.flowdata);
- let row_index = Store.luckysheet_select_save[0]["row_focus"],
- col_index = Store.luckysheet_select_save[0]["column_focus"];
- let foucsStatus = _this.checkstatus(d, row_index, col_index, "bl");
-
- if(foucsStatus == 1){
- foucsStatus = 0;
- }
- else{
- foucsStatus = 1;
- }
+
+ let flag = checkTheStatusOfTheSelectedCells("bl",1);
+ let foucsStatus = flag ? 0 : 1;
_this.updateFormat(d, "bl", foucsStatus);
- _this.menuButtonFocus(d, row_index, col_index);
});
//斜体
@@ -2189,19 +2268,11 @@ const menuButton = {
e.stopPropagation();
}).click(function(){
let d = editor.deepCopyFlowData(Store.flowdata);
- let row_index = Store.luckysheet_select_save[0]["row_focus"],
- col_index = Store.luckysheet_select_save[0]["column_focus"];
- let foucsStatus = _this.checkstatus(d, row_index, col_index, "it");
- if(foucsStatus == 1){
- foucsStatus = 0;
- }
- else{
- foucsStatus = 1;
- }
+ let flag = checkTheStatusOfTheSelectedCells("it",1);
+ let foucsStatus = flag ? 0 : 1;
_this.updateFormat(d, "it", foucsStatus);
- _this.menuButtonFocus(d, row_index, col_index);
});
//删除线
@@ -2210,19 +2281,22 @@ const menuButton = {
e.stopPropagation();
}).click(function(){
let d = editor.deepCopyFlowData(Store.flowdata);
- let row_index = Store.luckysheet_select_save[0]["row_focus"],
- col_index = Store.luckysheet_select_save[0]["column_focus"];
- let foucsStatus = _this.checkstatus(d, row_index, col_index, "cl");
-
- if(foucsStatus == 1){
- foucsStatus = 0;
- }
- else{
- foucsStatus = 1;
- }
+ let flag = checkTheStatusOfTheSelectedCells("cl",1);
+ let foucsStatus = flag ? 0 : 1;
_this.updateFormat(d, "cl", foucsStatus);
- _this.menuButtonFocus(d, row_index, col_index);
+ });
+
+ //下划线
+ $("#luckysheet-icon-underline").mousedown(function(e){
+ hideMenuByCancel(e);
+ e.stopPropagation();
+ }).click(function(){
+ let d = editor.deepCopyFlowData(Store.flowdata);
+ let flag = checkTheStatusOfTheSelectedCells("un",1);
+ let foucsStatus = flag ? 0 : 1;
+
+ _this.updateFormat(d, "un", foucsStatus);
});
//条件格式
@@ -2409,10 +2483,10 @@ const menuButton = {
}
$.post(loadSheetUrl, {"gridKey" : server.gridKey, "index": sheetindex.join(",")}, function (d) {
- let dataset = eval("(" + d + ")");
+ let dataset = new Function("return " + d)();
setTimeout(function(){
- $("#luckysheetloadingdata").fadeOut().remove();
+ Store.loadingObj.close()
}, 500);
for(let item in dataset){
@@ -2815,11 +2889,11 @@ const menuButton = {
const locale_print = _locale.print;
if($menuButton.length == 0){
let itemdata = [
- {"text": locale_print.menuItemPrint, "value": "print", "example": ''},
+ {"text": locale_print.menuItemPrint, "value": "print", "example": ''},
{"text": "", "value": "split", "example": ""},
- {"text": locale_print.menuItemAreas, "value": "areas", "example": ''},
- {"text": locale_print.menuItemRows, "value": "rows", "example": ''},
- {"text": locale_print.menuItemColumns, "value": "columns", "example": ''},
+ {"text": locale_print.menuItemAreas, "value": "areas", "example": ''},
+ {"text": locale_print.menuItemRows, "value": "rows", "example": ''},
+ {"text": locale_print.menuItemColumns, "value": "columns", "example": ''},
];
let itemset = _this.createButtonMenu(itemdata);
@@ -2853,7 +2927,7 @@ const menuButton = {
}
mouseclickposition($menuButton, menuleft, $(this).offset().top + 25, "lefttop");
});
-
+
$("body").on("mouseover mouseleave",".luckysheet-menuButton .luckysheet-cols-submenu", function(e){
let $t = $(this), attrid = $t.attr("itemvalue"),
$attr = $("#luckysheet-icon-" + attrid + "-menuButton");
@@ -2876,13 +2950,13 @@ const menuButton = {
$attr.css({ "top": top, "left": left }).show();
_this.rightclickmenu = $t;
} else {
- clearTimeout(_this.submenuhide);
- _this.submenuhide = setTimeout(function () { $attr.hide(); }, 200);
+ clearTimeout(_this.submenuhide[$attr.attr('id')]);
+ _this.submenuhide[$attr.attr('id')] = setTimeout(function () { $attr.hide(); }, 200);
}
}).on("mouseover mouseleave",".luckysheet-menuButton-sub", function(e){
if (e.type === "mouseover") {
_this.rightclickmenu.addClass("luckysheet-cols-menuitem-hover");
- clearTimeout(_this.submenuhide);
+ clearTimeout(_this.submenuhide[$(this).attr('id')]);
}
else {
_this.rightclickmenu.removeClass("luckysheet-cols-menuitem-hover");
@@ -2990,7 +3064,8 @@ const menuButton = {
type = "s"
}
else if(foucsStatus == "General" || foucsStatus === 0){
- type = "g";
+ // type = "g";
+ type = isRealNum(value) ? "n" : "g";
}
if (getObjType(cell) == "object") {
@@ -3099,7 +3174,9 @@ const menuButton = {
return;
}
- if(Store.allowEdit===false){
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
return;
}
@@ -3146,6 +3223,11 @@ const menuButton = {
jfrefreshgrid(d, Store.luckysheet_select_save, allParam, false);
},
updateFormat_mc: function(d, foucsStatus){
+ // *如果禁止前台编辑，则中止下一步操作
+ if (!checkIsAllowEdit()) {
+ tooltip.info("", locale().pivotTable.errorNotAllowEdit);
+ return
+ }
let cfg = $.extend(true, {}, Store.config);
if(cfg["merge"] == null){
cfg["merge"] = {};
@@ -3181,7 +3263,8 @@ const menuButton = {
fv[mc_r + "_" + mc_c] = $.extend(true, {}, cell);
}
else{
- let cell_clone = fv[mc_r + "_" + mc_c];
+ // let cell_clone = fv[mc_r + "_" + mc_c];
+ let cell_clone = JSON.parse(JSON.stringify(fv[mc_r + "_" + mc_c]));
delete cell_clone.v;
delete cell_clone.m;
@@ -3242,7 +3325,8 @@ const menuButton = {
fv[mc_r + "_" + mc_c] = $.extend(true, {}, cell);
}
else{
- let cell_clone = fv[mc_r + "_" + mc_c];
+ // let cell_clone = fv[mc_r + "_" + mc_c];
+ let cell_clone = JSON.parse(JSON.stringify(fv[mc_r + "_" + mc_c]));
delete cell_clone.v;
delete cell_clone.m;
@@ -3274,7 +3358,7 @@ const menuButton = {
for(let c = c1; c <= c2; c++){
let cell = d[r][c];
- if(cell != null && (!isRealNull(cell.v) || cell.f != null) && !isfirst){
+ if(cell != null && (isInlineStringCT(cell.ct) || !isRealNull(cell.v) || cell.f != null) && !isfirst){
fv = $.extend(true, {}, cell);
isfirst = true;
}
@@ -3335,7 +3419,7 @@ const menuButton = {
}
if (Store.clearjfundo) {
- Store.jfundo = [];
+ Store.jfundo.length = 0;
Store.jfredo.push({
"type": "mergeChange",
"sheetIndex": Store.currentSheetIndex,
@@ -3373,7 +3457,6 @@ const menuButton = {
if(_locale==null){
_locale = locale();
}
-
const locale_fontarray = _locale.fontarray;
const locale_fontjson = _locale.fontjson;
@@ -3401,6 +3484,14 @@ const menuButton = {
$("#luckysheet-icon-strikethrough").removeClass("luckysheet-toolbar-button-hover");
}
}
+ else if(attr == "un"){
+ if(foucsStatus != "0"){
+ $("#luckysheet-icon-underline").addClass("luckysheet-toolbar-button-hover");
+ }
+ else{
+ $("#luckysheet-icon-underline").removeClass("luckysheet-toolbar-button-hover");
+ }
+ }
else if(attr == "ff"){
let menuButtonId = "luckysheet-icon-font-family-menuButton";
let $menuButton = $("#" + menuButtonId);
@@ -3561,7 +3652,7 @@ const menuButton = {
},
menuButtonFocus: function(d, r, c){
let _this = this;
- let foucsList = ["bl", "it", "cl", "ff", "ht", "vt", "fs", "tb", "tr", "ct"];
+ let foucsList = ["bl", "it", "cl", "ff", "ht", "vt", "fs", "tb", "tr", "ct", "un"];
const _locale = locale();
for(let i = 0; i < foucsList.length; i++){
let attr = foucsList[i];
@@ -4192,23 +4283,25 @@ const menuButton = {
let cell = null;
if(type == "c"){
- cell = d[ed_m][fix];
+ cell = d[ed_m + 1][fix];
}
else{
- cell = d[fix][ed_m];
+ cell = d[fix][ed_m + 1];
}
+ /* 备注：在搜寻的时候排除自己以解决单元格函数引用自己的问题 */
if(cell != null && cell.v != null && cell.v.toString().length > 0){
- let c = ed_m;
+ let c = ed_m + 1;
if(type == "c"){
- cell = d[ed_m][fix];
+ cell = d[ed_m + 1][fix];
}
else{
- cell = d[fix][ed_m];
+ cell = d[fix][ed_m + 1];
}
while ( cell != null && cell.v != null && cell.v.toString().length > 0) {
+
c++;
let len = null;
@@ -4240,10 +4333,10 @@ const menuButton = {
}
else{
if(type == "c"){
- _this.backFormulaInput(d, ed_m, fix, [st_m, ed_m], [fix ,fix], formula);
+ _this.backFormulaInput(d, ed_m + 1, fix, [st_m, ed_m], [fix ,fix], formula);
}
else{
- _this.backFormulaInput(d, fix, ed_m, [fix ,fix], [st_m, ed_m], formula);
+ _this.backFormulaInput(d, fix, ed_m + 1, [fix ,fix], [st_m, ed_m], formula);
}
}
}
@@ -4426,14 +4519,22 @@ const menuButton = {
}
}
- if(key == "vt" && value != "1"){
+ if(key == "vt"){
if(value == "0"){
- style += "align-items: center;";
+ style += "vertical-align: middle;";
+ }
+ else if(value == "1"){
+ style += 'vertical-align: top;';
}
else if(value == "2"){
- style += "align-items: flex-end;";
+ style += "vertical-align: bottom;";
}
}
+
+ if(key == "un" && value){
+ style += 'text-decoration:underline;';
+ }
+
}
if(!isInline){
@@ -4512,7 +4613,7 @@ const menuButton = {
document.fonts && document.fonts.ready.then(function() {
// Any operation that needs to be done only after all the fonts
// have finished loading can go here.
- console.log("font ready");
+ // console.log("font ready");
});
}
diff --git a/src/controllers/mobile.js b/src/controllers/mobile.js
index 04af798a2e46879c55cf2544140d5897deb62915..657815ccf712eeaa8993d0e80fdba6b274a9cde4 100644
--- a/src/controllers/mobile.js
+++ b/src/controllers/mobile.js
@@ -9,8 +9,6 @@ export default function mobileinit(){
//去除滚动条
Store.cellMainSrollBarSize = 0;
-
-
//滑动滚动表格
let luckysheet_touchmove_status = false,
luckysheet_touchmove_startPos = {},
diff --git a/src/controllers/pivotTable.js b/src/controllers/pivotTable.js
index 90c02751736f2c19ec8bda6cb11b1e117a781452..252994f2fec19d1da26daf8ff2a6e36e10156850 100644
--- a/src/controllers/pivotTable.js
+++ b/src/controllers/pivotTable.js
@@ -35,6 +35,8 @@ import server from './server';
import {checkProtectionAuthorityNormal} from './protection';
import Store from '../store';
import locale from '../locale/locale';
+import numeral from 'numeral';
+import { luckysheetlodingHTML } from '../controllers/constant';
const pivotTable = {
pivotDatas: null,
@@ -56,7 +58,7 @@ const pivotTable = {
let realIndex = getSheetIndex(sheetIndex);
if (getObjType(Store.luckysheetfile[realIndex].pivotTable) != "object"){
- Store.luckysheetfile[realIndex].pivotTable = eval('('+ Store.luckysheetfile[realIndex].pivotTable +')');
+ Store.luckysheetfile[realIndex].pivotTable = new Function("return " + Store.luckysheetfile[realIndex].pivotTable )();
}
if (Store.luckysheetfile[realIndex].pivotTable != null) {
@@ -134,9 +136,10 @@ const pivotTable = {
let rowhidden = {};
if (_this.filterparm != null) {
for (let f in _this.filterparm) {
+ // 目的是取出rowhidden
for (let h in _this.filterparm[f]) {
- if (h.rowhidden != null) {
- rowhidden = $.extend(true, rowhidden, h.rowhidden);
+ if (h === 'rowhidden' && _this.filterparm[f][h] != null) {
+ rowhidden = $.extend(true, rowhidden, _this.filterparm[f][h]);
}
}
}
@@ -281,8 +284,8 @@ const pivotTable = {
else if (byconditiontype == "1") {
$("#luckysheet-pivotTableFilter-menu .luckysheet-pivotTableFilter-selected-input").eq(0).show().find("input").val($t.data("byconditionvalue1"));
}
-
- $("#luckysheet-pivotTableFilter-byvalue-select").empty().html('