Browse Source

1. pm, copyTo, bug
2. hint, after reSize browser

MaiXinRong 7 năm trước cách đây
mục cha
commit
69b2881fab

+ 14 - 2
web/building_saas/main/js/views/std_bills_lib.js

@@ -7,9 +7,14 @@ var billsLibObj = {
     stdBillsSpread: null,
     stdBillsJobSpread: null,
     stdBillsFeatureSpread: null,
+    refreshSettingForHint: function () {
+        TREE_SHEET_HELPER.initSetting($('#stdBillsSpread')[0], billsLibObj.stdBillsTreeSetting);
+    },
     checkBillsSpread: function () {
         if (!this.stdBillsSpread) {
             this.stdBillsSpread = SheetDataHelper.createNewSpread($('#stdBillsSpread')[0]);
+            // 刷新setting中记录的spread的位置
+            this.refreshSettingForHint();
         }
     },
     refreshBillsSpread: function () {
@@ -47,8 +52,6 @@ var billsLibObj = {
         }
     },
     loadStdBills: function (stdBillsLibID) {
-        TREE_SHEET_HELPER.initSetting($('#stdBillsSpread')[0], billsLibObj.stdBillsTreeSetting);
-
         var that = this;
         var stdBillsJobData, stdBillsFeatureData, stdBills;
         var stdBillsTree  = idTree.createNew({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1, autoUpdate: true});
@@ -308,6 +311,15 @@ var billsLibObj = {
     }
 };
 
+function addEventOnResize(fn){
+    let originFn = window.onresize;
+    window.onresize =function () {
+        originFn && originFn();
+        fn();
+    }
+}
+addEventOnResize(billsLibObj.refreshSettingForHint);
+
 $('#stdBillsTab').bind('click', function () {
     refreshSubSpread();//subSpread、jobSpread、itemSpread显示问题
     $(".main-data-side-q").height($(window).height() - $(".header").height() - $(".toolsbar").height() -  $(".tools-bar-height-q").height() - 202);

+ 5 - 1
web/building_saas/pm/js/pm_main.js

@@ -490,7 +490,11 @@ $(document).ready(function() {
                     projType: cur.data.projectType
                 };
                 let updateData = GetUpdateData(parent, next, cur.data.name, cur.data.property, IDs.lowID, typeInfo);
-                updateData['srcProjectId'] = cur.id();
+                updateData.forEach(function (data) {
+                    if (data.updateType === 'copy') {
+                        data['srcProjectId'] = cur.id();
+                    }
+                });
                 pre = GetNeedUpdatePreNode(parent, next);
                 if (pre) {
                     updateData = {};