@dao42/d42paas-front 0.7.9 → 0.7.13

package/dist/DaoPaaS.es.js

@@ -44090,9 +44090,9 @@ const CmdKey = () => {
       (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("active");
     }
   }, {
-    id: "active",
+    id: "containerStop",
     title: "\u505C\u6B62\u5BB9\u5668",
-    hotkey: "a",
+    hotkey: "cs",
     mdIcon: "input",
     handler: () => {
       var _a2, _b2;
@@ -189842,7 +189842,7 @@ class EditorData {
     language: language2,
     APP_DIR: APP_DIR2
   }, callback, cover = false) {
-    let gotModel = editor$1.getModels().find((x2) => new RegExp(path).test(x2.uri.path));
+    let gotModel = editor$1.getModels().find((x2) => x2.uri.path.includes(path));
     if (!gotModel && !!cover) {
       gotModel = editor$1.createModel(value, language2, Uri.parse(`file://${APP_DIR2}${path}`));
       this.setFileTreeStack([
@@ -190154,8 +190154,8 @@ const Editor = ({
           editor.setModel(gotModel);
           clientEditor == null ? void 0 : clientEditor.updateModel();
           setFileTreeStack(EditorData.fileTreeStack);
-          clientEditor.onFocus();
-          clientEditor.onCursorActivity();
+          clientEditor == null ? void 0 : clientEditor.onFocus();
+          clientEditor == null ? void 0 : clientEditor.onCursorActivity();
           otherClients == null ? void 0 : otherClients.setCursors();
           if (file2) {
             docServer.set(file2.path, {
@@ -197795,41 +197795,32 @@ const TerminalComponent = (_h2) => {
           return;
         }
         writeText(terminal, ((_c2 = crdt == null ? void 0 : crdt.doc) == null ? void 0 : _c2.value) || "");
-        if (!CRDTInfo22.userInfo.uuid)
-          return;
-        const postUser = userListStore.getState().userList.find(({
-          uuid: uuid2
-        }) => uuid2 === CRDTInfo22.userInfo.uuid);
-        if (postUser && !IsMe(CRDTInfo22.userInfo)) {
-          const helperContainer = (_d2 = terminal == null ? void 0 : terminal._core) == null ? void 0 : _d2._helperContainer;
-          const childNode = helperContainer == null ? void 0 : helperContainer.firstChild;
-          userLabel.innerText = postUser.username;
-          userLabel.style.backgroundColor = postUser.color;
-          userLabel.style.top = childNode.style.top;
-          userLabel.style.left = childNode.style.left;
-          helperContainer == null ? void 0 : helperContainer.appendChild(userLabel);
+        const helperContainer = (_d2 = terminal == null ? void 0 : terminal._core) == null ? void 0 : _d2._helperContainer;
+        const childNode = helperContainer == null ? void 0 : helperContainer.firstChild;
+        userLabel.style.top = childNode.style.top;
+        userLabel.style.left = childNode.style.left;
+        helperContainer == null ? void 0 : helperContainer.appendChild(userLabel);
+        const timer = setTimeout(() => {
+          helperContainer == null ? void 0 : helperContainer.removeChild(userLabel);
           terminal.setOption("theme", __spreadProps(__spreadValues({}, terminal.getOption("theme")), {
-            cursor: postUser.color
+            cursor: "#ffffff"
           }));
-          const timer = setTimeout(() => {
+        }, 6e3);
+        return () => {
+          try {
             helperContainer == null ? void 0 : helperContainer.removeChild(userLabel);
-            terminal.setOption("theme", __spreadProps(__spreadValues({}, terminal.getOption("theme")), {
-              cursor: "#ffffff"
-            }));
-          }, 6e3);
-          return () => {
-            try {
-              helperContainer == null ? void 0 : helperContainer.removeChild(userLabel);
-            } catch (_2) {
-            }
-            terminal.setOption("theme", __spreadProps(__spreadValues({}, terminal.getOption("theme")), {
-              cursor: "#ffffff"
-            }));
-            clearTimeout(timer);
-          };
-        }
+          } catch (_2) {
+          }
+          terminal.setOption("theme", __spreadProps(__spreadValues({}, terminal.getOption("theme")), {
+            cursor: "#ffffff"
+          }));
+          clearTimeout(timer);
+        };
       }
     });
+    return () => {
+      socket2 == null ? void 0 : socket2.off("terminal");
+    };
   }, [socket2]);
   return /* @__PURE__ */ jsx(FollowLayout, {
     name: "terminal",