@dao42/d42paas-front 0.5.50 → 0.5.52

package/dist/DaoPaaS.es.js

@@ -14942,14 +14942,15 @@ const oTStore = create$3((set2) => ({
     },
     messageId: "",
     playgroundId: "",
-    result: ""
+    result: "",
+    dockerInfos: new Map([])
   },
   playgroundStatus: "EMPTY",
   dockerStatus: "STOP",
   queryObject: {},
   globalData: {
     isRecording: false,
-    syncCursor: true,
+    syncCursor: false,
     useLsp: true
   },
   fileSaved: true,
@@ -28413,6 +28414,9 @@ const PlaygroundInit = (arg) => {
           avatar: avatarGenerator(lodash$2.exports.random(0, 6), userData.uuid)
         }), "coUsers");
         setUserInfo(originUser);
+        if (oTStore.getState().playgroundStatus === "INACTIVE") {
+          io == null ? void 0 : io.emit("active");
+        }
       }
       const userInfoList = [originUser, ...userData.coUsers.filter((f2) => f2.uuid !== originUser.uuid).map((user) => {
         return __spreadProps(__spreadValues({}, user), {
@@ -28423,12 +28427,17 @@ const PlaygroundInit = (arg) => {
       setUserList(userInfoList);
     });
     io.on("playgroundInfo", (data) => {
+      var _a2;
       const {
         playgroundInfo,
         crdt,
         dockerInfo: dockerInfo2
       } = JSON.parse(data);
-      setPlaygroundInfo(playgroundInfo);
+      const otPlaygroundInfo = oTStore.getState().playgroundInfo;
+      setPlaygroundInfo(__spreadProps(__spreadValues(__spreadValues({}, playgroundInfo), otPlaygroundInfo), {
+        activeDocker: dockerInfo2.dockerId
+      }));
+      (_a2 = otPlaygroundInfo == null ? void 0 : otPlaygroundInfo.dockerInfos) == null ? void 0 : _a2.set(dockerInfo2.dockerId, dockerInfo2);
       setDockerInfo(__spreadValues(__spreadValues({}, oTStore.getState().dockerInfo), dockerInfo2));
       dockerInfo2.fileTree && switchFileTree({
         data: dockerInfo2.fileTree
@@ -42240,7 +42249,7 @@ const GuiComponent = () => {
   };
   useControls({
     lsp: {
-      value: true,
+      value: oTStore.getState().globalData.useLsp,
       onChange: (v2) => {
         oTStore.getState().setGlobalData({
           useLsp: v2
@@ -42253,7 +42262,7 @@ const GuiComponent = () => {
     },
     syncCursor: {
       label: "\u5149\u6807\u540C\u6B65",
-      value: true,
+      value: oTStore.getState().globalData.syncCursor,
       onChange: (v2) => {
         oTStore.getState().setGlobalData({
           syncCursor: v2
@@ -187728,23 +187737,6 @@ const Editor = ({
   const throttled = lodash$2.exports.throttle((callback) => {
     callback();
   }, 300);
-  const cursorTool = (evt) => {
-    var _a2, _b2, _c2, _d2;
-    const {
-      userInfo
-    } = userStore.getState();
-    const selection2 = [[evt.selection.startLineNumber, evt.selection.startColumn, evt.selection.endLineNumber, evt.selection.endColumn, evt.selection.selectionStartLineNumber, evt.selection.selectionStartColumn, evt.selection.positionColumn, evt.selection.positionLineNumber], ...evt.secondarySelections.map((s2) => [s2.startLineNumber, s2.startColumn, s2.endLineNumber, s2.endColumn, s2.selectionStartLineNumber, s2.selectionStartColumn, s2.positionColumn, s2.positionLineNumber])];
-    const crdt = {
-      timestamp: Date.now().toString(),
-      selection: selection2,
-      file: {
-        action: "Update",
-        path: (_b2 = (_a2 = oTStore.getState()) == null ? void 0 : _a2.doc) == null ? void 0 : _b2.path
-      },
-      userInfo: lodash$2.exports.pick(userInfo, "uuid", "role")
-    };
-    (_d2 = (_c2 = useOT.getState()) == null ? void 0 : _c2.socket) == null ? void 0 : _d2.emit("selection", JSON.stringify(crdt));
-  };
   const receiveOperation = (revision, operation, _path) => {
     client2.receiveOperation = operation;
     return {
@@ -187759,18 +187751,8 @@ const Editor = ({
       }
     });
     editor.onDidChangeCursorSelection((evt) => {
-      if (oTStore.getState().appStatus === "replay")
-        return;
-      if (evt.source === "api") {
-        throttled(() => {
-          cursorTool(evt);
-        });
-      }
-      if (evt.reason === 0 || evt.source === "model")
-        return;
-      throttled(() => {
-        cursorTool(evt);
-      });
+      oTStore.getState();
+      return;
     });
     editor.onDidChangeModelContent((evt) => {
       const {
@@ -188158,6 +188140,12 @@ const Editor = ({
     if (!editor)
       return;
   }, [OTSTATE.fileSaved]);
+  react.exports.useEffect(() => {
+    if (!editor)
+      return;
+    editor$1.getModels().forEach((model) => model.dispose());
+    setFileTreeStack([]);
+  }, [OTSTATE.dockerInfo]);
   react.exports.useEffect(() => {
     if (!editor || !file)
       return;
@@ -196323,6 +196311,11 @@ const MultiPlayerCursor = () => {
       userInfo
     } = userStore.getState();
     window.addEventListener("mousemove", (evt) => {
+      const {
+        globalData
+      } = oTStore.getState();
+      if (!globalData.syncCursor)
+        return;
       const crdt = {
         timestamp: Date.now().toString(),
         userInfo: lodash$2.exports.pick(userInfo, "uuid", "role"),