fix(conflict): toolbar

toolbar resize.js
dream-num · Oct 29, 2020 · 8cfa6ac · 8cfa6ac
2 parents 8e410f5 + d8377ae
commit 8cfa6ac
Show file tree

Hide file tree

Showing 13 changed files with 453 additions and 112 deletions.
diff --git a/README-zh.md b/README-zh.md
@@ -191,6 +191,30 @@ npm run build
 
 [英文社群](./README.md)
 
+## 赞助
+
+如果你感觉这个项目对你有用或者有所启发，可以请作者喝杯果汁：
+
+注意事项：
+1. 付款留言请备注：昵称，您的网站地址
+2. 默认会将您加入到下方的赞助者列表。如果您想匿名赞助，付款留言请备注：匿名
+3. 如果您忘记留言昵称或者网站地址，请联系小编email: [email protected]或者微信：dushusir2。
+
+|  微信  | 支付宝 |
+|---|---|
+| <img src="https://minio.cnbabylon.com/public/luckysheet/wechat.jpg" width="140" />| <img src="https://minio.cnbabylon.com/public/luckysheet/alipay.jpg" width="130" /> |
+
+### [Paypal Me](https://www.paypal.me/wbfsa)
+
+## 赞助者列表
+（按时间顺序排列）
+- *勇 ¥ 30
+- 虚我 ¥ 200
+- 甜党 ¥ 50
+- Alphabet(Google)-gcf ¥ 1
+- **平 ¥ 100
+- **东 ¥ 10
+
 ## 贡献者和感谢
 
 ### 团队成员
