@abtnode/ux 1.8.56 → 1.8.58

package/lib/blocklet/component/navigation/navigation-actions.js

@@ -8,6 +8,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = require("@iconify/react");
 var _material = require("@mui/material");
 var _react2 = require("react");
+var _context = require("@arcblock/ux/lib/Locale/context");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function NavigationActions(_ref) {
@@ -20,6 +21,9 @@ function NavigationActions(_ref) {
     data,
     section
   } = _ref;
+  const {
+    t
+  } = (0, _context.useLocaleContext)();
   const isDisabled = ['yaml', 'tmpl'].includes(data.from);
   const isUninstalled = /*#__PURE__*/(0, _react2.isValidElement)(data.subtitle);
   function handleClick(e) {
@@ -44,40 +48,53 @@ function NavigationActions(_ref) {
   }, [del, data]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: className,
-    children: [!data.parent && ['header', 'footer', 'dashboard'].includes(section) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
-      size: "small",
-      color: "success",
-      onClick: handleClickAdd,
-      disabled: isUninstalled,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
-        icon: "mdi:plus-box-outline"
+    children: [!data.parent && ['header', 'footer', 'dashboard'].includes(section) && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      title: isUninstalled ? t('navigation.action.noAddSub') : t('navigation.action.addSub'),
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
+        size: "small",
+        color: "success",
+        onClick: handleClickAdd,
+        disabled: isUninstalled,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+          icon: "mdi:plus-box-outline"
+        })
       })
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
-      size: "small",
-      color: "primary",
-      onClick: handleClickEdit,
-      disabled: isUninstalled,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
-        icon: "mdi:pencil"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      title: isUninstalled ? t('navigation.action.noEdit') : t('navigation.action.edit'),
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
+        size: "small",
+        color: "primary",
+        onClick: handleClickEdit,
+        disabled: isUninstalled,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+          icon: "mdi:pencil"
+        })
       })
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
-      size: "small",
-      color: "warning",
-      onClick: handleClickToggle,
-      disabled: isUninstalled,
-      children: data.visible === false ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
-        icon: "mdi:eye-off-outline"
-      }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
-        icon: "mdi:eye-outline"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      title:
+      // eslint-disable-next-line no-nested-ternary
+      isUninstalled ? t('navigation.action.noEdit') : data.visible ? t('navigation.action.hide') : t('navigation.action.show'),
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
+        size: "small",
+        color: "warning",
+        onClick: handleClickToggle,
+        disabled: isUninstalled,
+        children: data.visible === false ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+          icon: "mdi:eye-off-outline"
+        }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+          icon: "mdi:eye-outline"
+        })
       })
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
-      disabled: isDisabled,
-      size: "small",
-      color: "error",
-      onClick: handleClickDelete,
-      title: isDisabled ? 'Not allowed delete built-in navigation' : 'Delete navigation',
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
-        icon: "mdi:delete"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      title: isDisabled && !isUninstalled ? t('navigation.action.noDel') : t('navigation.action.del'),
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.IconButton, {
+        disabled: isDisabled && !isUninstalled,
+        size: "small",
+        color: "error",
+        onClick: handleClickDelete,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+          icon: "mdi:delete"
+        })
       })
     })]
   });

package/lib/blocklet/component/sortable-tree.js

