@abtnode/ux 1.16.14-beta-0c29907f → 1.16.14-beta-d802cd3c

package/lib/blocklet/log.js

@@ -6,7 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = BlockletLog;
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
-var _util = require("@blocklet/meta/lib/util");
+var _FormControl = _interopRequireDefault(require("@mui/material/FormControl"));
+var _Select = _interopRequireDefault(require("@mui/material/Select"));
+var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
+var _useLocalStorage = _interopRequireDefault(require("react-use/lib/useLocalStorage"));
 var _logTerminal = require("../logs/log-terminal");
 var _download = _interopRequireDefault(require("../logs/download"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -39,6 +42,43 @@ function BlockletLog(_ref) {
     } = _ref,
     rest = _objectWithoutProperties(_ref, _excluded);
   const initialData = ['Tip: this tab will only show runtime logs. Please go to "Blocklet Server" to view other lifecycle logs of the blocklet (install/start/stop...)', '\r\n\r\n'];
+  const logs = ((blocklet === null || blocklet === void 0 ? void 0 : blocklet.children) || []).map(x => ({
+    did: x.meta.did,
+    name: x.meta.title,
+    types: ['error', 'info', 'access', 'stdout', 'stderr']
+  }));
+
+  // format: `{componentId},{defaultTypeIndex}`
+  const [config, setConfig] = (0, _useLocalStorage.default)("blocklet-log-".concat(blocklet.meta.did), '');
+
+  // eslint-disable-next-line prefer-const
+  let [componentId, defaultTypeIndex] = config.split(',');
+  if (!logs.find(x => x.did === componentId)) {
+    var _logs$;
+    componentId = (_logs$ = logs[0]) === null || _logs$ === void 0 ? void 0 : _logs$.did;
+  }
+  const onSelectChange = e => {
+    setConfig([e.target.value, defaultTypeIndex].join(','));
+  };
+  const componentSelect = /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormControl.default, {
+    sx: {
+      minWidth: 240
+    },
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Select.default, {
+      value: componentId,
+      onChange: onSelectChange,
+      size: "small",
+      children: logs.map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(_MenuItem.default, {
+        value: x.did,
+        children: x.name
+      }, x.did))
+    })
+  });
+  const log = logs.find(item => item.did === componentId) || logs[0] || blocklet.meta;
+  const onTypeChange = type => {
+    const index = log.types.indexOf(type);
+    setConfig([componentId, index || 0].join(','));
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, _objectSpread(_objectSpread({
     height: {
       xs: 'calc(100vh - 444px)',
@@ -47,14 +87,18 @@ function BlockletLog(_ref) {
     }
   }, rest), {}, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_logTerminal.LogTerminalGroup, {
-      name: (0, _util.getDisplayName)(blocklet),
-      logId: "blocklet-".concat(blocklet.meta.did),
+      logId: log === blocklet.meta ? "blocklet-".concat(blocklet.meta.did) : "blocklet-".concat(blocklet.meta.did, "/").concat(log.did),
       initialData: initialData,
+      prepend: componentSelect,
       postpend: /*#__PURE__*/(0, _jsxRuntime.jsx)(_download.default, {
         id: blocklet.meta.did,
         name: blocklet.meta.name
-      })
-    })
+      }),
+      name: log.name,
+      types: log.types,
+      defaultTypeIndex: defaultTypeIndex,
+      onTypeChange: onTypeChange
+    }, log.did)
   }));
 }
 BlockletLog.propTypes = {

package/lib/logs/log-terminal.js

@@ -16,7 +16,7 @@ var _clock = _interopRequireDefault(require("./clock"));
 var _node = require("../contexts/node");
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject, _templateObject2;
-const _excluded = ["name", "logId", "types", "initialData", "prepend", "postpend"],
+const _excluded = ["name", "logId", "types", "defaultTypeIndex", "initialData", "prepend", "postpend", "onTypeChange"],
   _excluded2 = ["logFile"];
 /**
  * 按 level/destination 分类的一组 terminal
@@ -35,9 +35,11 @@ function LogTerminalGroup(_ref) {
       name,
       logId,
       types,
+      defaultTypeIndex,
       initialData,
       prepend,
-      postpend
+      postpend,
+      onTypeChange
     } = _ref,
     rest = _objectWithoutProperties(_ref, _excluded);
   const {
@@ -53,7 +55,7 @@ function LogTerminalGroup(_ref) {
     stderr: 'stderr'
   };
   const isMobile = (0, _useMediaQuery.default)(theme => theme.breakpoints.down('md'));
-  const [currentType, setCurrentType] = (0, _react.useState)(types[0]);
+  const [currentType, setCurrentType] = (0, _react.useState)(types[defaultTypeIndex || 0]);
   const [logFiles, setLogFiles] = (0, _react.useState)();
   const terminalRefs = (0, _react.useRef)({});
 
@@ -94,7 +96,10 @@ function LogTerminalGroup(_ref) {
               variant: 'contained'
             } : {};
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, _objectSpread(_objectSpread({}, props), {}, {
-              onClick: () => setCurrentType(type),
+              onClick: () => {
+                setCurrentType(type);
+                onTypeChange(type);
+              },
               children: logTypeLabels[type]
             }), type);
           })
@@ -126,16 +131,20 @@ LogTerminalGroup.propTypes = {
   logId: _propTypes.default.string.isRequired,
   // 日志类型, info/error 或 stdin/stdout/access
   types: _propTypes.default.arrayOf(_propTypes.default.string),
+  defaultTypeIndex: _propTypes.default.number,
   // 写入 terminal 的初始数据
   initialData: _propTypes.default.arrayOf(_propTypes.default.string),
   prepend: _propTypes.default.node,
-  postpend: _propTypes.default.node
+  postpend: _propTypes.default.node,
+  onTypeChange: _propTypes.default.func
 };
 LogTerminalGroup.defaultProps = {
   types: ['error', 'info', 'access', 'stdout', 'stderr'],
+  defaultTypeIndex: 0,
   initialData: [],
   prepend: null,
-  postpend: null
+  postpend: null,
+  onTypeChange: () => {}
 };
 const LogTerminalGroupRoot = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n  height: 100%;\n  .log-terminal-group-head {\n    display: flex;\n    align-items: center;\n    justify-content: space-between;\n    padding-bottom: 16px;\n  }\n\n  .log-terminal-group-head-start {\n    flex: 0 0 auto;\n    display: flex;\n    align-items: center;\n    gap: 16px;\n    ", " {\n      flex-direction: column;\n      align-items: start;\n    }\n  }\n\n  .log-terminal-group-head-end {\n    flex: 0 0 auto;\n    display: flex;\n    align-items: center;\n    gap: 16px;\n    ", " {\n      flex-direction: column;\n      align-items: start;\n    }\n  }\n  .log-terminal-group-terminals {\n    flex: 1;\n    position: relative;\n    overflow: hidden;\n    > * {\n      position: absolute;\n      top: 0;\n      bottom: 0;\n      left: 0;\n      right: 0;\n    }\n  }\n"])), props => props.theme.breakpoints.down('md'), props => props.theme.breakpoints.down('md'));
 const LogTerminal = /*#__PURE__*/(0, _react.forwardRef)((_ref3, ref) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.14-beta-0c29907f",
+  "version": "1.16.14-beta-d802cd3c",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -23,9 +23,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.14-beta-0c29907f",
-    "@abtnode/constant": "1.16.14-beta-0c29907f",
-    "@abtnode/util": "1.16.14-beta-0c29907f",
+    "@abtnode/auth": "1.16.14-beta-d802cd3c",
+    "@abtnode/constant": "1.16.14-beta-d802cd3c",
+    "@abtnode/util": "1.16.14-beta-d802cd3c",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.87",
     "@arcblock/did-connect": "^2.5.60",
@@ -35,10 +35,10 @@
     "@arcblock/react-hooks": "^2.5.60",
     "@arcblock/terminal": "^2.5.60",
     "@arcblock/ux": "^2.5.60",
-    "@blocklet/constant": "1.16.14-beta-0c29907f",
+    "@blocklet/constant": "1.16.14-beta-d802cd3c",
     "@blocklet/launcher-layout": "2.1.46",
     "@blocklet/list": "^0.12.8",
-    "@blocklet/meta": "1.16.14-beta-0c29907f",
+    "@blocklet/meta": "1.16.14-beta-d802cd3c",
     "@blocklet/ui-react": "^2.5.60",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -97,5 +97,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "1f02851a71861dbf09bfedfa9df6d9fc6d2355a3"
+  "gitHead": "f8e2dcefd8d6876e5dedee833ac976b4a0496b20"
 }