fix: Correct the implementation logic of the filter

pojol · Jul 5, 2023 · 7f84cde · 7f84cde
1 parent 6275d5f
commit 7f84cde
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 46 deletions.
diff --git a/editor/src/pages/bots.tsx b/editor/src/pages/bots.tsx
@@ -153,13 +153,11 @@ const Bots = (props: BotsProps) => {
 
     var intags = (tags: Array<string>) => {
       for (var i = 0; i < selectedTag.length; i++) {
-        for (var j = 0; j < tags.length; j++) {
-          if (selectedTag[i] === tags[j]) {
-            return true
-          }
+        if (!tags.includes(selectedTag[i])) {
+          return false
         }
       }
-      return false
+      return true
     }
 
     if (bots.length > 0) {

diff --git a/editor/src/pages/edit/blackboard.tsx b/editor/src/pages/edit/blackboard.tsx
@@ -71,6 +71,7 @@ export default function Blackboard() {
                 setActive("2")
             }
 
+            setRuntimeerr("")
             setChange(msg)
         }
 

diff --git a/editor/src/pages/edit/side.tsx b/editor/src/pages/edit/side.tsx
@@ -60,46 +60,37 @@ export const EditSidePlane: React.FC<SideProps> = ({ graph, isGraphCreated }) =>
       }))
 
       resizeSidePane()
-      reloadPrefab()
+      reloadPrefab([])
     }
 
   }, [isGraphCreated])
 
-  /*
-    PubSub.subscribe(Topic.PrefabUpdateAll, (topic: string, info: any) => {
-      this.reloadPrefab()
-    });
-  
-  */
-  const matchTags = (tags: string[]): boolean => {
-
-    let selecttags = selectTags
-    for (var i = 0; i < selecttags.length; i++) {
-      for (var j = 0; j < tags.length; j++) {
-        if (tags[j] === selecttags[i]) {
-          console.info(tags[j], "match", selecttags[i])
-          return true
-        }
+  const matchTags = (matchtags:string[], tags: string[]): boolean => {
+
+    for (let i = 0; i < matchtags.length; i++) {
+      if (!tags.includes(matchtags[i])) {
+        return false;
       }
     }
-
-    return false
+    return true;
+
   }
 
-  const reloadPrefab = () => {
+  const reloadPrefab = (newtags :string[]) => {
     const prefabMap = pmap
 
-    setSelectTags([])
     setTags([])
 
     let tmplst = new Array<string>()
     let taglst = new Array<PrefabTagInfo>()
     var tagSet = new Set<string>()
 
+    console.info("new tags", newtags)
+
     prefabMap.forEach((value: PrefabInfo) => {
 
-      if (selectTags.length !== 0) {
-        if (matchTags(value.tags)) {
+      if (newtags !== undefined && newtags.length !== 0) {
+        if (matchTags(newtags, value.tags)) {
           tmplst.push(value.name)
         }
       } else {
@@ -123,7 +114,7 @@ export const EditSidePlane: React.FC<SideProps> = ({ graph, isGraphCreated }) =>
   const resizeSidePane = () => {
     var div = document.getElementById("prefab-pane")
     if (div !== null) {
-      var clienth = document.documentElement.clientHeight - 260
+      var clienth = document.documentElement.clientHeight - 270
       div.style.height = clienth.toString() + "px"
       div.style.overflow = "auto"
       console.info("set", document.documentElement.clientHeight.toString())
@@ -148,10 +139,9 @@ export const EditSidePlane: React.FC<SideProps> = ({ graph, isGraphCreated }) =>
 
   const onSelectChange = (value: string[]) => {
     setSelectTags(value)
-    reloadPrefab()
+    reloadPrefab(value)
   };
 
-
   return (
     <div className="dnd-wrap">
 

diff --git a/editor/src/pages/prefab.tsx b/editor/src/pages/prefab.tsx
@@ -23,7 +23,7 @@ import { connect, ConnectedProps } from 'react-redux';
 import { addItem, removeItem, cleanItems } from '../models/prefab';
 import { RootState } from '@/models/store';
 
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 
 const { Post, PostGetBlob, PostBlob } = require("../utils/request");
 
@@ -44,9 +44,8 @@ interface DataType {
 
 type DataIndex = keyof DataType;
 
-interface PrefabProps extends PropsFromRedux { }
 
-const Prefab = (props: PrefabProps) => {
+export default function Prefab () {
 
   const [data, setData] = useState<DataType[]>([]);
   const [code, setCode] = useState<string>("");
@@ -55,6 +54,8 @@ const Prefab = (props: PrefabProps) => {
   const [newPrefabName, setNewPrefabName] = useState<string>("");
   const [searchedColumn, setSearchedColumn] = useState<DataIndex>();
 
+  const dispatch = useDispatch()
+
   const { themeValue } = useSelector((state: RootState) => state.configSlice)
 
   let obj: any = null
@@ -100,7 +101,7 @@ const Prefab = (props: PrefabProps) => {
 
   const syncConfig = () => {
 
-    props.dispatch(cleanItems())
+    dispatch(cleanItems())
 
     Post(localStorage.remoteAddr, Api.PrefabList, {}).then((json: any) => {
       if (json.Code !== 200) {
@@ -137,7 +138,7 @@ const Prefab = (props: PrefabProps) => {
                     tags: element.tags,
                     code: String(reader.result),
                   }
-                  props.dispatch(addItem({ key: element.name, value: pi }))
+                  dispatch(addItem({ key: element.name, value: pi }))
 
                   counter++;
                   if (counter === lst.length) {
@@ -413,13 +414,4 @@ const Prefab = (props: PrefabProps) => {
       </Modal>
     </div>
   );
-}
-
-const mapStateToProps = (state: RootState) => ({
-  prefabMap: state.prefabSlice.pmap
-});
-
-const connector = connect(mapStateToProps);
-type PropsFromRedux = ConnectedProps<typeof connector>;
-
-export default connector(Prefab);
+}
diff --git a/editor/src/utils/request.js b/editor/src/utils/request.js
@@ -1,6 +1,6 @@
 
 function Post(url, methon, formData) {
-  console.info("post methon", methon, "body=>", JSON.stringify(formData))
+  //console.info("post methon", methon, "body=>", JSON.stringify(formData))
   return new Promise(function (resolve, reject) {
     fetch(url + "/" + methon, {
       method: "POST",