@dao42/d42paas-front 0.5.53 → 0.5.58

package/dist/DaoPaaS.es.js

@@ -14724,6 +14724,9 @@ async function setReplaySource(val) {
     file: lodash$2.exports.omit(val.file, "value")
   }), val.timestamp + "." + v4$1().split("-")[0]);
 }
+async function getLocalFile(key) {
+  return (await daopaasDB).get("files", key);
+}
 async function getLocalReplayFile(key) {
   return (await daopaasDB).get("replayFiles", key);
 }
@@ -28508,10 +28511,14 @@ const PlaygroundInit = (arg) => {
       }
     });
     io.on("serverAck", (d2) => {
+      var _a2;
       const _d2 = JSON.parse(d2);
       setAsyncType("editor");
       setReplaySource(__spreadProps(__spreadValues({}, _d2), {
-        event: "editor"
+        event: "editor",
+        editor: __spreadProps(__spreadValues({}, _d2.editor), {
+          revision: ((_a2 = _d2.editor) == null ? void 0 : _a2.revision) + 1
+        })
       }));
       setServerAck();
     });
@@ -30591,11 +30598,11 @@ const replay = async (item) => {
   const filterReplayList = replayList.filter((replayItem) => replayItem.userInfo.uuid === item.userId);
   const filterReplaySource = filterReplayList.find((f2) => f2.timestamp === item.timestamp);
   if (filterReplaySource.file) {
-    const file = await getLocalReplayFile(filterReplaySource.file.path);
-    filterReplaySource.file.value = file;
-    if ((doc == null ? void 0 : doc.path) !== filterReplaySource.file.path) {
+    const doc2 = await getLocalFile(filterReplaySource.file.path);
+    filterReplaySource.file.value = doc2;
+    if ((doc2 == null ? void 0 : doc2.path) !== filterReplaySource.file.path) {
       switchDoc == null ? void 0 : switchDoc({
-        value: file,
+        value: doc2.value,
         path: filterReplaySource.file.path
       });
     }
@@ -187622,7 +187629,53 @@ function WorkerWrapper() {
     "type": "module"
   });
 }
+const EditorLayout = newStyled.div`
+  width: 100%;
+  .contentWidgets {
+    visibility: hidden;
+  }
+  .monaco-label {
+    font-size: 12px;
+    border-radius: 2px;
+    padding: 2px 10px;
+    transform: scale(0.8);
+    visibility: hidden;
+  }
+  .label-visible {
+    visibility: visible !important;
+  }
+
+  .stack-list {
+    width: 100%;
+    height: 40px;
+    transform: translate(0, -1px);
+    overflow-x: auto;
+    flex-wrap: nowrap;
+    li {
+      /* width: 100px; */
+      height: 100%;
+      padding: 15px;
+      color: #fff;
+      font-size: 12px;
+      flex: 0 0 auto;
+    }
+
+    .active {
+      background: #1e1e1e;
+      box-shadow: 0px 1px 0px 0 #333;
+      /* border-left: 1px solid rgb(42 96 231);
+    border-right: 1px solid rgb(42 96 231); */
+      /* background: red; */
+    }
+  }
+`;
+const ContentLayout = newStyled.div`
+  flex: 1;
+  ${(props2) => props2.userList.map((u2) => "." + u2.role + "{background:" + u2.color + ";width: 2px !important;}")}
+  ${(props2) => props2.userList.map((u2) => "." + u2.role + "-selection{background:" + u2.color + "a6;color: #fff;width: 2px !important;}")}
+`;
 self.MonacoEnvironment = {
+  baseUrl: "https://develop.1024paas.com",
   getWorker(_2, label) {
     if (label === "json") {
       return new WorkerWrapper$3();
@@ -187678,51 +187731,6 @@ const useValue = create$3((set2) => ({
   }))
 }));
 let editor;
-const EditorLayout = newStyled.div`
-  width: 100%;
-  .contentWidgets {
-    visibility: hidden;
-  }
-  .monaco-label {
-    font-size: 12px;
-    border-radius: 2px;
-    padding: 2px 10px;
-    transform: scale(0.8);
-    visibility: hidden;
-  }
-  .label-visible {
-    visibility: visible !important;
-  }
-
-  .stack-list {
-    width: 100%;
-    height: 40px;
-    transform: translate(0, -1px);
-    overflow-x: auto;
-    flex-wrap: nowrap;
-    li {
-      /* width: 100px; */
-      height: 100%;
-      padding: 15px;
-      color: #fff;
-      font-size: 12px;
-      flex: 0 0 auto;
-    }
-
-    .active {
-      background: #1e1e1e;
-      box-shadow: 0px 1px 0px 0 #333;
-      /* border-left: 1px solid rgb(42 96 231);
-      border-right: 1px solid rgb(42 96 231); */
-      /* background: red; */
-    }
-  }
-`;
-const ContentLayout = newStyled.div`
-  flex: 1;
-  ${(props2) => props2.userList.map((u2) => "." + u2.role + "{background:" + u2.color + ";width: 2px !important;}")}
-  ${(props2) => props2.userList.map((u2) => "." + u2.role + "-selection{background:" + u2.color + "a6;color: #fff;width: 2px !important;}")}
-`;
 const Editor = ({
   doc: doc2,
   containerStyle,
@@ -187739,7 +187747,7 @@ const Editor = ({
   const setValue2 = useValue((state) => state.setValue);
   useValue((state) => state.setDelta);
   const [FileTreeStack, setFileTreeStack] = react.exports.useState([]);
-  const throttled = lodash$2.exports.throttle((callback) => {
+  const debounced = lodash$2.exports.debounce((callback) => {
     callback();
   }, 300);
   const receiveOperation = (revision, operation, _path) => {
@@ -187787,12 +187795,16 @@ const Editor = ({
           preOffset = change.rangeOffset + change.rangeLength;
         });
         client2.applyClient(operation);
-        setLocalFile((doc22 == null ? void 0 : doc22.path) ? doc22 == null ? void 0 : doc22.path : "singleFile", editor.getValue());
+        setLocalFile((doc22 == null ? void 0 : doc22.path) ? doc22 == null ? void 0 : doc22.path : "singleFile", {
+          value: editor.getValue(),
+          revision: client2.revision + 1
+        });
       } else {
         setValue2(changes[0].text);
       }
     });
     editor.onDidScrollChange((evt) => {
+      var _a2, _b2;
       if (!evt.scrollLeftChanged && !evt.scrollTopChanged)
         return;
       const {
@@ -187809,10 +187821,7 @@ const Editor = ({
           leftPercent
         }
       };
-      throttled(() => {
-        var _a2, _b2;
-        (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("extraSync", JSON.stringify(crdt));
-      });
+      (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("extraSync", JSON.stringify(crdt));
     });
     editor.createContextKey("save", true);
     editor.addCommand(KeyMod.CtrlCmd | KeyCode.KeyS, () => {
@@ -187829,7 +187838,6 @@ const Editor = ({
       });
     }, "save");
     client2.sendOperation = function(revision, operation) {
-      var _a2, _b2;
       if (oTStore.getState().appStatus === "replay")
         return;
       const {
@@ -187851,7 +187859,10 @@ const Editor = ({
           path: doc22 == null ? void 0 : doc22.path
         }
       };
-      (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("editFile", JSON.stringify(crdt));
+      debounced(() => {
+        var _a2, _b2;
+        (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("editFile", JSON.stringify(crdt));
+      });
     };
   };
   const updateLspOps = ({
@@ -187879,7 +187890,10 @@ const Editor = ({
         revision: client2.revision,
         value: file.value
       });
-      oTStore.getState().appStatus !== "replay" && setLocalFile(doc22 == null ? void 0 : doc22.path, file.value);
+      oTStore.getState().appStatus !== "replay" && setLocalFile(doc22 == null ? void 0 : doc22.path, {
+        value: file.value,
+        revision: client2.revision
+      });
     }
   };
   const lspServerInject = (_lan, useLsp) => {
@@ -187888,6 +187902,11 @@ const Editor = ({
       extensions: [".rb"],
       aliases: ["ruby", "RUBY"]
     });
+    languages.register({
+      id: "python",
+      extensions: [".py"],
+      aliases: ["python", "PYTHON"]
+    });
     languages.register({
       id: "java",
       extensions: [".java"],
@@ -187921,7 +187940,7 @@ const Editor = ({
         const languageClient = new lib.MonacoLanguageClient({
           name: "Language Client",
           clientOptions: {
-            documentSelector: ["java", "ruby"],
+            documentSelector: ["java", "ruby", "python"],
             errorHandler: {
               error: () => lib.ErrorAction.Continue,
               closed: () => lib.CloseAction.DoNotRestart
@@ -187998,8 +188017,11 @@ const Editor = ({
         }
         return result;
       };
+      window.ot = __spreadProps(__spreadValues({}, ot), {
+        oTStore,
+        editor
+      });
     }
-    window.ot = ot;
   };
   react.exports.useEffect(() => {
     editorInit();
@@ -195679,7 +195701,7 @@ const TerminalComponent = (_i) => {
       if (postUser && !IsMe(CRDTInfo.userInfo)) {
         const helperContainer = (_c2 = terminal == null ? void 0 : terminal._core) == null ? void 0 : _c2._helperContainer;
         const childNode = helperContainer == null ? void 0 : helperContainer.firstChild;
-        userLabel.innerText = postUser.name;
+        userLabel.innerText = postUser.username;
         userLabel.style.backgroundColor = postUser.color;
         userLabel.style.top = childNode.style.top;
         userLabel.style.left = childNode.style.left;