fix(conflict): conflict

conflict

README-zh.md

@@ -2,6 +2,7 @@
 
 ![logo](/docs/.vuepress/public/img/logo_text.png)
 
+
 </div>
 
 简体中文 | [English](./README.md)
@@ -9,6 +10,8 @@
 ## 介绍
 🚀Luckysheet ，一款纯前端类似excel的在线表格，功能强大、配置简单、完全开源。
 
+> Luckysheet最近参加了“2020年度OSC中国开源项目评选”，为了支持Luckysheet更好的得到关注和发展，请大家帮忙投票: [https://www.oschina.net/p/luckysheet](https://www.oschina.net/p/luckysheet)。
+
 ## 相关链接
  | 源码   | 文档 | Demo | 插件Demo | 论坛 |
  | ------ | -------- | ------ | ------ | ------ |

src/controllers/dataVerificationCtrl.js

@@ -573,6 +573,28 @@ const dataVerificationCtrl = {
                 return;
             }
 
+            let str = range[range.length - 1].row[0],
+                edr = range[range.length - 1].row[1],
+                stc = range[range.length - 1].column[0],
+                edc = range[range.length - 1].column[1];
+            let d = editor.deepCopyFlowData(Store.flowdata);
+
+            if(str < 0){
+                str = 0;
+            }
+
+            if(edr > d.length - 1){
+                edr = d.length - 1;
+            }
+
+            if(stc < 0){
+                stc = 0;
+            }
+
+            if(edc > d[0].length - 1){
+                edc = d[0].length - 1;
+            }
+
             let type = $("#luckysheet-dataVerification-dialog #data-verification-type-select").val();
             let type2 = null, value1 = "", value2 = "";
 
@@ -699,13 +721,6 @@ const dataVerificationCtrl = {
             let historyDataVerification = $.extend(true, {}, _this.dataVerification);
             let currentDataVerification = $.extend(true, {}, _this.dataVerification);
 
-            let str = range[range.length - 1].row[0],
-                edr = range[range.length - 1].row[1],
-                stc = range[range.length - 1].column[0],
-                edc = range[range.length - 1].column[1];
-
-            let d = editor.deepCopyFlowData(Store.flowdata);
-
             for(let r = str; r <= edr; r++){
                 for(let c = stc; c <= edc; c++){
                     currentDataVerification[r + '_' + c] = item;

src/controllers/moreFormat.js

@@ -675,19 +675,19 @@ const luckysheetMoreFormat = {
         },
         {
             "name": "下午01:30",
-            "value": 'AM/PM hh:mm'
+            "value": '上午/下午 hh:mm'
         },
         {
             "name": "下午1:30",
-            "value": 'AM/PM h:mm'
+            "value": '上午/下午 h:mm'
         },
         {
             "name": "下午1:30:30",
-            "value": 'AM/PM h:mm:ss'
+            "value": '上午/下午 h:mm:ss'
         },
         {
             "name": "08-05 下午01:30",
-            "value": "MM-dd AM/PM hh:mm"
+            "value": "MM-dd 上午/下午 hh:mm"
         },
         // {
         //     "name": "1930年8月5日星期二",

src/controllers/sheetmanage.js

@@ -314,6 +314,24 @@ const sheetmanage = {
         });
 
         server.saveParam("shr", null, orders);
+
+        Store.luckysheetfile.sort((x, y) => {
+            let order_x = x.order;
+            let order_y = y.order;
+    
+            if(order_x != null && order_y != null){
+                return order_x - order_y;
+            }
+            else if(order_x != null){
+                return -1;
+            }
+            else if(order_y != null){
+                return 1;
+            }
+            else{
+                return 1;
+            }
+        })
     },
     createSheet: function() { //修复拖动sheet更新后台后，重新打开显示错误
         let _this = this;

src/global/api.js

@@ -4709,6 +4709,9 @@ export function setSheetActive(order, options = {}) {
         success
     } = {...options}
 
+    $("#luckysheet-sheet-area div.luckysheet-sheets-item").removeClass("luckysheet-sheets-item-active");
+    $("#luckysheet-sheets-item" + file.index).addClass("luckysheet-sheets-item-active");
+
     sheetmanage.changeSheet(file.index);
 
     setTimeout(() => {

src/global/extend.js

@@ -482,9 +482,17 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
                 else if(index == r){
                     if(direction == "lefttop"){
                         newDataVerification[(r + value) + "_" + c] = item;
+
+                        for(let i = 0; i < value; i++){
+                            newDataVerification[(r + i) + "_" + c] = item;
+                        }
                     }
                     else{
                         newDataVerification[r + "_" + c] = item;
+
+                        for(let i = 0; i < value; i++){
+                            newDataVerification[(r + i + 1) + "_" + c] = item;
+                        }
                     }
                 }
                 else{
@@ -498,9 +506,17 @@ function luckysheetextendtable(type, index, value, direction, sheetIndex) {
                 else if(index == c){
                     if(direction == "lefttop"){
                         newDataVerification[r + "_" + (c + value)] = item;
+
+                        for(let i = 0; i < value; i++){
+                            newDataVerification[r + "_" + (c + i)] = item;
+                        }
                     }
                     else{
                         newDataVerification[r + "_" + c] = item;
+
+                        for(let i = 0; i < value; i++){
+                            newDataVerification[r + "_" + (c + i + 1)] = item;
+                        }
                     }
                 }
                 else{
@@ -2112,20 +2128,20 @@ function luckysheetDeleteCell(type, str, edr, stc, edc, sheetIndex) {
                 let row_index = cfg["borderInfo"][i].value.row_index;
                 let col_index = cfg["borderInfo"][i].value.col_index;
 
-                if(row_index < str || col_index < stc){
-                    borderInfo.push(cfg["borderInfo"][i]);
-                }
-                else if(row_index > edr || col_index > edc){
-                    if(row_index > edr){
-                        row_index -= rlen;
-                        cfg["borderInfo"][i].value.row_index = row_index;
+                if(row_index < str || row_index > edr || col_index < stc || col_index > edc){
+                    if(type == 'moveLeft'){
+                        if(col_index > edc && row_index >= str && row_index <= edr){
+                            col_index -= clen;
+                            cfg["borderInfo"][i].value.col_index = col_index;
+                        }
                     }
-
-                    if(col_index > edc){
-                        col_index -= clen;
-                        cfg["borderInfo"][i].value.col_index = col_index;
+                    else if(type == 'moveUp'){
+                        if(row_index > edr && col_index >= stc && col_index <= edc){
+                            row_index -= rlen;
+                            cfg["borderInfo"][i].value.row_index = row_index;
+                        }
                     }
-
+    
                     borderInfo.push(cfg["borderInfo"][i]);
                 }
             }

src/locale/zh.js

@@ -9390,19 +9390,19 @@ export default {
         },
         {
             "name": "下午01:30",
-            "value": 'AM/PM hh:mm'
+            "value": '上午/下午 hh:mm'
         },
         {
             "name": "下午1:30",
-            "value": 'AM/PM h:mm'
+            "value": '上午/下午 h:mm'
         },
         {
             "name": "下午1:30:30",
-            "value": 'AM/PM h:mm:ss'
+            "value": '上午/下午 h:mm:ss'
         },
         {
             "name": "08-05 下午01:30",
-            "value": "MM-dd AM/PM hh:mm"
+            "value": "MM-dd 上午/下午 hh:mm"
         },
         // {
         //     "name": "1930年8月5日星期二",