@dao42/d42paas-front 0.9.10 → 0.9.13

package/dist/DaoPaaS.es.js

@@ -9263,7 +9263,7 @@ const currentDocStore = createStore("currentDoc")({
   }
 }).extendSelectors((state, get2, _api) => ({})).extendActions((set, get2, _api) => ({
   switchDoc: (doc2) => {
-    set.doc(doc2);
+    set.doc(__spreadValues(__spreadValues({}, get2.doc()), doc2));
   },
   setReadOnly: (readonly) => {
     set.doc(__spreadProps(__spreadValues({}, get2.doc()), {
@@ -11421,7 +11421,7 @@ const Loading$1 = () => {
   });
 };
 const name$2 = "@dao42/d42paas-front";
-const version = "0.9.10";
+const version = "0.9.13";
 const description = "d42paas front";
 const author = "dao42 paas team";
 const homepage = "https://github.com/dao42/d42paas_frontend#readme";
@@ -14012,8 +14012,6 @@ class DaoChannel {
       const updateAgentUser = actions.dao.updateAgentUser;
       const file = data.file;
       this.updateCRDTInfo(data);
-      const openedFile = getFileTreeItemByFilePath(file.path);
-      actions.currentDoc.setReadOnly(!!(openedFile == null ? void 0 : openedFile.lock));
       if (data.agentUserId === agentUserId || currentAgentUser.followingAgentUserId === data.agentUserId) {
         switchDoc(file);
       }
@@ -33222,6 +33220,7 @@ const TreeRootLayout = newStyled.div`
     padding: 6px 0;
     height: 100%;
     color: #e9f3f0;
+    display: flex;
   }
   .expand-panel {
     display: none;
@@ -53757,11 +53756,13 @@ const Popover = ({
 };
 const FileTreeActions = (props) => {
   const {
-    useLockFeature,
-    useUnitTestFeature,
+    lockFeature,
+    lockEditFeature,
+    hideFeature,
+    hideEditFeature,
+    unittestFeature,
+    unittestEditFeature,
     treeNode,
-    useEnableHideFeature,
-    useHideFeature,
     children
   } = props;
   const channel = useStore().dao.channel();
@@ -53771,24 +53772,30 @@ const FileTreeActions = (props) => {
   };
   const handleToggleLockStatusEvent = (e2) => {
     stopPropagation(e2);
+    if (lockEditFeature && lockFeature === "preview" || !lockEditFeature) {
+      return;
+    }
     channel == null ? void 0 : channel.setFileLockStatus({
       path: treeNode.index,
       lock: !treeNode.lock
     });
   };
-  const LockCmp = useLockFeature ? treeNode.lock ? /* @__PURE__ */ jsx(Icon, {
+  const LockCmp = lockFeature === "on" || lockFeature === "preview" ? treeNode.lock ? /* @__PURE__ */ jsx(Icon, {
     as: LockIcon
   }) : /* @__PURE__ */ jsx(Icon, {
     as: UnlockIcon
   }) : null;
   const handleToggleVisibleEvent = (e2) => {
     stopPropagation(e2);
+    if (hideEditFeature && hideFeature === "preview" || !hideEditFeature) {
+      return;
+    }
     channel == null ? void 0 : channel.setFileVisiable({
       path: treeNode.index,
       hide: !treeNode.hide
     });
   };
-  const Visible2 = useEnableHideFeature && useHideFeature ? treeNode.hide ? /* @__PURE__ */ jsx(UnvisibleIcon, {}) : /* @__PURE__ */ jsx(VisibleIcon, {}) : null;
+  const Visible2 = hideFeature === "on" || hideFeature === "preview" ? treeNode.hide ? /* @__PURE__ */ jsx(UnvisibleIcon, {}) : /* @__PURE__ */ jsx(VisibleIcon, {}) : null;
   const handleAddFileToUnitTestEvent = () => {
     channel == null ? void 0 : channel.addFileToUnitTest(treeNode.index);
   };
@@ -53797,11 +53804,14 @@ const FileTreeActions = (props) => {
   };
   const handleUnitTestEvent = (e2) => {
     stopPropagation(e2);
+    if (unittestEditFeature && unittestFeature === "preview" || !unittestEditFeature) {
+      return;
+    }
     if (!treeNode.unittest)
       return handleAddFileToUnitTestEvent();
     handleRemoveFileFromUnitTestEvent();
   };
-  const TestIcon = useUnitTestFeature ? treeNode.unittest ? /* @__PURE__ */ jsx(CollaspedOutlineIcon, {}) : /* @__PURE__ */ jsx(ExpandOutlineIcon, {}) : null;
+  const TestIcon = unittestFeature === "on" || unittestFeature === "preview" ? treeNode.unittest ? /* @__PURE__ */ jsx(CollaspedOutlineIcon, {}) : /* @__PURE__ */ jsx(ExpandOutlineIcon, {}) : null;
   const getClassNames = (show) => {
     return classNames("action-item", {
       show
@@ -53813,21 +53823,21 @@ const FileTreeActions = (props) => {
       className: getClassNames(!!treeNode.hide),
       onClick: handleToggleVisibleEvent,
       children: /* @__PURE__ */ jsx(Popover, {
-        tip: treeNode.hide ? "\u5DF2\u9690\u85CF\uFF0C\u70B9\u51FB\u663E\u793A" : "\u70B9\u51FB\u9690\u85CF",
+        tip: treeNode.hide ? `\u5DF2\u9690\u85CF\uFF0C${hideEditFeature ? "\u70B9\u51FB\u663E\u793A" : "\u65E0\u6743\u64CD\u4F5C"}` : hideEditFeature ? "\u70B9\u51FB\u9690\u85CF" : "\u65E0\u6743\u64CD\u4F5C",
         children: Visible2
       })
     }), LockCmp && /* @__PURE__ */ jsx("div", {
       className: getClassNames(!!treeNode.lock),
       onClick: handleToggleLockStatusEvent,
       children: /* @__PURE__ */ jsx(Popover, {
-        tip: treeNode.lock ? "\u5DF2\u52A0\u9501\uFF0C\u70B9\u51FB\u53D6\u6D88" : "\u70B9\u51FB\u9501\u5B9A",
+        tip: treeNode.lock ? `\u5DF2\u52A0\u9501\uFF0C${lockEditFeature ? "\u70B9\u51FB\u53D6\u6D88" : "\u65E0\u6743\u64CD\u4F5C"}` : lockEditFeature ? "\u70B9\u51FB\u9501\u5B9A" : "\u65E0\u6743\u64CD\u4F5C",
         children: LockCmp
       })
     }), TestIcon && /* @__PURE__ */ jsx("div", {
       className: getClassNames(!!treeNode.unittest),
       onClick: handleUnitTestEvent,
       children: /* @__PURE__ */ jsx(Popover, {
-        tip: treeNode.unittest ? "\u5DF2\u52A0\u5165\u6D4B\u8BD5\uFF0C\u70B9\u51FB\u79FB\u9664" : "\u6DFB\u52A0\u6D4B\u8BD5",
+        tip: treeNode.unittest ? `\u5DF2\u52A0\u5165\u6D4B\u8BD5\uFF0C${unittestEditFeature ? "\u70B9\u51FB\u79FB\u9664" : "\u65E0\u6743\u64CD\u4F5C"}` : unittestEditFeature ? "\u6DFB\u52A0\u6D4B\u8BD5" : "\u65E0\u6743\u64CD\u4F5C",
         children: TestIcon
       })
     }), React.Children.map(children, (child) => child)]
@@ -53844,10 +53854,12 @@ const FileTree = ({
   bgColor = "#1E1F1E",
   fontColor = "#fff",
   treeItemHeight,
-  useLockFeature,
-  useUnitTestFeature,
-  useEnableHideFeature,
-  useHideFeature
+  hideFeature,
+  hideEditFeature,
+  lockFeature,
+  lockEditFeature,
+  unittestFeature,
+  unittestEditFeature
 }) => {
   const [focusedItem, setFocusedItem] = react.exports.useState();
   const {
@@ -53964,6 +53976,8 @@ const FileTree = ({
             Editor: true
           });
           (_a2 = store.dao.channel()) == null ? void 0 : _a2.send("fileContent", crdt);
+          const openedFile = getFileTreeItemByFilePath(items[0]);
+          actions.currentDoc.setReadOnly(!!(openedFile == null ? void 0 : openedFile.lock) && !lockEditFeature);
         } else {
           (_b = store.dao.channel()) == null ? void 0 : _b.send("fileDir", crdt);
         }
@@ -54517,7 +54531,7 @@ const FileTree = ({
   return /* @__PURE__ */ jsxs(FollowLayout, {
     name: "file",
     componentType: "Tree",
-    children: [/* @__PURE__ */ jsx(Skeleton, {
+    children: [moduleLoading.Tree && /* @__PURE__ */ jsx(Skeleton, {
       type: "Tree",
       loading: moduleLoading.Tree
     }), /* @__PURE__ */ jsxs(TreeRootLayout, {
@@ -54643,7 +54657,7 @@ const FileTree = ({
           })) : null;
           const parentPath = getParentPathByPath(path);
           const inputError = treeData[`${parentPath}${parentPath ? "/" : ""}${fileOrFolderName}`];
-          if (item.hide && useEnableHideFeature && useHideFeature)
+          if (item.hide && hideFeature !== "off" && !hideEditFeature)
             return null;
           return /* @__PURE__ */ react.exports.createElement("li", __spreadProps(__spreadValues(__spreadValues({}, context.itemContainerWithChildrenProps), context.itemContainerWithoutChildrenProps), {
             key: item.index,
@@ -54684,7 +54698,7 @@ const FileTree = ({
               onKeyDown: onInputKeyDown
             }) : /* @__PURE__ */ jsx(Fragment, {
               children: /* @__PURE__ */ jsxs("div", __spreadProps(__spreadValues(__spreadValues({}, context.itemContainerWithoutChildrenProps), context.interactiveElementProps), {
-                className: classNames(btnPrefixCls, "font-sans", "subpixel-antialiased", {
+                className: classNames(btnPrefixCls, {
                   [`${btnPrefixCls}-selected`]: context.isSelected,
                   [`${btnPrefixCls}-expanded`]: context.isExpanded,
                   [`${btnPrefixCls}-focused`]: context.isFocused,
@@ -54720,10 +54734,12 @@ const FileTree = ({
                     className: "actions-container",
                     children: /* @__PURE__ */ jsx(FileTreeActions, {
                       treeNode: item,
-                      useUnitTestFeature,
-                      useLockFeature,
-                      useHideFeature,
-                      useEnableHideFeature
+                      hideFeature,
+                      hideEditFeature,
+                      lockFeature,
+                      lockEditFeature,
+                      unittestFeature,
+                      unittestEditFeature
                     })
                   }), !fileLoading[item.index] && renameItem !== path && /* @__PURE__ */ jsx(Whisper$1, {
                     placement: "bottomEnd",
@@ -74505,7 +74521,8 @@ const Editor = () => {
       extensions: [basicSetup, javascript({
         jsx: true,
         typescript: true
-      }), collabExtension]
+      }), collabExtension],
+      readOnly: currentDoc.readonly
     })]
   });
 };