Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents c1617fe0 64338fb5
Showing 5 changed files with 64 additions and 41 deletions
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTable.js
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit3.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/timeTableDetailManage_old.js
 /**
  * saTimeTable指令，时刻表显示指令，excel表格形式，支持菜单，事件处理。
  * name（必须），控件的名字
+ * celldbclickFn，单元格双击事件
  * ds，外部数据源
  *
  * TODO：优化开发中
  *
  */
-angular.module('ScheduleApp').directive('saTimetable', ['$compile',
-    function($compile) {
+angular.module('ScheduleApp').directive('saTimetable', ['$compile', '$window',
+    function($compile, $window) {
         return {
             restrict: 'E',
             templateUrl: '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html',
             scope: { // 独立作用域
                 // 注意：数据暂时从外部ngModel里获取，以后内部自己处理
-                ds: "=ngModel"
+                ds: "=ngModel",
+                celldbclickFn: "&celldbclick"
                 // TODO：
@@ -39,10 +41,19 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saTimetable&#39;, [&#39;$compile&#39;,
                 if (!$attr_name) {
                     throw new Error("saTimeTable指令 name属性required");
                 }
+                var $attr_celldbclick = tAttrs["celldbclick"]; // 单元格双击事件名
                 // 内部controlAs名字
                 var ctrlAs = '$saTimeTableCtrl';
+                // 当前选中的cell
+                var startRowIndex = undefined;
+                var startColIndex = undefined;
+                var shiftKey = false; // shift键是否被按住
+                var ctrlKey = false; // ctrl是否被按住
+                // shift选中的cell
+                var shiftCells = [];
+
                 // TODO：
                 return {
@@ -57,11 +68,20 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saTimetable&#39;, [&#39;$compile&#39;,
                         // ------------------- dom事件处理function -----------------//
                         scope[ctrlAs].$$cell_click = function(rowindex, colindex, cell) {
-                            if (cell.ttdid) {
-                                //alert(rowindex + "-" + colindex);
+                            console.log("click " + "row=" + rowindex + ",col=" + colindex);
+
+                            if (cell.ttdid) { // 是班次的单元格才能操作
                                 cell.sel = !cell.sel;
                             }
-                            // TODO：
+
+                        };
+                        scope[ctrlAs].$$cell_dbclick = function(rowindex, colindex, cell) {
+                            if (cell.ttdid) { // 是班次的单元格才能操作
+                                if ($attr_celldbclick) {
+                                    // 注意调用方法
+                                    scope[ctrlAs].celldbclickFn()(rowindex, colindex);
+                                }
+                            }
                         };
                         // ------------------- 监控function ------------------//
@@ -301,6 +301,7 @@
                                             <dd ng-repeat="cell in info track by $index"
                                                 ng-init="colIndex = $index"
                                                 ng-click="$saTimeTableCtrl.$$cell_click(rowIndex, colIndex, cell)"
+                                                ng-dblclick="$saTimeTableCtrl.$$cell_dbclick(rowIndex, colIndex, cell)"
                                                 ng-class="{lpName: !cell.ttdid, active: cell.sel}"
                                                     >
                                                 {{cell.fcsj}}
@@ -3662,19 +3662,21 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saBcgroup&#39;, [
 /**
  * saTimeTable指令，时刻表显示指令，excel表格形式，支持菜单，事件处理。
  * name（必须），控件的名字
+ * celldbclickFn，单元格双击事件
  * ds，外部数据源
  *
  * TODO：优化开发中
  *
  */
-angular.module('ScheduleApp').directive('saTimetable', ['$compile',
-    function($compile) {
+angular.module('ScheduleApp').directive('saTimetable', ['$compile', '$window',
+    function($compile, $window) {
         return {
             restrict: 'E',
             templateUrl: '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html',
             scope: { // 独立作用域
                 // 注意：数据暂时从外部ngModel里获取，以后内部自己处理
-                ds: "=ngModel"
+                ds: "=ngModel",
+                celldbclickFn: "&celldbclick"
                 // TODO：
@@ -3700,10 +3702,19 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saTimetable&#39;, [&#39;$compile&#39;,
                 if (!$attr_name) {
                     throw new Error("saTimeTable指令 name属性required");
                 }
+                var $attr_celldbclick = tAttrs["celldbclick"]; // 单元格双击事件名
                 // 内部controlAs名字
                 var ctrlAs = '$saTimeTableCtrl';
+                // 当前选中的cell
+                var startRowIndex = undefined;
+                var startColIndex = undefined;
+                var shiftKey = false; // shift键是否被按住
+                var ctrlKey = false; // ctrl是否被按住
+                // shift选中的cell
+                var shiftCells = [];
+
                 // TODO：
                 return {
@@ -3718,11 +3729,20 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saTimetable&#39;, [&#39;$compile&#39;,
                         // ------------------- dom事件处理function -----------------//
                         scope[ctrlAs].$$cell_click = function(rowindex, colindex, cell) {
-                            if (cell.ttdid) {
-                                //alert(rowindex + "-" + colindex);
+                            console.log("click " + "row=" + rowindex + ",col=" + colindex);
+
+                            if (cell.ttdid) { // 是班次的单元格才能操作
                                 cell.sel = !cell.sel;
                             }
-                            // TODO：
+
+                        };
+                        scope[ctrlAs].$$cell_dbclick = function(rowindex, colindex, cell) {
+                            if (cell.ttdid) { // 是班次的单元格才能操作
+                                if ($attr_celldbclick) {
+                                    // 注意调用方法
+                                    scope[ctrlAs].celldbclickFn()(rowindex, colindex);
+                                }
+                            }
                         };
                         // ------------------- 监控function ------------------//
@@ -75,7 +75,7 @@
             <div class="portlet-body">
                 <!--<div ng-view></div>-->
                 <div style="height: {{ctrl.ttHeight}}px;">
-                    <sa-Timetable name="tt" ng-model="ctrl.editInfo" ng-model-options="{ getterSetter: true }">
+                    <sa-Timetable name="tt" ng-model="ctrl.editInfo" ng-model-options="{ getterSetter: true }" celldbclick="ctrl.singleEditBcDetail">
                     </sa-Timetable>
                 </div>
@@ -229,35 +229,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             /**
              * 单独修改班次明细。
              */
-            self.singleEditBcDetail = function() {
-                var id = null;
-                if (self.editInfo &&
-                    self.editInfo.detailInfos &&
-                    self.editInfo.detailInfos.length > 0) { // 找出第一个被选中的就可以了
-                    for (var i = 0; i < self.editInfo.detailInfos.length; i++) {
-                        for (var j = 0; j < self.editInfo.detailInfos[i].length; j++) {
-                            if (self.editInfo.detailInfos[i][j].sel) {
-                                id = self.editInfo.detailInfos[i][j].ttdid;
-                                break;
-                            }
-                        }
-                        if (id) {
-                            break;
-                        }
+            self.singleEditBcDetail = function(r, c) {
+                var id = self.editInfo.detailInfos[r][c].ttdid;
+                $state.go('ttInfoDetailManage_detail_edit',
+                    {
+                        id: id,
+                        xlid: self.xlid,
+                        ttid: self.ttid,
+                        xlname: self.xlname,
+                        ttname: self.ttname
                     }
-                }
-                if (!id) {
-                    alert("请选择具体班次！");
-                } else {
-                    $state.go('ttInfoDetailManage_detail_edit',
-                        {
-                            id: id,
-                            xlid: self.xlid,
-                            ttid: self.ttid,
-                            xlname: self.xlname,
-                            ttname: self.ttname
-                        });
-                }
+                );
             };
             // 批量修改