@dao42/d42paas-front 0.6.23 → 0.7.2

package/dist/DaoPaaS.es.js

@@ -44094,7 +44094,8 @@ const CmdKey = () => {
     hotkey: "a",
     mdIcon: "input",
     handler: () => {
-      io == null ? void 0 : io.emit("active");
+      var _a2, _b2;
+      (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("active");
     }
   }, {
     id: "clearCache",
@@ -44153,7 +44154,6 @@ const CmdKey = () => {
   }];
   const [drawerOpen, setDrawerOpen] = react.exports.useState(false);
   const [replayList, setReplayList] = react.exports.useState(null);
-  const io = useOT.getState().socket;
   const [hotkeys2, setHotkeys] = react.exports.useState(actions);
   react.exports.useEffect(() => {
     console.log("leva init");
@@ -44240,7 +44240,7 @@ const GuiComponent = () => {
 const LazyTreeComponent = lazy$2(async () => (await Promise.resolve().then(function() {
   return index$5;
 })).FileTree);
-const LazyEditorComponent = lazy$2(async () => (await Promise.resolve().then(function() {
+const LazyEditorComponent$1 = lazy$2(async () => (await Promise.resolve().then(function() {
   return index$4;
 })).Editor);
 const LazyConsoleComponent = lazy$2(async () => (await Promise.resolve().then(function() {
@@ -44521,7 +44521,7 @@ class DaoPaaS {
     this.editorDOM = container ? isHTMLElement$1(container) : this.editorDOM;
     reactDom.exports.render(/* @__PURE__ */ jsx(react.exports.Suspense, {
       fallback: /* @__PURE__ */ jsx(Loading, {}),
-      children: /* @__PURE__ */ jsx(LazyEditorComponent, __spreadProps(__spreadValues({}, props2), {
+      children: /* @__PURE__ */ jsx(LazyEditorComponent$1, __spreadProps(__spreadValues({}, props2), {
         serviceWorkerOrigin: this.serviceWorkerOrigin
       }))
     }), this.editorDOM);
@@ -174319,6 +174319,9 @@ const EditorLayout = newStyled.div`
     padding: 2px 10px;
     transform: scale(0.8);
     word-break: keep-all;
+    font-weight: bolder;
+    font-size: 14px;
+    color: #666;
   }
 
   .stack-list {
@@ -189557,6 +189560,8 @@ class MonacoAdapter {
         } catch (err) {
           console.log(err);
         }
+      } else {
+        this.trigger("cursorActivity", evt);
       }
     }
     this.ignoreNextChange = false;
@@ -190044,48 +190049,46 @@ const Editor = ({
       path: model.uri.path.replace(APP_DIR, "")
     });
   };
-  const clientInit = () => {
-    client.sendOperation = (revision, operation) => {
-      if (oTStore.getState().appStatus === "replay")
-        return;
-      const {
-        userInfo: userInfo2
-      } = userStore.getState();
-      const {
-        doc: doc22,
-        switchDoc: switchDoc22
-      } = oTStore.getState();
-      let path;
-      if (doc22 == null ? void 0 : doc22.path) {
-        path = doc22.path;
-      } else {
-        path = `temp-${temps.length + 1}`;
-        switchDoc22({
-          path: `temp-${temps.length + 1}`
-        });
-        temps.push(path);
+  client.sendOperation = (revision, operation) => {
+    if (oTStore.getState().appStatus === "replay")
+      return;
+    const {
+      userInfo: userInfo2
+    } = userStore.getState();
+    const {
+      doc: doc22,
+      switchDoc: switchDoc22
+    } = oTStore.getState();
+    let path;
+    if (doc22 == null ? void 0 : doc22.path) {
+      path = doc22.path;
+    } else {
+      path = `temp-${temps.length + 1}`;
+      switchDoc22({
+        path: `temp-${temps.length + 1}`
+      });
+      temps.push(path);
+    }
+    const crdt = {
+      timestamp: Date.now(),
+      userInfo: lodash$2.exports.pick(userInfo2, ["role", "uuid"]),
+      cursor: __spreadProps(__spreadValues({}, clientEditor.getCursor()), {
+        path
+      }),
+      editor: {
+        operation,
+        revision,
+        evtType: "Editor"
+      },
+      file: {
+        action: "Update",
+        path
       }
-      const crdt = {
-        timestamp: Date.now(),
-        userInfo: lodash$2.exports.pick(userInfo2, ["role", "uuid"]),
-        cursor: __spreadProps(__spreadValues({}, clientEditor.getCursor()), {
-          path
-        }),
-        editor: {
-          operation,
-          revision,
-          evtType: "Editor"
-        },
-        file: {
-          action: "Update",
-          path
-        }
-      };
-      io.emit("editFile", JSON.stringify(crdt));
-    };
-    client.applyOperation = (operation) => {
-      clientEditor.applyOperation(operation);
     };
+    io == null ? void 0 : io.emit("editFile", JSON.stringify(crdt));
+  };
+  client.applyOperation = (operation) => {
+    clientEditor.applyOperation(operation);
   };
   const onChange = (operation) => {
     client.applyClient(operation);
@@ -190114,7 +190117,7 @@ const Editor = ({
       },
       userInfo: lodash$2.exports.pick(userInfo, "uuid", "role")
     };
-    io.emit("cursor", JSON.stringify(crdt));
+    io == null ? void 0 : io.emit("cursor", JSON.stringify(crdt));
   };
   const onBlur = (operation) => {
   };
@@ -190205,7 +190208,7 @@ const Editor = ({
         "editor.background": "#000000"
       }
     });
-    setClientEditor(new MonacoAdapter(editor, ""));
+    setClientEditor(new MonacoAdapter(editor, serviceWorkerOrigin));
     setOtherClients(new ClientMeta(editor, userList.filter((x2) => !IsMe(x2))));
     serviceBinder();
     return () => {
@@ -190220,7 +190223,6 @@ const Editor = ({
       blur: onBlur,
       focus: onFocus
     });
-    clientInit();
     clientEditor == null ? void 0 : clientEditor.onCursorActivity();
   }, [clientEditor]);
   react.exports.useEffect(() => {
@@ -198452,6 +198454,9 @@ const useIndexState = create$3((set2) => ({
     isFolded: arg
   })
 }));
+const LazyEditorComponent = lazy$2(async () => (await Promise.resolve().then(function() {
+  return index$4;
+})).Editor);
 const MainLayout = newStyled.div`
   width: 100vw;
   height: 100vh;
@@ -198565,7 +198570,7 @@ const Index = (props2) => {
             fallback: /* @__PURE__ */ jsx(Skeleton, {
               count: 10
             }),
-            children: /* @__PURE__ */ jsx(Editor, {
+            children: /* @__PURE__ */ jsx(LazyEditorComponent, {
               useLsp: true
             })
           }) : null