@@ -6,13 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _reactSortableTree = _interopRequireDefault(require("react-sortable-tree"));
+var _reactSortableTree = require("react-sortable-tree");
 var _reactSortableTreeThemeMaterialUi = _interopRequireDefault(require("react-sortable-tree-theme-material-ui"));
 var _react2 = require("@iconify/react");
 var _isObject = _interopRequireDefault(require("lodash/isObject"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _material = require("@mui/material");
+var _reactDndHtml5Backend = require("react-dnd-html5-backend");
+var _reactDnd = require("react-dnd");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -90,28 +92,38 @@ function SortableTree(_ref3) {
   const expandedData = treeData.map(item => _objectSpread(_objectSpread({}, item), {}, {
     expanded: true
   }));
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSortableTree.default, {
-    generateNodeProps: rowInfo => {
-      return {
-        buttons: renderActions({
-          data: rowInfo.node,
-          className: 'list-item-actions'
-        }),
-        icons: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.Icon, {
-          icon: "ic:round-drag-indicator"
-        }),
-        title: /*#__PURE__*/(0, _jsxRuntime.jsx)(TreeTitle, {
-          treeNode: rowInfo.node
-        })
-      };
-    },
-    maxDepth: 2,
-    isVirtualized: false,
-    treeData: expandedData,
-    onChange: setTreeData,
-    canDrop: checkCanDrop,
-    theme: _reactSortableTreeThemeMaterialUi.default
-  });
+
+  // HACK: 兼容 mui-datatables 中的 react-dnd 使用
+  const dndProps = {};
+  if (typeof window !== 'undefined') {
+    dndProps.context = window;
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactDnd.DndProvider, _objectSpread(_objectSpread({
+    backend: _reactDndHtml5Backend.HTML5Backend
+  }, dndProps), {}, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSortableTree.SortableTreeWithoutDndContext, {
+      generateNodeProps: rowInfo => {
+        return {
+          buttons: renderActions({
+            data: rowInfo.node,
+            className: 'list-item-actions'
+          }),
+          icons: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.Icon, {
+            icon: "ic:round-drag-indicator"
+          }),
+          title: /*#__PURE__*/(0, _jsxRuntime.jsx)(TreeTitle, {
+            treeNode: rowInfo.node
+          })
+        };
+      },
+      maxDepth: 2,
+      isVirtualized: false,
+      treeData: expandedData,
+      onChange: setTreeData,
+      canDrop: checkCanDrop,
+      theme: _reactSortableTreeThemeMaterialUi.default
+    })
+  }));
 }
 SortableTree.propTypes = {
   treeData: _propTypes.default.object.isRequired,

package/lib/blocklet/config-navigation.js

@@ -48,7 +48,6 @@ function ConfigNavigation() {
   const {
     t
   } = (0, _context.useLocaleContext)();
-  const [showTree, setShowTree] = (0, _react.useState)(false);
   const {
     blocklet
   } = (0, _blocklet.useBlockletContext)();
@@ -65,12 +64,6 @@ function ConfigNavigation() {
     showResetConfirm: false,
     mockRole: 'owner'
   });
-  (0, _react.useEffect)(() => {
-    setShowTree(true);
-    return () => {
-      setShowTree(false);
-    };
-  }, []);
   const {
     state: navigationState,
     navigation,
@@ -247,7 +240,7 @@ function ConfigNavigation() {
           flex: 1,
           overflow: 'auto'
         },
-        children: showTree && /*#__PURE__*/(0, _jsxRuntime.jsx)(_sortableTree.default, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_sortableTree.default, {
           treeData: getNavigation(navigationState.activeSection),
           setTreeData: updateNavigationTree,
           renderActions: _ref => {

package/lib/blocklet/disk-info.js

@@ -57,15 +57,19 @@ function BlockletDiskInfo(_ref) {
     return acc;
   }, {});
   const rows = [{
+    key: 'appDir',
     name: t('blocklet.diskInfo.appDir'),
     value: renderDiskInfo(env.BLOCKLET_APP_DIR, blocklet.diskInfo.app)
   }, {
+    key: 'dataDir',
     name: t('blocklet.diskInfo.dataDir'),
     value: renderDiskInfo(env.BLOCKLET_DATA_DIR, blocklet.diskInfo.data)
   }, {
+    key: 'logDir',
     name: t('blocklet.diskInfo.logDir'),
     value: renderDiskInfo(env.BLOCKLET_LOG_DIR, blocklet.diskInfo.log)
   }, {
+    key: 'cacheDir',
     name: t('blocklet.diskInfo.cacheDir'),
     value: renderDiskInfo(env.BLOCKLET_CACHE_DIR, blocklet.diskInfo.cache)
   }];
@@ -77,7 +81,7 @@ function BlockletDiskInfo(_ref) {
       nameWidth: 120,
       name: row.name,
       children: row.value
-    }, row.name))
+    }, row.key))
   }));
 }
 BlockletDiskInfo.propTypes = {

package/lib/locales/en.js

@@ -601,15 +601,30 @@ module.exports = {
         dialog: 'Click on "confirm" to install the update. Blocklet Server will enter maintenance mode until the update is completed and return to production mode automatically.',
         confirm: 'Upgrade',
         switchLabel: 'Auto Update Check',
-        setup: 'Preparing the update',
+        setup: 'Preparing the upgrade',
         installing: 'Installing Blocklet Server v{version}',
         restarting: 'Restarting Blocklet Server',
         cleanup: 'Migrating Blocklet Server data',
+        verifying: 'Verifying Blocklet Server v{version}',
+        rollback: 'Rollback Blocklet Server',
         complete: 'Upgrade complete!',
         progress: 'Upgrading Blocklet Server to v{version}',
         check: 'Check for Updates',
         latest: 'You are running the latest version.'
       },
+      restart: {
+        title: 'Restart Blocklet Server',
+        description: 'During the restarting, your Blocklet Server will enter maintenance mode while the restart is completed.',
+        dialog: 'Click on "confirm" to restart. Blocklet Server will enter maintenance mode until the restart is completed and return to production mode automatically.',
+        confirm: 'Restart',
+        setup: 'Preparing the restart',
+        verifying: 'Verifying Blocklet Server',
+        restarting: 'Restarting Blocklet Server',
+        cleanup: 'Ensure everything is OK',
+        rollback: 'Cleanup the dirty state',
+        complete: 'Maintain complete!',
+        progress: 'Restarting Blocklet Server'
+      },
       register: {
         titleAdded: 'Added to Blocklet Launcher',
         title: 'Add to Blocklet Launcher',
@@ -1138,6 +1153,17 @@ module.exports = {
       locale: 'Locale',
       localePlaceholder: 'Please input locale need to add',
       localeExists: '{value} is already exists'
+    },
+    action: {
+      add: 'Add navigation',
+      addSub: 'Add sub navigation',
+      edit: 'Edit navigation',
+      hide: 'Hide navigation',
+      show: 'Show navigation',
+      del: 'Delete navigation',
+      noAddSub: "Uninstalled component can't add sub navigation",
+      noEdit: "Uninstalled component can't edit",
+      noDel: 'Not allowed delete built-in navigation'
     }
   }
 };

