新建项目取消必填项填写

public/common_util.js

@@ -46,11 +46,29 @@ function deleteEmptyObject(arr) {
         }
         return a == b;
     }
+    // 获取必填项(基本信息、工程特征)
+    function getRequired(rst, datas) {
+        if (!datas) {
+            return rst;
+        }
+        for (const data of datas) {
+            const required = typeof data.required === 'string' ? JSON.parse(data.required) : data.required;
+            const readOnly = typeof data.readOnly === 'string' ? JSON.parse(data.readOnly) : data.readOnly;
+            if (required && !readOnly) {
+                rst.push(data);
+            }
+            if (data.items && data.items.length) {
+                getRequired(rst, data.items);
+            }
+        }
+        return rst;
+    }
 
     return {
         isDef,
         isEmptyVal,
         isNumber,
         similarEqual,
+        getRequired,
     };
 });

public/web/sheet/sheet_common.js

@@ -1016,7 +1016,8 @@ var sheetCommonObj = {
         }
         return new getTipsCombo();
     },
-    getTreeNodeCellType:function (datas,row,parentMap) {// 2018-09-26  不用spreadjs默认的树结构，自定义控件
+    // paintFunc，需要追加到paint方法中的自定义paint方法
+    getTreeNodeCellType:function (datas,row,parentMap,paintFunc) {// 2018-09-26  不用spreadjs默认的树结构，自定义控件
         var ns = GC.Spread.Sheets;
         let rectW = 10;
         let rectH = 10;
@@ -1029,6 +1030,9 @@ var sheetCommonObj = {
         }
         TreeNodeCellType.prototype = new ns.CellTypes.Text();
         TreeNodeCellType.prototype.paint = function (ctx, value, x, y, w, h, style, options) {
+            if (paintFunc) {
+                paintFunc(ctx, value, x, y, w, h, style, { rectW, rectH, margin }, datas[row]);
+            }
             let offset = 0;
             let step = 7;
             let level = getTreeLevel(datas[row],datas);//从0开始，取当前节点是第几级的

web/building_saas/main/js/models/exportStdInterfaceBase.js

@@ -776,6 +776,23 @@ const XML_EXPORT_BASE = (() => {
     }
 
     /**
+     * 项目属性基本信息、工程特征的自检
+     * 有错误的话，将先直接弹窗提示，不会进行其他的自检
+     *   */
+    function propertyCheck() {
+        const failtList = ['<span style="font-weight: bold>基本信息下：</span>'];
+        const tenderDetailMap = _cache.tenderDetailMap;
+
+        // 条目检查
+        function itemsCheck(items) {
+            const requiredData = commonUtil.getRequired([], items);
+            return requiredData
+                .filter(item => commonUtil.isEmptyVal(item.value))
+                .map(item => `${item.dispName}不能为空` );
+        }
+    }
+
+    /**
      * 弱自检自检，有错误非强制不可导的自检
      * failList里存的是导出规定属性时，不符合标准规定的错误，存在这种错误就不允许导出
      * 这里的错误是业务上的提示错误，与标准文件规定无关，存在这种错误是允许导出的

web/building_saas/main/js/views/project_info.js

@@ -46,6 +46,8 @@ var projectInfoObj = {
             billsQuanDecimal.datas = data.property.billsQuantityDecimal || [billsDecimalView.angleDecimal];
             basicInfoView.orgDatas = data.property.basicInformation ? basicInfoView.toViewDatas(data.property.basicInformation) : [];
             projFeatureView.orgDatas = data.property.projectFeature ? projFeatureView.toViewDatas(data.property.projectFeature) : [];
+            console.log(`me.orgDatas`);
+            console.log(projFeatureView.orgDatas);
             $('#fullpath').html(this.getFullPathHtml(data));
             $("[data-toggle='tooltip']").tooltip();
         }

web/building_saas/main/js/views/project_property_basicInfo.js

@@ -243,44 +243,47 @@ let basicInfoView = {
     },
 
     initDatas: function (datas) {
-        this.datas = [];
-        for(let i = 0, len = datas.length; i < len; i++){
-            this.datas.push(this.copyObj(datas[i]));
-        }
+        this.datas = _.cloneDeep(datas);
     },
 
     //数据库读到的数据转换为展示的结构
     toViewDatas: function (datas) {
-        let rst = [];
-        for(let i = 0, len = datas.length; i < len; i++){
-            let items = datas[i].items || null;
-            if(items){
-                rst.push(datas[i]);
-                for(let j = 0, jLen = items.length; j < jLen; j++){
-                    rst.push(items[j]);
+        // 将数据打平（原数据一些子项数据会嵌套在items数组中）
+        let curID = 1;
+        return extractDataFromItems(datas);
+        // 为了与sheet_common.js -> getTreeNodeCellType共用树结构功能
+        // 需要设置数据的ID、ParentID
+
+        function extractDataFromItems(items, parentID) {
+            const rst = [];
+            items.forEach(item => {
+                // 为了与sheet_common.js -> getTreeNodeCellType共用树结构功能
+                // 需要设置数据的ID、ParentID
+                item.ID = curID++;
+                item.ParentID = parentID || null;
+                rst.push(item);
+                if (item.items && item.items.length) {
+                    rst.push(...extractDataFromItems(item.items, item.ID));
                 }
-            }
+            });
+            return rst;
         }
-        return rst;
     },
 
     //展示的结构转换为入库的结构
     toSaveDatas: function (datas) {
-        let rst = [];
-        let index = -1;
-        for(let i = 0, len = datas.length; i < len; i++){
-            let items = datas[i].items || null;
-            if(items){
-                delete datas[i].collapsed;
-                datas[i].items = [];
-                rst.push(datas[i]);
-                index++;
-            }
-            else {
-                rst[index]['items'].push(datas[i]);
-            }
+        const saveData = datas.filter(item => item.ParentID === null);
+        clearJunkAttrs(saveData);
+
+        function clearJunkAttrs(items) {
+            items.forEach(item => {
+                delete item.ID && delete item.ParentID && delete item.collapsed;
+                if (item.items && item.items.length) {
+                    clearJunkAttrs(item.items);
+                }
+            })
         }
-        return rst;
+        return saveData;
     },
 
     toUpdate: function (orgDatas, newDatas) {
@@ -312,19 +315,36 @@ let basicInfoView = {
         });
     },
 
-    initTree:function (sheet, init, datas) {
-        sheet.getRange(-1, 0, -1, 1).cellType(this.getTreeNodeCellType(datas));
-        for(let i =0, len = datas.length; i < len; i++){
-            if(datas[i].hasOwnProperty('items')){
+    initTree: function (sheet, init, datas) {
+        //sheet.getRange(-1, 0, -1, 1).cellType(this.getTreeNodeCellType(datas));
+        const parentType = _.groupBy(datas, 'ParentID');
+        const paint = (ctx, value, x, y, w, h, style, rectInfo, data) => {
+            const required = typeof data.required === 'string' ? JSON.parse(data.required) : data.required;
+            const readOnly = typeof data.readOnly === 'string' ? JSON.parse(data.readOnly) : data.readOnly;
+            if (required && !readOnly) {
+                const { rectW, margin } = rectInfo;
+                ctx.save();
+                ctx.fillStyle = 'red';
+                const paddingLeft = 8;
+                const paintX = x + margin + paddingLeft; // 第一层盒子处[+] / [-]
+                const paintY = y + Math.round(h / 2) + paddingLeft;
+                ctx.font = "14px Calibri"
+                ctx.fillText('*', paintX, paintY);
+                ctx.restore();
+            }
+            
+        };
+        for (let i = 0, len = datas.length; i < len; i++) {
+            if (datas[i].hasOwnProperty('items')) {
                 let collapsed = false;
-                if(init){
-                    datas[i].collapsed=false;
+                if (init) {
+                    datas[i].collapsed = false;
                     collapsed = true;
-                }else {
+                } else {
                     collapsed = datas[i].collapsed == undefined ? true : datas[i].collapsed;
                 }
-                //sheet.getRange(i+1, -1, datas[i].items.length, -1).visible(!collapsed);
             }
+            sheet.getCell(i, 0).cellType(sheetCommonObj.getTreeNodeCellType(datas, i, parentType, paint))
         }
     },
 

web/building_saas/main/js/views/project_property_projFeature.js

@@ -302,8 +302,17 @@ let projFeatureView = {
         // ParentID为null的数据是为显示而加入的“工程特征” ParentID为1的数据即为工程特征下的第一层数据，其他数据是从ParentID为1的数据中的items递归打平出来的
         // 因此原数据格式就是ParentID为1的数据
         const saveData = datas.filter(item => item.ParentID === 1);
-        saveData.forEach(item => delete item.ID && delete item.ParentID && delete item.collapsed);
+
+        clearJunkAttrs(saveData);
         return saveData;
+        function clearJunkAttrs(items) {
+            items.forEach(item => {
+                delete item.ID && delete item.ParentID && delete item.collapsed;
+                if (item.items && item.items.length) {
+                    clearJunkAttrs(item.items);
+                }
+            })
+        }
     },
 
     toUpdate: function (orgDatas, newDatas) {
@@ -339,6 +348,22 @@ let projFeatureView = {
     initTree: function (sheet, init, datas) {
         //sheet.getRange(-1, 0, -1, 1).cellType(this.getTreeNodeCellType(datas));
         const parentType = _.groupBy(datas, 'ParentID');
+        const paint = (ctx, value, x, y, w, h, style, rectInfo, data) => {
+            const required = typeof data.required === 'string' ? JSON.parse(data.required) : data.required;
+            const readOnly = typeof data.readOnly === 'string' ? JSON.parse(data.readOnly) : data.readOnly;
+            if (required && !readOnly) {
+                const { rectW, margin } = rectInfo;
+                ctx.save();
+                ctx.fillStyle = 'red';
+                const paddingLeft = 8;
+                const paintX = x + margin + rectW + paddingLeft; // 第一层盒子处[+] / [-]
+                const paintY = y + Math.round(h / 2) + paddingLeft;
+                ctx.font = "14px Calibri"
+                ctx.fillText('*', paintX, paintY);
+                ctx.restore();
+            }
+            
+        };
         for (let i = 0, len = datas.length; i < len; i++) {
             if (datas[i].hasOwnProperty('items')) {
                 let collapsed = false;
@@ -349,7 +374,7 @@ let projFeatureView = {
                     collapsed = datas[i].collapsed == undefined ? true : datas[i].collapsed;
                 }
             }
-            sheet.getCell(i, 0).cellType(sheetCommonObj.getTreeNodeCellType(datas, i, parentType))
+            sheet.getCell(i, 0).cellType(sheetCommonObj.getTreeNodeCellType(datas, i, parentType, paint))
         }
     },
 
@@ -497,482 +522,4 @@ $(document).ready(function () {
     $('#tab_poj-settings-projFeature').on('shown.bs.tab', function () {
         sheetCommonObj.refreshWorkbookDelDefer(projFeatureView.workBook, 100);
     });
-});
-/* let projFeatureView = {
-    orgDatas: [],//for compare
-    datas: [],//just for view
-    workBook: null,
-    firstData: {dispName: '工程特征', key: 'projFeature', items: []},//for show
-    setting:{
-        header: [
-            {name: '属性', dataCode: 'dispName', width: 200, vAlign: 'center', hAlign: 'left'},
-            {name: '值', dataCode: 'value', width: 300, vAlign: 'center', hAlign: 'left'}
-        ],
-        options: {
-            allowContextMenu: false,
-            tabStripVisible:  false,
-            allowCopyPasteExcelStyle : false,
-            allowExtendPasteRange: false,
-            allowUserDragDrop : false,
-            allowUserDragFill: false,
-            scrollbarMaxAlign : true
-        },
-        numRows: [],
-        dateRows: [],
-        locked: {
-            rows: [],
-            cols: [0]
-        }
-    },
-
-    renderSheetFuc: function (sheet, fuc) {
-        sheet.suspendPaint();
-        sheet.suspendEvent();
-        fuc();
-        sheet.resumePaint();
-        sheet.resumeEvent();
-    },
-
-    setOptions: function (workbook, opts) {
-        for(let opt in opts){
-            workbook.options[opt] = opts[opt];
-        }
-    },
-
-    setCombo: function (sheet, row, items) {
-        let dynamicCombo = sheetCommonObj.getDynamicCombo();
-        dynamicCombo.items(items);
-        dynamicCombo.editable(false);
-        sheet.getCell(row, 1).cellType(dynamicCombo);
-    },
-
-    getComboItemsByRow: function (row) {
-        let data = this.datas[row];
-        if (!data) {
-            return null;
-        }
-        if (!data.cellType || data.cellType !== 'comboBox') {
-            return null;
-        }
-        return data.options ? data.options.split('@') : [];
-    },
-
-    buildHeader: function (sheet, headers) {
-        let me = projFeatureView;
-        let fuc = function () {
-            sheet.options.clipBoardOptions = GC.Spread.Sheets.ClipboardPasteOptions.values;
-            sheet.setColumnCount(headers.length);
-            sheet.setRowHeight(0, 40, GC.Spread.Sheets.SheetArea.colHeader);
-            for(let i = 0, len = headers.length; i < len; i++){
-                sheet.setValue(0, i, headers[i].name, GC.Spread.Sheets.SheetArea.colHeader);
-                sheet.setColumnWidth(i, headers[i].width, GC.Spread.Sheets.SheetArea.colHeader);
-                sheet.getRange(-1, i, -1, 1).hAlign(GC.Spread.Sheets.HorizontalAlign[headers[i]['hAlign']]);
-                sheet.getRange(-1, i, -1, 1).vAlign(GC.Spread.Sheets.VerticalAlign[headers[i]['vAlign']]);
-
-            }
-        };
-        me.renderSheetFuc(sheet, fuc);
-    },
-
-    buildSheet: function () {
-        if(!this.workBook){
-            this.workBook = new GC.Spread.Sheets.Workbook($('#projFeatureSpread')[0], {sheetCount: 1});
-            sheetCommonObj.spreadDefaultStyle(this.workBook);
-            sheetCommonObj.bindEscKey(this.workBook, [{sheet: this.workBook.getSheet(0), editStarting: this.onEditStarting, editEnded: this.onEditEnded}]);
-            this.setOptions(this.workBook, this.setting.options);
-            this.buildHeader(this.workBook.getActiveSheet(), this.setting.header);
-            this.bindEvent(this.workBook);
-        }
-    },
-
-    bindEvent: function (workBook) {
-        const _events = GC.Spread.Sheets.Events;
-        let sheet = workBook.getActiveSheet();
-        sheet.bind(_events.EditStarting, this.onEditStarting);
-        sheet.bind(_events.EditEnded, this.onEditEnded);
-        sheet.bind(_events.EnterCell, this.onEnterCell);
-        sheet.bind(_events.ClipboardPasting, this.onClipboardPasting);
-        sheet.bind(_events.ClipboardPasted, this.onClipboardPasted);
-    },
-
-    showData(datas){
-        let me = projFeatureView;
-        let sheet = this.workBook.getActiveSheet();
-        let cols = this.setting.header;
-        let fuc = function () {
-            sheet.setRowCount(datas.length);
-            me.initTree(sheet, true, datas);
-            sheet.setFormatter(-1, 1, '@');
-            //兼容旧数据
-            // org: compatLockedKeys = ['engineering']
-            let compatLockedKeys = [],
-                compatNumKeys = [
-                    'buildingArea',
-                    'basementBuildingArea',
-                    'totalFloors',
-                    'basementFloors',
-                    'buildingFloors',
-                    'buildingHeight',
-                    'basementHeight',
-                    'firstFloorHeight',
-                    'podiumBuildingHeight',
-                    'standardFloorHeight'
-                ];
-            for(let row = 0;row < datas.length ; row ++){
-                if(datas[row].cellType == 'comboBox'){
-                    let options = datas[row].options?datas[row].options.split("@"):[];
-                    me.setCombo(sheet, row, options);
-                } else if(datas[row].cellType == 'number' || compatNumKeys.includes(datas[row].key)){
-                    me.setting.numRows.push(row);
-                } else if (datas[row].cellType === 'date') {
-                    me.setting.dateRows.push(row);
-                }
-                let readOnly = typeof datas[row].readOnly === 'string' ? JSON.parse(datas[row].readOnly) : datas[row].readOnly;
-                if (readOnly || datas[row].items || compatLockedKeys.includes(datas[row].key)) {
-                    me.setting.locked.rows.push(row);
-                }
-                for(let col = 0;col < cols.length;col++){
-                    sheet.setValue(row, col, datas[row][cols[col]['dataCode']]);
-                }
-            }
-            basicInfoView.setDatePicker(sheet, me.setting.dateRows);
-        };
-        this.renderSheetFuc(sheet, fuc);
-    },
-
-    onEditStarting: function (sender, args) {
-        let me = projFeatureView;
-        if(me.setting.locked.cols.indexOf(args.col) !== -1){
-            args.cancel = true;
-        }
-        if(args.col === 1 && me.setting.locked.rows.indexOf(args.row) !== -1){
-            args.cancel = true;
-        }
-    },
-
-    onEditEnded: function (sender, args) {
-        let me = projFeatureView;
-        let v =  args.editingText ? args.editingText.toString().trim() : '';
-        if(args.row < me.datas.length){
-            let required = typeof me.datas[args.row].required === 'string' ? JSON.parse(me.datas[args.row].required) : me.datas[args.row].required;
-            if (required && !v) {
-                v = me.datas[args.row].value;
-                args.sheet.setValue(args.row, args.col, v);
-            } else if(me.setting.numRows.indexOf(args.row) !== -1){//控制数值
-                if(!me.isNum(v)){
-                    alert('只能输入数值');
-                    v = me.datas[args.row].value && me.isNum(me.datas[args.row].value) ? me.datas[args.row].value : '';
-                    args.sheet.setValue(args.row, args.col, v);
-                }
-            } else if(me.setting.dateRows.indexOf(args.row) !== -1){
-                if(v.length > 0){
-                    v = formatDate(new Date(v), 'yyyy-MM-dd');
-                    v = basicInfoView.filtDate(v);
-                    if(!v){
-                        alert('请输入正确的日期格式yyyy-mm-dd');
-                        args.sheet.setValue(args.row, args.col, me.datas[args.row].value ? me.datas[args.row].value : '');
-                        return;
-                    }
-                }
-            }
-            me.datas[args.row].value = v;
-        }
-    },
-
-    onEnterCell: function (sender, args) {
-        args.sheet.repaint();
-    },
-
-    onClipboardPasting: function (sender, args) {
-        let me = projFeatureView;
-        if(me.setting.locked.cols.indexOf(args.cellRange.col) !== -1){
-            args.cancel = true;
-        }
-    },
-
-    onClipboardPasted: function (sender, args) {
-        let me = projFeatureView;
-        let items = sheetCommonObj.analyzePasteData(me.setting, args);
-        let recRows = [];
-        if(items.length === 0){
-            return;
-        }
-        for(let i = 0, len = items.length; i < len; i++){
-            let row = i + args.cellRange.row;
-            let comboItems = me.getComboItemsByRow(row);
-            let required = typeof me.datas[row].required === 'string' ? JSON.parse(me.datas[row].required) : me.datas[row].required;
-            if(me.setting.locked.rows.indexOf(row) !== -1){
-                recRows.push(row);
-            }
-            else if (required && !items[i].value) {
-                recRows.push(row);
-            }
-            //粘贴下拉框数据过滤
-            else if(comboItems && !comboItems.includes(items[i].value)){
-                recRows.push(row);
-            }
-            else if(me.setting.numRows.indexOf(row) !== -1 && !me.isNum(items[i].value)){
-                recRows.push(row);
-            }
-            else if(me.setting.dateRows.indexOf(row) !== -1){
-                items[i].value = basicInfoView.filtDate(items[i].value);
-                if(!me.isDef(items[i].value)){
-                    recRows.push(row);
-                } else {
-                    me.datas[row].value = items[i].value;
-                }
-            }
-            else {
-                me.datas[row].value = items[i].value;
-            }
-        }
-        if(recRows.length > 0){
-            me.renderSheetFuc(args.sheet, function () {
-                for(let i = 0, len = recRows.length; i < len; i++){
-                    let staticV = me.datas[recRows[i]].value || '';
-                    args.sheet.setValue(recRows[i], args.cellRange.col, staticV);
-                }
-            })
-        }
-    },
-
-    getFeature: function (featureKey) {
-        let datas = this.datas;
-        if(datas.length === 0){
-            datas = projectObj.project.property.projectFeature;
-        }
-        for(let feature of datas){
-            if(feature.key === featureKey){
-                return feature.value;
-            }
-        }
-        return null;
-    },
-
-    isDef: function (v) {
-        return v !== undefined && v !== null;
-    },
-    isNum: function(v){
-        return this.isDef(v) && !isNaN(v);
-    },
-
-    copyObj: function(obj){
-        let newObj = {};
-        for(let attr in obj){
-            newObj[attr] = obj[attr];
-        }
-        return newObj;
-    },
-
-    initDatas: function (datas) {
-        this.datas = [];
-        for(let i = 0, len = datas.length; i < len; i++){
-            this.datas.push(this.copyObj(datas[i]));
-        }
-    },
-
-//数据库读到的数据转换为展示的结构
-    toViewDatas: function (datas) {
-        let rst = [];
-        this.firstData.items = datas;
-        rst.push(this.firstData);
-        rst = rst.concat(datas);
-       return rst;
-    },
-
-//展示的结构转换为入库的结构
-    toSaveDatas: function (datas) {
-        let rst = [].concat(datas);
-        rst.splice(0, 1);
-        return rst;
-    },
-
-    toUpdate: function (orgDatas, newDatas) {
-        if(orgDatas.length !== newDatas.length){
-            return true;
-        }
-        for(let i = 0, len = orgDatas.length; i < len; i++){
-            let orgObj = orgDatas[i], newObj = newDatas[i];
-            if(orgObj.value !== newObj.value){
-                return true;
-            }
-        }
-        return false;
-    },
-
-
-    a_updateInfo: function (datas) {
-        let me = this;
-        let url = '/pm/api/updateProjects',
-            updateData = {
-                updateType: 'update',
-                updateData: {ID: parseInt(scUrlUtil.GetQueryString('project')), 'property.projectFeature': datas}
-            },
-            postData = {
-                user_id: userID,
-                updateData: [updateData]
-            };
-        CommonAjax.post(url, postData, function (rstData) {
-            me.orgDatas = me.toViewDatas(datas);
-        });
-    },
-
-    initTree:function (sheet, init, datas) {
-        sheet.getRange(-1, 0, -1, 1).cellType(this.getTreeNodeCellType(datas));
-        for(let i =0, len = datas.length; i < len; i++){
-            if(datas[i].hasOwnProperty('items')){
-                let collapsed = false;
-                if(init){
-                    datas[i].collapsed=false;
-                    collapsed = true;
-                }else {
-                    collapsed = datas[i].collapsed == undefined ? true : datas[i].collapsed;
-                }
-                //sheet.getRange(i+1, -1, datas[i].items.length, -1).visible(!collapsed);
-            }
-        }
-    },
-
-    getTreeNodeCellType:function (data) {
-        var ns = GC.Spread.Sheets;
-        var rectW = 10;
-        var rectH = 10;
-        var margin = 3;
-        function TreeNodeCellType() {
-        }
-
-        function drowRect(ctx,x,y,w,h) {
-            ctx.save();
-            ctx.strokeStyle = "gray";
-            ctx.translate(0.5,0.5);
-            ctx.beginPath();
-            var rectX = x+margin;
-            var rectY =  y+ Math.round(h/2)-rectH/2;
-            ctx.moveTo(rectX, rectY);
-            ctx.lineTo(rectX, rectY+rectH);
-            ctx.lineTo(rectX+rectW, rectY+rectH);
-            ctx.lineTo(rectX+rectW, rectY);
-            ctx.lineTo(rectX, rectY);
-            ctx.moveTo(rectX+rectW, y+Math.round(h/2));
-            ctx.lineTo(rectX+rectW+5, y+Math.round(h/2));
-            ctx.stroke();
-            ctx.restore();
-        }
-
-        function drowSymbol(ctx,x,y,w,h,collapsed) {
-            ctx.save();
-            ctx.strokeStyle = "#000000";
-            ctx.translate(0.5, 0.5);
-            ctx.beginPath();
-            ctx.moveTo(x+margin+2, y+Math.round(h/2));
-            ctx.lineTo(x+margin+8, y+Math.round(h/2));
-            var rectY =  y+ Math.round(h/2)-rectH/2;
-            if(collapsed){
-                ctx.moveTo(x+margin+rectW/2,rectY+2);
-                ctx.lineTo(x+margin+rectW/2,rectY+2+6);
-            }
-            ctx.stroke();
-            ctx.restore();
-        }
-
-        function drowSubItem(ctx,x,y,w,h,offset,nextItem) {
-            offset+=6;
-            ctx.save();
-            ctx.strokeStyle = "gray";
-            ctx.translate(0.5, 0.5);
-            ctx.beginPath();
-            ctx.moveTo(x+offset, y);
-            ctx.lineTo(x+offset, y+Math.round(h/2));
-            offset+=9;
-            ctx.lineTo(x+offset, y+Math.round(h/2));
-            if(nextItem&&!nextItem.hasOwnProperty('items')){
-                ctx.moveTo(x+offset-9, y+Math.round(h/2));
-                ctx.lineTo(x+offset-9, y+h);
-            }
-            ctx.stroke();
-            ctx.restore();
-            return offset;
-        }
-
-        TreeNodeCellType.prototype = new ns.CellTypes.Text();
-        TreeNodeCellType.prototype.paint = function (ctx, value, x, y, w, h, style, options) {
-            if(value!=null){
-                var offset = margin+rectW+6;
-                var recode = data[options.row];
-                if(recode&&recode.hasOwnProperty('items')){
-                    drowRect(ctx,x,y,w,h);
-                    var collapsed = recode.collapsed==undefined?true:recode.collapsed;//options.sheet.getTag(options.row,options.col);
-                    drowSymbol(ctx,x,y,w,h,collapsed);
-                }else if(recode&&!recode.hasOwnProperty('items')){
-                    offset= drowSubItem(ctx,x,y,w,h,offset,data[options.row+1]);
-                    offset+=1;
-                }
-                arguments[2] = x + offset;
-                arguments[4] = w - offset;
-                GC.Spread.Sheets.CellTypes.Text.prototype.paint.apply(this, arguments);
-            }
-        };
-        // override getHitInfo to allow cell type get mouse messages
-        TreeNodeCellType.prototype.getHitInfo = function (x, y, cellStyle, cellRect, context) {
-            return {
-                x: x,
-                y: y,
-                row: context.row,
-                col: context.col,
-                cellStyle: cellStyle,
-                cellRect: cellRect,
-                sheetArea: context.sheetArea
-            };
-        }
-        TreeNodeCellType.prototype.processMouseDown = function (hitinfo) {
-            var recode = data[hitinfo.row];
-            let offset = -1,
-                indent = 20,
-                halfBoxLength = 5;
-            let centerX = hitinfo.cellRect.x + offset + indent / 2;
-            let centerY = (hitinfo.cellRect.y + offset + (hitinfo.cellRect.y + offset + hitinfo.cellRect.height)) / 2
-            if(recode&&recode.hasOwnProperty('items')){
-                //方框外1像素内都有效
-                const boxLengh = 10;
-                if (hitinfo.x >= centerX - halfBoxLength - 1 && hitinfo.x <= centerX + halfBoxLength + 1 &&
-                    hitinfo.y >= centerY - halfBoxLength - 1 && hitinfo.y <= centerY + halfBoxLength + 1) {
-                    var collapsed = recode.collapsed==undefined?true:recode.collapsed;
-                    collapsed = !collapsed
-                    recode.collapsed=collapsed;
-                    //hitinfo.sheet.setTag(hitinfo.row,hitinfo.col,collapsed);
-                    hitinfo.sheet.getRange(hitinfo.row+1, -1, recode.items.length, -1).visible(!collapsed);
-                    hitinfo.sheet.invalidateLayout();
-                    hitinfo.sheet.repaint();
-                }
-            }
-        };
-        return new TreeNodeCellType()
-    },
-
-};
-
-$(document).ready(function () {
-
-    $('#poj-set').on('shown.bs.modal', function (e) {
-        //init Spread
-        projFeatureView.initDatas(projFeatureView.orgDatas);
-        projFeatureView.buildSheet();
-        projFeatureView.showData(projFeatureView.datas);
-        if(projectReadOnly){
-            disableSpread(projFeatureView.workBook);
-        }
-    });
-
-    $('#poj-set').on('hidden.bs.modal', function (e) {
-        //destroy Spread
-        if(projFeatureView.workBook){
-            projFeatureView.workBook.destroy();
-            projFeatureView.workBook = null;
-        }
-        projFeatureView.datas = [];
-    });
-
-    $('#tab_poj-settings-projFeature').on('shown.bs.tab', function () {
-        sheetCommonObj.refreshWorkbookDelDefer(projFeatureView.workBook, 100);
-    });
-}); */
+});

web/building_saas/pm/js/pm_newMain.js

@@ -2786,6 +2786,8 @@ function getNeedfulBasicInfo(info, fileKind) {
 }
 
 function getRequired(rst, datas) {
+    // 暂时不填必填项了
+    return [];
     if (!datas) {
         return rst;
     }