Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuOperation

public/web/rpt_value_define.js

@@ -138,6 +138,8 @@ const JV = {
   PROP_FONT: "font",
   PROP_CONTROL: "control",
   PROP_STYLE: "style",
+  PROP_DIAGONAL_DOWN: "diagonal_down",
+  PROP_DIAGONAL_UP: "diagonal_up",
   PROP_VALUE: "Value",
   PROP_LABEL: "Label",
   PROP_AREA: "area",

web/maintain/price_info_lib/js/index.js

@@ -1,7 +1,8 @@
 $(document).ready(() => {
     console.log('进入信息价');
     $('[data-toggle="tooltip"]').tooltip();
-    AREA_BOOK.handleSelectionChanged(0);
+    // AREA_BOOK.handleSelectionChanged(0);
+    AREA_BOOK.init();
     const $range = $(document.body);
     lockUtil.lockTools($range, locked);
 });

web/maintain/price_info_lib/js/priceArea.js

@@ -78,6 +78,15 @@ const AREA_BOOK = (() => {
     handleEdit(info.changedCells);
   }); */
 
+  const setCurAreaStorage = (curLibID, curAreaID) => {
+    window.localStorage.setItem(`priceArea:${curLibID}`, curAreaID);
+  };
+
+  const geCurAreaStorage = (curLibID) => {
+    const curAreaID = window.localStorage.getItem(`priceArea:${curLibID}`);
+    return curAreaID;
+  };
+
   const curArea = { ID: null, name: '' };
   // 焦点变更处理
   const debounceSelectionChanged = _.debounce(function (e, info) {
@@ -88,10 +97,25 @@ const AREA_BOOK = (() => {
     const areaItem = cache[row];
     curArea.ID = areaItem && areaItem.ID || null;
     curArea.name = areaItem && areaItem.name || '';
+    setCurAreaStorage(libID, curArea.ID);
     CLASS_BOOK.initData(libID, curArea.ID);
   }
   sheet.bind(GC.Spread.Sheets.Events.SelectionChanged, debounceSelectionChanged);
 
+  // 第一次进来初始化显示
+  const init = () => {
+    const curAreaID = geCurAreaStorage(libID);
+    if (!curAreaID) {
+      handleSelectionChanged(0);
+      return;
+    }
+    let row = cache.findIndex(item => item.ID === curAreaID);
+    row = row >= 0 ? row : 0;
+    handleSelectionChanged(row);
+    sheet.setActiveCell(row, 1);
+    sheet.showCell(row, 0, GC.Spread.Sheets.VerticalPosition.center);
+  }
+
   // 新增
   async function insert() {
     const data = {
@@ -202,9 +226,12 @@ const AREA_BOOK = (() => {
   buildContextMenu();
 
   return {
+    init,
     handleSelectionChanged,
     curArea,
     cache,
+    setCurAreaStorage,
+    geCurAreaStorage
   }
 
 })();

web/maintain/price_info_lib/js/priceItem.js

@@ -41,7 +41,7 @@ const PRICE_BOOK = (() => {
     try {
       cache = await ajaxPost('/priceInfo/getPriceData', { classIDList }, 1000 * 60 * 10);
       // cache = _.sortBy(cache, 'classCode');
-      cache = _.sortBy(cache, 'code');
+      // cache = _.sortBy(cache, 'code');
       showData(sheet, cache, setting.header, 5);
       const row = sheet.getActiveRowIndex();
       const keywordList = cache[row] && cache[row].keywordList || [];

web/maintain/report/html/rpt_tpl_dtl_field_loc.html

@@ -86,22 +86,35 @@
                     <label>边框样式</label>
                     <select class="form-control" id="elementBorders" onchange="rpt_tpl_cfg_helper.borderChange(this)"></select>
                 </div>
-                <div class="form-group col-md-2">
+                <div class="form-group col-md-1">
                     <label>左边</label>
                     <input class="form-control input-sm" id="eleBorderLeft" type="number" value="0" step="1" min="0" max="3" disabled>
                 </div>
-                <div class="form-group col-md-2">
+                <div class="form-group col-md-1">
                     <label>右边</label>
                     <input class="form-control input-sm" id="eleBorderRight" type="number" value="0" step="1" min="0" max="3" disabled>
                 </div>
-                <div class="form-group col-md-2">
+                <div class="form-group col-md-1">
                     <label>上边</label>
                     <input class="form-control input-sm" id="eleBorderTop" type="number" value="0" step="1" min="0" max="3" disabled>
                 </div>
-                <div class="form-group col-md-2">
+                <div class="form-group col-md-1">
                     <label>下边</label>
                     <input class="form-control input-sm" id="eleBorderBottom" type="number" value="0" step="1" min="0" max="3" disabled>
                 </div>
+                <div class="form-group col-md-2">
+                    <label>斜线样式</label>
+                    <div class="form-check">
+                        <label class="form-check-label">
+                            <input type="checkbox" class="form-check-input" id="eleDiagonalDown" onchange="rpt_tpl_cfg_helper.diagonalDownChange(this)">
+                            下坡式
+                        </label>&nbsp&nbsp
+                        <label class="form-check-label">
+                            <input type="checkbox" class="form-check-input" id="eleDiagonalUp" onchange="rpt_tpl_cfg_helper.diagonalUpChange(this)">
+                            上坡式
+                        </label>&nbsp&nbsp
+                    </div>
+                </div>
             </div>
             <div class="row" id="element_control">
                 <div class="form-group col-md-2">

web/maintain/report/js/rpt_tpl_cfg_helper.js

@@ -161,6 +161,9 @@ let rpt_tpl_cfg_helper = {
             idx = me.reportCfg.borderArr.indexOf(borderAttr);
             borderDom.selectedIndex = idx;
             me.borderChange(borderDom);
+            // 还有diagonal
+            $("#eleDiagonalDown").get(0).checked = stringUtil.convertStrToBoolean(treeNode[JV.PROP_DIAGONAL_DOWN]);
+            $("#eleDiagonalUp").get(0).checked = stringUtil.convertStrToBoolean(treeNode[JV.PROP_DIAGONAL_UP]);
             //setup control
             let ctrlDom = $("#elementControls").get(0);
             let ctrlAttr = treeNode[JV.PROP_CONTROL];
@@ -358,6 +361,12 @@ let rpt_tpl_cfg_helper = {
             }
         }
     },
+    diagonalUpChange: function(dom) {
+        dataInfoMapTreeOprObj.currentNode[JV.PROP_DIAGONAL_UP] = dom.checked?'T':'F';
+    },
+    diagonalDownChange: function(dom) {
+        dataInfoMapTreeOprObj.currentNode[JV.PROP_DIAGONAL_DOWN] = dom.checked?'T':'F';
+    },
     controlChange: function(dom) {
         if (dataInfoMapTreeOprObj.currentNode) {
             let me = this, ctrlAttr = dom.value;

web/maintain/report/js/rpt_tpl_data_map.js

@@ -693,6 +693,8 @@ let dataInfoMapTreeOprObj = {
     destination[JV.PROP_FONT] = source[JV.PROP_FONT];
     destination[JV.PROP_CONTROL] = source[JV.PROP_CONTROL];
     destination[JV.PROP_STYLE] = source[JV.PROP_STYLE];
+    if (source[JV.PROP_DIAGONAL_DOWN]) destination[JV.PROP_DIAGONAL_DOWN] = source[JV.PROP_DIAGONAL_DOWN];
+    if (source[JV.PROP_DIAGONAL_UP]) destination[JV.PROP_DIAGONAL_UP] = source[JV.PROP_DIAGONAL_UP];
     destination[JV.PROP_PREFIX] = source[JV.PROP_PREFIX];
     destination[JV.PROP_SUFFIX] = source[JV.PROP_SUFFIX];
     if (source[JV.PROP_FORMAT])
@@ -779,6 +781,8 @@ let dataInfoMapTreeOprObj = {
     destination[JV.PROP_FONT] = source[JV.PROP_FONT];
     destination[JV.PROP_CONTROL] = source[JV.PROP_CONTROL];
     destination[JV.PROP_STYLE] = source[JV.PROP_STYLE];
+    if (source[JV.PROP_DIAGONAL_DOWN]) destination[JV.PROP_DIAGONAL_DOWN] = source[JV.PROP_DIAGONAL_DOWN];
+    if (source[JV.PROP_DIAGONAL_UP]) destination[JV.PROP_DIAGONAL_UP] = source[JV.PROP_DIAGONAL_UP];
     destination.Title = "";
     destination[JV.PROP_AREA] = {};
     me.private_copy_area(source[JV.PROP_AREA], destination[JV.PROP_AREA]);