bugs

public/scHintBox.html

@@ -38,6 +38,11 @@
     const hintBox = {
         value: null,
         btnType: {yes: 1, yesNo: 2, yesNoCancel: 3},
+        defalultEvent: function () {
+            $.bootstrapLoading.end();
+//            alert('defalultEvent');
+            return;
+        },
         init: function (){
             // 事件类
             $("#hintBox_value").unbind();
@@ -55,10 +60,7 @@
                 }
             );
             $('#hintBox_btn_cancel').click(
-                function () {
-                    $.bootstrapLoading.end();
-                    return;
-                }
+                hintBox.defalultEvent
             );
 
             // 显示类
@@ -79,7 +81,9 @@
             $("#hintBox_value").focus();
             $("#hintBox_value").select();
         },
-        infoBox: function (title, caption, btnType, doYes, doNo, btnTextArr, showCrossBtn = true) {
+        infoBox: function (title, caption, btnType,
+                           doYes, doNo = hintBox.defalultEvent,
+                           btnTextArr = null, showCrossBtn = true) {
             this.init();
             if (!showCrossBtn)
                 $('#hintBox_btn_cross').hide();
@@ -149,6 +153,10 @@
             $('#hintBox_btn_yes').show();
             $('#hintBox_btn_yes').click(doOK);   // doOK不能给参数
 
+            $('#hintBox_btn_no').text('取消');
+            $('#hintBox_btn_no').show();
+            $('#hintBox_btn_no').click(hintBox.defalultEvent);
+
             $("#hintBox_form").modal('show');
         }
     };

test/public/test_Box.html

@@ -30,11 +30,13 @@
             });
 
             $("#btnB").click(function(){
-                hintBox.infoBox('操作确认', '确定要删除当前节点吗？', 2, cbYes, cbNo);
+                hintBox.infoBox('操作确认', '确定要删除当前节点吗？', 2, cbYes);
+                // 或： hintBox.infoBox('操作确认', '确定要删除当前节点吗？', 2, cbYes, cbNo);
             });
 
             $("#btnC").click(function(){
-                hintBox.infoBox('多分支选择', '三个按钮是否继续？', 3, cbYes, cbNo, ['你','我','他']);
+                hintBox.infoBox('多分支选择', '三个按钮是否继续？', 3, cbYes, cbNo);
+                // 或： hintBox.infoBox('多分支选择', '三个按钮是否继续？', 3, cbYes, undefined, ['你','我','他']);
             });
 
             $("#btnD").click(function(){

web/building_saas/main/js/models/calc_program.js

@@ -1168,7 +1168,7 @@ let analyzer = {
         return MaxID;
     },
     templateNewName: function (name) {
-        let i = 2;
+        let i = 1;
         while (projectObj.project.calcProgram.compiledTemplateMaps[name + i]) {
             i++;
         };

web/building_saas/main/js/views/calc_program_manage.js

@@ -60,6 +60,7 @@ let calcProgramManage = {
         me.detailSpread.getSheet(0).bind(GC.Spread.Sheets.Events.ValueChanged, me.onDetailValueChanged);
         me.detailSpread.getSheet(0).bind(GC.Spread.Sheets.Events.RangeChanged, me.onRangeChanged);
         me.detailSpread.getSheet(0).bind(GC.Spread.Sheets.Events.EnterCell, me.onDetailEnterCell);
+        me.detailSpread.getSheet(0).bind(GC.Spread.Sheets.Events.ClipboardPasting, me.onClipboardPasting);
 
         let mSheet = me.mainSpread.getSheet(0);
         sheetCommonObj.showData(mSheet, me.mainSetting, me.datas);
@@ -159,6 +160,9 @@ let calcProgramManage = {
         // let e = `ID:${c.ID}　${c.expression}　${c.dispExpr}　${c.dispExprUser}　${c.compiledExpr}　${c.custom}`;
         // projectObj.testDisplay('', e);
     },
+    onClipboardPasting: function (sender, args) {
+         args.cancel = true;
+    },
     loadMainContextMenu: function () {
         $.contextMenu({
             selector: '#mainSpread',
@@ -216,7 +220,7 @@ let calcProgramManage = {
                         let idx = calcProgramManage.mainSpread.getActiveSheet().getActiveRowIndex();
 
                         let newName = '';
-                        hintBox.valueBox('请输入新的模板名称：', template.name, function () {
+                        hintBox.valueBox('重命名', template.name, function () {
                             newName = hintBox.value;
 
                             if (!newName){
@@ -243,6 +247,7 @@ let calcProgramManage = {
                             calcProgramManage.updateTemplate(data, function (rst) {
                                 if (rst){
                                     projectObj.project.calcProgram.compileTemplateMaps();
+                                    projectObj.mainController.refreshTreeNode(calcTools.getNodesByProgramID(template.ID));
                                     sheetCommonObj.showData(calcProgramManage.mainSpread.getSheet(0), calcProgramManage.mainSetting, calcProgramManage.datas);
                                     $.bootstrapLoading.end();
                                 }
@@ -260,28 +265,29 @@ let calcProgramManage = {
                         return !canDelete;
                     },
                     callback: function () {
-                        $.bootstrapLoading.start();
                         let template = calcProgramManage.getSelectionInfo().template;
                         if (analyzer.templateIsUsed(template.ID)) {
                             $.bootstrapLoading.end();
                             hintBox.infoBox('系统提示', `计算模板“${template.name}”已被使用，不允许删除！`, 1);
                             return;
-                        }
-                        let data = {
-                            'projectID': projectObj.project.ID(),
-                            'ID': template.ID
                         };
-                        calcProgramManage.deleteTemplate(data, function (rst) {
-                            if (rst){
-                                let idx = calcProgramManage.mainSpread.getActiveSheet().getActiveRowIndex();
-                                projectObj.project.calcProgram.templates.splice(idx, 1);
-                                projectObj.project.calcProgram.compileTemplateMaps();
-                                calcProgramManage.buildSheet();
-                                calcProgramManage.mainSpread.getActiveSheet().setSelection(idx - 1, 0, 1, 1);
-                                calcProgramManage.refreshDetailSheet();
-                            }
-                        });
-                        $.bootstrapLoading.end();
+                        hintBox.infoBox('系统提示', `确定要删除计算模板“${template.name}”吗？`, 2, cbYes);
+                        function cbYes() {
+                            let data = {
+                                'projectID': projectObj.project.ID(),
+                                'ID': template.ID
+                            };
+                            calcProgramManage.deleteTemplate(data, function (rst) {
+                                if (rst){
+                                    let idx = calcProgramManage.mainSpread.getActiveSheet().getActiveRowIndex();
+                                    projectObj.project.calcProgram.templates.splice(idx, 1);
+                                    projectObj.project.calcProgram.compileTemplateMaps();
+                                    calcProgramManage.buildSheet();
+                                    calcProgramManage.mainSpread.getActiveSheet().setSelection(idx - 1, 0, 1, 1);
+                                    calcProgramManage.refreshDetailSheet();
+                                }
+                            });
+                        };
                     }
                 }
             }
@@ -399,11 +405,13 @@ let calcProgramManage = {
         );
     },
     deleteTemplate: function (data, callback) {
+        $.bootstrapLoading.start();
         CommonAjax.post('/calcProgram/deleteTemplate', data,
             function (result) {
                 if(callback){
                     callback(result);
                 }
+                $.bootstrapLoading.end();
             }
         );
     },