فهرست منبع

基础树结构,健壮性修改:
1.重复id报错
2.不存在父项,不加载

MaiXinRong 3 سال پیش
والد
کامیت
924bfac712
2فایلهای تغییر یافته به همراه17 افزوده شده و 18 حذف شده
  1. 14 15
      app/public/js/path_tree.js
  2. 3 3
      app/view/revise/history.ejs

+ 14 - 15
app/public/js/path_tree.js

@@ -337,22 +337,21 @@ const createNewPathTree = function (type, setting) {
             });
             for (const data of datas) {
                 const keyName = itemsPre + data[this.setting.id];
-                if (!this.items[keyName]) {
-                    const item = JSON.parse(JSON.stringify(data));
-                    item.children = [];
-                    item.expanded = true;
-                    item.visible = true;
-                    this.items[keyName] = item;
-                    this.datas.push(item);
-                    if (item[setting.pid] === setting.rootId) {
-                        this.children.push(item);
-                    } else {
-                        const parent = this.getParent(item);
-                        if (parent) {
-                            parent.children.push(item);
-                        }
-                    }
+                if (this.items[keyName]) throw '数据错误';
+
+                const item = JSON.parse(JSON.stringify(data));
+                item.children = [];
+                item.expanded = true;
+                item.visible = true;
+                if (item[setting.pid] === setting.rootId) {
+                    this.children.push(item);
+                } else {
+                    const parent = this.getParent(item);
+                    if (!parent) continue;
+                    parent.children.push(item);
                 }
+                this.items[keyName] = item;
+                this.datas.push(item);
             }
             this.children.sort((a, b) => { return a[self.setting.order] - b[self.setting.order]; });
             this.sortTreeNode(true);

+ 3 - 3
app/view/revise/history.ejs

@@ -64,15 +64,15 @@
                         <div class="sjs-sh-2" style="overflow:auto">
                             <div class="form-group mt-2">
                                 <label >提交人</label>
-                                <input id="user-name" type="" class="form-control form-control-sm" value="<%- revise.user_name %>" disabled>
+                                <input id="user-name" class="form-control form-control-sm" value="<%- revise.user_name %>" disabled>
                             </div>
                             <div class="form-group">
                                 <label >修订内容<b class="text-danger">*</b></label>
-                                <textarea id="content" class="form-control form-control-sm" value="编写错漏5" rows="12" readonly=""><%- revise.content %></textarea>
+                                <textarea id="content" class="form-control form-control-sm" rows="12" readonly=""><%- revise.content %></textarea>
                             </div>
                             <div class="form-group">
                                 <label >审批完成</label>
-                                <input id="end-time" type="" class="form-control form-control-sm" value="<%- (revise.end_time ? ctx.moment(revise.end_time).format('YYYY-MM-DD HH:mm:ss') : '') %>" disabled>
+                                <input id="end-time" class="form-control form-control-sm" value="<%- (revise.end_time ? ctx.moment(revise.end_time).format('YYYY-MM-DD HH:mm:ss') : '') %>" disabled>
                             </div>
                         </div>
                     </div>