package/lib/locales/zh.js

@@ -606,11 +606,26 @@ module.exports = {
         installing: '安装节点新版本（v{version}）',
         restarting: '重新启动节点',
         cleanup: '迁移节点数据',
+        verifying: '验证节点新版本 v{version}',
+        rollback: '回滚此次升级',
         complete: '升级完成!',
         progress: '正在升级节点到 v{version}',
         check: '检查更新',
         latest: '太棒了，你的节点已经是最新版！'
       },
+      restart: {
+        title: '重新启动节点',
+        description: '在重启期间，节点将会进入维护模式几十秒钟。',
+        dialog: '点击 “确认” 开启重启。节点将进入维护模式，直到更新完成并自动返回生产模式。',
+        confirm: '重启',
+        setup: '准备重启中',
+        verifying: '验证节点版本',
+        restarting: '重启节点中',
+        cleanup: '验证重启成功',
+        rollback: '撤销重启操作',
+        complete: '维护完成',
+        progress: '正在重启节点'
+      },
       welcome: {
         switchLabel: 'Welcome 页面'
       },
@@ -1143,6 +1158,17 @@ module.exports = {
       locale: '语言',
       localePlaceholder: '请输入要添加的多语言标识符',
       localeExists: '{value} 已经存在'
+    },
+    action: {
+      add: '增加导航',
+      addSub: '增加子导航',
+      edit: '编辑导航',
+      hide: '隐藏导航',
+      show: '显示导航',
+      del: '删除导航',
+      noAddSub: '未安装组件无法添加子导航',
+      noEdit: '未安装组件的导航无法编辑',
+      noDel: '内置的导航无法删除'
     }
   }
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.56",
+  "version": "1.8.58",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,18 +21,18 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.56",
-    "@abtnode/constant": "1.8.56",
-    "@abtnode/util": "1.8.56",
+    "@abtnode/auth": "1.8.58",
+    "@abtnode/constant": "1.8.58",
+    "@abtnode/util": "1.8.58",
     "@arcblock/did-connect": "^2.4.64",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/icons": "^2.4.64",
     "@arcblock/terminal": "^2.4.64",
     "@arcblock/ux": "^2.4.64",
-    "@blocklet/constant": "1.8.56",
+    "@blocklet/constant": "1.8.58",
     "@blocklet/launcher-layout": "^1.9.30",
     "@blocklet/list": "^0.10.47",
-    "@blocklet/meta": "1.8.56",
+    "@blocklet/meta": "1.8.58",
     "@blocklet/ui-react": "^2.4.64",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -46,7 +46,7 @@
     "ahooks": "^3.7.1",
     "axios": "^0.27.2",
     "classnames": "^2.3.2",
-    "dayjs": "^1.11.5",
+    "dayjs": "^1.11.7",
     "file-saver": "^2.0.5",
     "filesize": "^6.4.0",
     "flat": "^5.0.2",
@@ -65,6 +65,8 @@
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-color": "^2.19.3",
+    "react-dnd": "11.1.3",
+    "react-dnd-html5-backend": "11.1.3",
     "react-error-boundary": "^3.1.4",
     "react-hook-form": "^7.39.3",
     "react-iframe": "^1.8.5",
@@ -84,5 +86,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "8c24c9d747e96e05510b9cbe863666960569fb46"
+  "gitHead": "697fbc1875ee02f6a0dd18e48a5a3f523209f208"
 }