From ef3d6b663e9bc885e9f8c74da8c60403200d4bf8 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Fri, 19 Aug 2022 11:17:08 +0800
Subject: [PATCH] 1

---
 web/src/x.min.js                | 36 ++++++++++++++++++++++++++-------
 web/srczip/logic/kanbanadmin.js | 36 ++++++++++++++++++++++++++-------
 2 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/web/src/x.min.js b/web/src/x.min.js
index 5ace43c..5e6b2a1 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -11054,12 +11054,15 @@ var X = window.X || {
                 X.laytpldata('#to-be-added-baobiao-dot',screendata,'.to-be-added-baobiao');
             };
 
-            // 搜索
-            $(document).off('click','.kanbanadmin-ss input').on('blur','.kanbanadmin-ss input',function(){
+            $('.kanbanadmin-ss input').bind('input propertychange',function(){
+                screenReport($(this).val())
+            })
+
+            function screenReport(value){
                 var screendata=[];//筛选后的数据
                 for(let i in reportlistdata){
-                    if($(this).val() != ""){
-                        if(reportlistdata[i]['name'].indexOf($(this).val()) != -1){
+                    if(value != ""){
+                        if(reportlistdata[i]['name'].indexOf(value) != -1){
                             screendata.push(reportlistdata[i]);
                         }
                     }else {
@@ -11067,7 +11070,22 @@ var X = window.X || {
                     }
                 }
                 X.laytpldata("#to-be-added-baobiao-dot",screendata,".to-be-added-baobiao");
-            });
+            }
+            // 搜索
+            // $(document).off('click','.kanbanadmin-ss input').on('bind','.kanbanadmin-ss input',function(){
+            //     var screendata=[];//筛选后的数据
+            //     for(let i in reportlistdata){
+            //         if($(this).val() != ""){
+            //             if(reportlistdata[i]['name'].indexOf($(this).val()) != -1){
+            //                 screendata.push(reportlistdata[i]);
+            //             }
+            //         }else {
+            //             screendata = reportlistdata;
+            //         }
+            //     }
+            //     console.log(screendata)
+            //     X.laytpldata("#to-be-added-baobiao-dot",screendata,".to-be-added-baobiao");
+            // });
             
             //添加报表
             $(document).off('click','.kanbanadd').on('click','.kanbanadd',function(){
@@ -11075,12 +11093,15 @@ var X = window.X || {
                 var id = $(this).attr('data-id');
                 for(let i in reportlistdata){
                     if(reportlistdata[i]['_id'] == id){
-                        reportlistdata[index]['added'] = true;
-                        X.laytpldata('#to-be-added-baobiao-dot',reportlistdata,'.to-be-added-baobiao');
+                        reportlistdata[i]['added'] = true;
+                        console.log(reportlistdata[i])
+                        // X.laytpldata('#to-be-added-baobiao-dot',reportlistdata,'.to-be-added-baobiao');
                         X.laytpldata('#to-added-baobiao-dot',reportlistdata,'.to-added-baobiao');
+                        screenReport($('.kanbanadmin-ss input').val())
                         toadddataprocessing();
                     }
                 }
+                console.log(reportlistdata)
             });
 
             // 修改报表类型
@@ -11160,6 +11181,7 @@ var X = window.X || {
             $(document).off('click','.to-added-del').on('click','.to-added-del',function(){
                 var id = $(this).attr('data-id');
                 X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:id},function(){
+                    $('.kanbanadmin-ss input').val("")
                     kanbanupdata();
                 });
             });
diff --git a/web/srczip/logic/kanbanadmin.js b/web/srczip/logic/kanbanadmin.js
index b2b6d5c..0987700 100644
--- a/web/srczip/logic/kanbanadmin.js
+++ b/web/srczip/logic/kanbanadmin.js
@@ -76,12 +76,15 @@
                 X.laytpldata('#to-be-added-baobiao-dot',screendata,'.to-be-added-baobiao');
             };
 
-            // 搜索
-            $(document).off('click','.kanbanadmin-ss input').on('blur','.kanbanadmin-ss input',function(){
+            $('.kanbanadmin-ss input').bind('input propertychange',function(){
+                screenReport($(this).val())
+            })
+
+            function screenReport(value){
                 var screendata=[];//筛选后的数据
                 for(let i in reportlistdata){
-                    if($(this).val() != ""){
-                        if(reportlistdata[i]['name'].indexOf($(this).val()) != -1){
+                    if(value != ""){
+                        if(reportlistdata[i]['name'].indexOf(value) != -1){
                             screendata.push(reportlistdata[i]);
                         }
                     }else {
@@ -89,7 +92,22 @@
                     }
                 }
                 X.laytpldata("#to-be-added-baobiao-dot",screendata,".to-be-added-baobiao");
-            });
+            }
+            // 搜索
+            // $(document).off('click','.kanbanadmin-ss input').on('bind','.kanbanadmin-ss input',function(){
+            //     var screendata=[];//筛选后的数据
+            //     for(let i in reportlistdata){
+            //         if($(this).val() != ""){
+            //             if(reportlistdata[i]['name'].indexOf($(this).val()) != -1){
+            //                 screendata.push(reportlistdata[i]);
+            //             }
+            //         }else {
+            //             screendata = reportlistdata;
+            //         }
+            //     }
+            //     console.log(screendata)
+            //     X.laytpldata("#to-be-added-baobiao-dot",screendata,".to-be-added-baobiao");
+            // });
             
             //添加报表
             $(document).off('click','.kanbanadd').on('click','.kanbanadd',function(){
@@ -97,12 +115,15 @@
                 var id = $(this).attr('data-id');
                 for(let i in reportlistdata){
                     if(reportlistdata[i]['_id'] == id){
-                        reportlistdata[index]['added'] = true;
-                        X.laytpldata('#to-be-added-baobiao-dot',reportlistdata,'.to-be-added-baobiao');
+                        reportlistdata[i]['added'] = true;
+                        console.log(reportlistdata[i])
+                        // X.laytpldata('#to-be-added-baobiao-dot',reportlistdata,'.to-be-added-baobiao');
                         X.laytpldata('#to-added-baobiao-dot',reportlistdata,'.to-added-baobiao');
+                        screenReport($('.kanbanadmin-ss input').val())
                         toadddataprocessing();
                     }
                 }
+                console.log(reportlistdata)
             });
 
             // 修改报表类型
@@ -182,6 +203,7 @@
             $(document).off('click','.to-added-del').on('click','.to-added-del',function(){
                 var id = $(this).attr('data-id');
                 X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:id},function(){
+                    $('.kanbanadmin-ss input').val("")
                     kanbanupdata();
                 });
             });