Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation into 1.0.0_online

modules/main_col_lib/controllers/main_col_controller.js

@@ -93,6 +93,32 @@ class MainColController extends BaseController {
         response.json(result);
     }
 
+    async edit(request,response){
+        let result = {
+            error:0
+        }
+        //先取出替换库信息：
+        let libID = request.params.libID;
+        let colLib = await mainColFacade.getLibByID(libID);
+        if(colLib){
+            let randerData = {
+                title:'列设置库',
+                mainURL:'/mainTreeCol/main',
+                libName:colLib.name,
+                userAccount: request.session.managerData.username,
+                userID: request.session.managerData.userID,
+                main_tree_col:JSON.stringify(colLib.main_tree_col),
+                libID:libID,
+                LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
+                layout: 'maintain/common/html/edit_layout'
+            };
+            response.render("maintain/main_col_lib/html/edit", randerData);
+        }else {
+            response.redirect(request.headers.referer);
+        }
+
+    }
+
     /*async updateBillsTemplateItem(request, response) {
         let libID = request.params.libID;
         let result = {error: 1, message: '更新数据错误', data: null};

modules/main_col_lib/routes/main_col_routes.js

@@ -15,6 +15,7 @@ module.exports =function (app) {
     colRouter.post("/deleteLibByID", mainColController.auth, mainColController.init, mainColController.deleteLibByID);
     colRouter.post("/getLibByID", mainColController.auth, mainColController.init, mainColController.getLibByID);
     colRouter.post("/saveLib", mainColController.auth, mainColController.init, mainColController.saveLib);
+    colRouter.get("/edit/:libID", mainColController.auth, mainColController.init, mainColController.edit);
     /*colRouter.get("/editTemplate/:libID", mainColController.auth, mainColController.init, mainColController.editTemplate);
     colRouter.post("/getLibByID", mainColController.auth, mainColController.init, mainColController.getLibByID);
     colRouter.post("/saveLib", mainColController.auth, mainColController.init, mainColController.saveLib);

public/web/common_ajax.js

@@ -152,4 +152,27 @@ function ajaxErrorInfo(jqXHR, textStatus, errorThrown) {
     }else {
         alert('url: ' + url +' error ' + textStatus + " " + errorThrown);
     }
+}
+
+//对JSON对象排序，按属性key的顺序显示
+function sortJson(obj) {
+    if(obj instanceof Array){
+        for(let o in obj){
+            obj[o] = sortJson(obj[o]);
+        }
+        return obj;
+    }else if(typeof obj == 'object'){
+        let arr=[];
+        let newOjb ={};
+        for(let key in obj){
+            arr.push(key);
+        }
+        arr.sort();
+        for(let a of arr){
+            newOjb[a]= sortJson(obj[a]);
+        }
+        return newOjb;
+    }else {
+        return obj;
+    }
 }

web/maintain/main_col_lib/html/edit.html

@@ -0,0 +1,36 @@
+<nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0 second_header">
+    <ul class="nav nav-tabs" role="tablist">
+        <li class="nav-item">
+            <a class="nav-link active px-3" href="javascript: void(0);">列设置</a>
+        </li>
+    </ul>
+</nav>
+
+<div class="main">
+    <div class="content" >
+        <div class="container-fluid" >
+        <div class=" col-lg-12 p-0">
+            <nav class="navbar sticky-top navbar-toggleable-md navbar-light bg-faded tools-bar">
+                <div class="collapse navbar-collapse" id="navbarNav">
+                    <div class="tools-btn btn-group align-top">
+                        <a href="javascript:void(0)" class="btn btn-sm" id="createNormal"><i class="fa fa-list-alt" aria-hidden="true"></i> 生成默认</a>
+                        <a href="javascript:void(0)" class="btn btn-sm" id="format"><i class="fa fa-list-alt" aria-hidden="true"></i> 校验格式</a>
+                        <a href="javascript:void(0)" class="btn btn-sm" id="save"><i class="fa fa-floppy-o" aria-hidden="true"></i> 保存</a>
+                    </div>
+                </div>
+            </nav>
+            <textarea class="form-control" id="mainTreeCol" rows="38"></textarea>
+        </div>
+        </div>
+        <input type="hidden" id="libID" value="<%= libID %>">
+        <input type="hidden" id="originalMainCol" value="<%= main_tree_col %>">
+    </div>
+</div>
+
+
+
+<script type="text/javascript">
+
+</script>
+<script type="text/javascript" src="/lib/json/json2.js"></script>
+<script type="text/javascript" src="/web/maintain/main_col_lib/js/main_col_edit.js"></script>

web/maintain/main_col_lib/html/main.html

@@ -9,7 +9,7 @@
                             <tbody id="showArea">
                             <% for(let lib of mainColLibs){ %>
                             <tr class="libTr">
-                                <td id="<%= lib.ID%>"><%= lib.name%></td>
+                                <td id="<%= lib.ID%>"><a href="/mainTreeCol/edit/<%= lib.ID%>"><%= lib.name%></a></td>
                                 <td><%= lib.compilationName%></td>
                                 <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
                                 <td>

web/maintain/project_feature_lib/js/project_feature_edit.js

@@ -1,15 +1,12 @@
 /**
  * Created by zhang on 2018/9/3.
  */
-featureObj = {
-
-};
 
 $(document).ready(function () {
     try {
-        $("#featureList").val(JSON.stringify(JSON.parse($("#originalFeature").val()),null,4));
+        let tem = sortJson(JSON.parse($("#originalFeature").val()));
+        $("#featureList").val(JSON.stringify(tem,null,4));
     }catch (err){
-        $("#featureList").val(featureList);
         console.log(err);
     }
 
@@ -71,4 +68,3 @@ $(document).ready(function () {
 
 
 });
-//featureObj.initSpread();