@@ -208,16 +232,6 @@ npm run build
 - [@gsw945](https://github.com/gsw945)
 - [@swen-xiong](https://github.com/swen-xiong)
 
-## 捐赠
-
-如果你感觉这个项目对你有用或者有所启发，可以请作者喝杯果汁：
-
-|  微信  | 支付宝 |
-|---|---|
-| <img src="https://minio.cnbabylon.com/public/luckysheet/wechat.jpg" width="140" />| <img src="https://minio.cnbabylon.com/public/luckysheet/alipay.jpg" width="130" /> |
-
-[Paypal Me](https://www.paypal.me/wbfsa)
-
 ## 版权信息
 [MIT](http://opensource.org/licenses/MIT)
 

diff --git a/README.md b/README.md
@@ -184,6 +184,30 @@ Create a table
 
 [Chinese community](./README-zh.md)
 
+## Sponsor
+
+If you find this project useful, you can buy author a glass of juice:
+
+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: [email protected] or WeChat: dushusir2.
+
+|  WeChat  | Alipay |
+|---|---|
+| <img src="https://minio.cnbabylon.com/public/luckysheet/wechat.jpg" width="140" />| <img src="https://minio.cnbabylon.com/public/luckysheet/alipay.jpg" width="130" /> |
+
+### [Paypal Me](https://www.paypal.me/wbfsa)
+
+## Sponsors List
+(Sort by time)
+- *勇 ¥ 30
+- 虚我 ¥ 200
+- 甜党 ¥ 50
+- Alphabet(Google)-gcf ¥ 1
+- **平 ¥ 100
+- **东 ¥ 10
+
 ## Authors and acknowledgment
 
 ### Team
@@ -203,13 +227,6 @@ Create a table
 
 ## Donate
 
-If you find this project useful, you can buy author a glass of juice:
-
-|  WeChat  | Alipay |
-|---|---|
-| <img src="https://minio.cnbabylon.com/public/luckysheet/wechat.jpg" width="140" />| <img src="https://minio.cnbabylon.com/public/luckysheet/alipay.jpg" width="130" /> |
-
-[Paypal Me](https://www.paypal.me/wbfsa)
 
 
 ## License

diff --git a/docs/guide/config.md b/docs/guide/config.md
@@ -213,6 +213,7 @@ Note that you also need to configure `loadUrl` and `loadSheetUrl` to take effect
         textWrapMode: false, //'Wrap mode'
         textRotateMode: false, //'Text Rotation Mode'
 		image:false, // 'Insert picture'
+		link:false, // 'Insert link'
 		chart: false, //'chart' (the icon is hidden, but if the chart plugin is configured, you can still create a new chart by right click)
 		postil: false, //'comment'
 		pivotTable: false, //'PivotTable'
@@ -226,7 +227,6 @@ Note that you also need to configure `loadUrl` and `loadSheetUrl` to take effect
 		findAndReplace: false, //'Find and Replace'
 		protection:false, // 'Worksheet protection'
 		print:false, // 'print'
-		//link:false, // 'Insert link'(TODO)
     }
     ```
 - Example:

diff --git a/docs/zh/guide/config.md b/docs/zh/guide/config.md
@@ -301,6 +301,7 @@ Luckysheet开放了更细致的自定义配置选项，分别有
         textWrapMode: false, // '换行方式'
         textRotateMode: false, // '文本旋转方式'
 		image:false, // '插入图片'
+		link:false, // '插入链接'
         chart: false, // '图表'（图标隐藏，但是如果配置了chart插件，右击仍然可以新建图表）
         postil:  false, //'批注'
         pivotTable: false,  //'数据透视表'
@@ -314,7 +315,6 @@ Luckysheet开放了更细致的自定义配置选项，分别有
         findAndReplace: false, // '查找替换'
 		protection:false, // '工作表保护'
 		print:false, // '打印'
-		// link:false, // '插入链接'（TODO）
     }
     ```
 - 示例：

diff --git a/src/controllers/constant.js b/src/controllers/constant.js
diff --git a/src/controllers/controlHistory.js b/src/controllers/controlHistory.js
@@ -5,6 +5,7 @@ import conditionformat from './conditionformat';
 import luckysheetPostil from './postil';
 import imageCtrl from './imageCtrl';
 import dataVerificationCtrl from './dataVerificationCtrl';
+import hyperlinkCtrl from './hyperlinkCtrl';
 import {zoomRefreshView,zoomNumberDomBind} from './zoom';
 import { createFilter, createFilterOptions, labelFilterOptionState } from './filter';
 import formula from '../global/formula';
@@ -344,6 +345,9 @@ const controlHistory = {
         else if (ctr.type == "updateDataVerificationOfCheckbox"){
             dataVerificationCtrl.refOfCheckbox(ctr.currentDataVerification, ctr.historyDataVerification, ctr.sheetIndex, ctr.data, ctr.range);
         }
+        else if (ctr.type == "updateHyperlink"){
+            hyperlinkCtrl.ref(ctr.currentHyperlink, ctr.historyHyperlink, ctr.sheetIndex, ctr.data, ctr.range);
+        }
         else if (ctr.type == "updateCF"){
             let historyRules = ctr["data"]["historyRules"];
 
@@ -650,6 +654,9 @@ const controlHistory = {
         else if (ctr.type == "updateDataVerificationOfCheckbox"){
             dataVerificationCtrl.refOfCheckbox(ctr.historyDataVerification, ctr.currentDataVerification, ctr.sheetIndex, ctr.curData, ctr.range);
         }
+        else if (ctr.type == "updateHyperlink") {
+            hyperlinkCtrl.ref(ctr.historyHyperlink, ctr.currentHyperlink, ctr.sheetIndex, ctr.curData, ctr.range);
+        }
         else if (ctr.type == "updateCF"){
             let currentRules = ctr["data"]["currentRules"];
 

diff --git a/src/controllers/handler.js b/src/controllers/handler.js
@@ -5,6 +5,7 @@ import pivotTable from './pivotTable';
 import luckysheetDropCell from './dropCell';
 import luckysheetPostil from './postil';
 import imageCtrl from './imageCtrl';
+import hyperlinkCtrl from './hyperlinkCtrl';
 import dataVerificationCtrl from './dataVerificationCtrl';
 import menuButton from './menuButton';
 import conditionformat from './conditionformat';
@@ -338,6 +339,9 @@ export default function luckysheetHandler() {
         //数据验证 单元格聚焦
         dataVerificationCtrl.cellFocus(row_index, col_index, true);
 
+        //链接 单元格聚焦
+        hyperlinkCtrl.cellFocus(row_index, col_index);
+
         //若点击单元格部分不在视图内
         if (col_pre < $("#luckysheet-cell-main").scrollLeft()) {
             $("#luckysheet-scrollbar-x").scrollLeft(col_pre);
@@ -4531,6 +4535,24 @@ export default function luckysheetHandler() {
         }
     });
 
+    //菜单栏 插入链接按钮
+    $("#luckysheet-insertLink-btn-title").click(function () {
+        if(!checkProtectionNotEnable(Store.currentSheetIndex)){
+            return;
+        }
+
+        if (Store.luckysheet_select_save == null || Store.luckysheet_select_save.length == 0) {
+            return;
+        }
+
+        hyperlinkCtrl.createDialog();
+        hyperlinkCtrl.init();
+    })
+    $("#luckysheetInsertLink").click(function () {
+        $("#luckysheet-insertLink-btn-title").click();
+        $("#luckysheet-rightclick-menu").hide();
+    })
+
     //菜单栏 数据验证按钮
     $("#luckysheet-dataVerification-btn-title").click(function () {
         if(!checkProtectionNotEnable(Store.currentSheetIndex)){