瀏覽代碼

spreadjs,编辑后,设置只读失效问题

MaiXinRong 3 年之前
父節點
當前提交
e0842af953
共有 4 個文件被更改,包括 6 次插入3 次删除
  1. 1 1
      app/controller/stage_controller.js
  2. 1 0
      app/public/js/spreadjs_rela/spreadjs_zh.js
  3. 3 1
      app/public/js/stage.js
  4. 1 1
      app/router.js

+ 1 - 1
app/controller/stage_controller.js

@@ -1796,7 +1796,7 @@ module.exports = app => {
          * @return {void}
          */
         async payDownloadFile(ctx) {
-            const id = ctx.params.id;
+            const id = ctx.params.fid;
             try {
                 if (!id) throw '数据错误';
                 const fileInfo = await ctx.service.payAtt.getDataById(id);

+ 1 - 0
app/public/js/spreadjs_rela/spreadjs_zh.js

@@ -721,6 +721,7 @@ const SpreadJsObj = {
         const sortData = sheet.zh_dataType === 'tree' ? sheet.zh_tree.nodes : sheet.zh_data;
         this.beginMassOperation(sheet);
         try {
+            sheet.setRowCount(0, spreadNS.SheetArea.viewport);
             sheet.clear(0, 0, sheet.getRowCount(), sheet.getColumnCount(), spreadNS.SheetArea.viewport, spreadNS.StorageType.data);
             sheet.getRange(0, 0, sheet.getRowCount(), sheet.getColumnCount()).backColor(sheet.getDefaultStyle().backColor);
             // 设置总行数

+ 3 - 1
app/public/js/stage.js

@@ -1633,6 +1633,7 @@ $(document).ready(() => {
                 //     $('#showAttachment').hide();
                 // }
             } else {
+                spSpread.getActiveSheet().zh_setting.readOnly = true;
                 SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', []);
             }
             stagePosSpreadObj.loadExprToInput(spSpread.getActiveSheet());
@@ -1754,7 +1755,7 @@ $(document).ready(() => {
             const col = info.sheet.zh_setting.cols[sel[0].col];
             const node = SpreadJsObj.getSelectObject(info.sheet);
             const exprInfo = getExprInfo(col.field);
-            if (exprInfo) {
+            if (exprInfo && node) {
                 if (node[exprInfo.expr] && node[exprInfo.expr] !== '') {
                     info.sheet.getCell(info.row, info.col).text(node[exprInfo.expr]);
                 }
@@ -1798,6 +1799,7 @@ $(document).ready(() => {
                 const data = { updateType: '', updateData: [], };
                 const sortData = info.sheet.zh_data;
                 const node = SpreadJsObj.getSelectObject(slSpread.getActiveSheet());
+                if (node.children && node.children.length > 0) return;
                 if (sortData && (info.cellRange.row >= sortData.length)) {
                     data.updateType = 'add';
                     if (info.cellRange.col !== 0) {

+ 1 - 1
app/router.js

@@ -288,7 +288,7 @@ module.exports = app => {
     app.post('/tender/:id/measure/stage/:order/pay/detail', sessionAuth, tenderCheck, uncheckTenderCheck, stageCheck, 'stageController.chapterDetail');
     app.post('/tender/:id/measure/stage/:order/pay/save', sessionAuth, tenderCheck, uncheckTenderCheck, stageCheck, 'stageController.savePayData');
     app.post('/tender/:id/measure/stage/:order/pay/upload/file', sessionAuth, tenderCheck, uncheckTenderCheck, stageCheck, 'stageController.payUploadFile');
-    app.get('/tender/:id/measure/stage/:order/pay/download/file/:id', sessionAuth, 'stageController.payDownloadFile');
+    app.get('/tender/:id/measure/stage/:order/pay/download/file/:fid', sessionAuth, 'stageController.payDownloadFile');
     app.post('/tender/:id/measure/stage/:order/pay/delete/file', sessionAuth, tenderCheck, uncheckTenderCheck, stageCheck, 'stageController.payDeleteFile');
 
     // 变更概况