temp update

modules/complementary_glj_lib/models/gljModel.js

@@ -13,7 +13,6 @@ const gljType = {
     stdGLJ: 1,
     complementaryGLJs: 2
 };
-const limitCount = 50;
 
 class GljDao {
     getGljTypes (gljLibId, callback){
@@ -70,7 +69,7 @@ class GljDao {
 
     async getGLJPaging (data) {
         let queryData = this.getQueryByType(data);
-        let gljs = await queryData.model.find(queryData.query).lean().sort({code: 1}).skip(data.index).limit(limitCount),
+        let gljs = await queryData.model.find(queryData.query).lean().sort({code: 1}).skip(data.index).limit(data.limit),
             total = await queryData.model.find(queryData.query).count();
         return data.type === gljType.stdGLJ
             ? {stdGLJ: gljs, complementaryGLJs: [], total: total}

web/building_saas/main/js/views/glj_view.js

@@ -315,6 +315,10 @@ var gljOprObj = {
         let me = gljOprObj;
         me.initSelection(args.newSelections.length > 0 ? {row: args.newSelections[0].row} : {row: 0});
     },
+    onTopRowChanged: function (sender, args) {
+        const topRow = args.newTopRow;
+        const bottomRow = args.sheet.getViewportBottomRow(1);
+    },
     getSelStyle: function (selected,settingStyle) {
         let style = new GC.Spread.Sheets.Style();
         if(settingStyle){
@@ -990,6 +994,8 @@ var gljOprObj = {
         let condition = {
             // 开始取数据的位置
             index,
+            // 限制条数
+            limit: 50,
             // 初始化
             init: true,
             // 所在部分（标准、补充）
@@ -1547,6 +1553,7 @@ $(function () {
             gljOprObj.gljLibSpresd.bind(GC.Spread.Sheets.Events.ButtonClicked, gljOprObj.onButtonClick);
             gljOprObj.gljLibSheet = gljOprObj.gljLibSpresd.getSheet(0);
             gljOprObj.gljLibSheet.bind(GC.Spread.Sheets.Events.SelectionChanged, gljOprObj.onSelectionChanged);
+            gljOprObj.gljLibSheet.bind(GC.Spread.Sheets.Events.TopRowChanged, gljOprObj.onTopRowChanged);
             gljOprObj.gljLibSheet.setColumnWidth(0, 20, GC.Spread.Sheets.SheetArea.rowHeader);
             gljOprObj.gljLibSheet.options.isProtected = true;
             gljOprObj.gljLibSheet.name('glj_lib');
@@ -1597,7 +1604,7 @@ $(function () {
             gljOprObj.gljLibSheet.setActiveCell(0, 0);
             gljOprObj.initSelection({row: 0});
         } else gljOprObj.showLibGLJSheetData();
-        console.timeEnd('getGLJData');
+        console.timeEnd('getGLJDataPaging');
     });
 
     $('#mreplace_next_div').on('shown.bs.modal', function (e) {

web/building_saas/main/js/views/glj_view_contextMenu.js

@@ -377,7 +377,7 @@ function getGLJData(actionType) {
     $('#actionType').val(actionType);
     $.bootstrapLoading.start();
     let condition = gljOprObj.getPagingCondition(true, 0);
-    console.time('getGLJData');
+    console.time('getGLJDataPaging');
     projectObj.project.ration_glj.getGLJDataPaging(condition, function (result) {
         gljOprObj.initClassTree('std', gljOprObj.treeData.std);
         $('#modalCon').width($(window).width()*0.5);