@abtnode/ux 1.16.16-beta-d8a9fb09 → 1.16.16-beta-740ea329

package/es/analytics/cpu.js

@@ -20,7 +20,7 @@ export default function CpuMonitor({
     current: `${Math.floor(currentLoad || 0)}%`,
     data: history,
     description: `${t('system.cores')}: ${cpus?.length || 0}`,
-    dateFn: v => formatTime(v, 'HH:mm', locale),
+    dateFn: v => formatTime(v, 'HH:mm:ss', locale),
     valueFn: formatNumber
   });
 }

package/es/analytics/memory.js

@@ -52,7 +52,7 @@ export default function MemoryMonitor({
       },
       children: [x.title, ": ", x.metric]
     }, x.title)),
-    dateFn: v => formatTime(v, 'HH:mm', locale),
+    dateFn: v => formatTime(v, 'HH:mm:ss', locale),
     valueFn: filesize
   });
 }

package/es/blocklet/component/add.js

@@ -539,9 +539,9 @@ export default function AddComponent({
         }
         return 0;
       });
-      const sharedConfigObj = getSharedConfigObj({
+      const sharedConfigObj = getSharedConfigObj(ancestors[0], {
         configs: componentAllConfigs
-      }, ancestors);
+      });
       const configsValue = {};
       const configsList = componentAllConfigs.map(item => {
         const {

package/es/blocklet/component/environment.js

@@ -7,7 +7,7 @@ import MaterialTable from '@material-table/core';
 import TextField from '@mui/material/TextField';
 import Alert from '@mui/material/Alert';
 import { BLOCKLET_CONFIGURABLE_KEY, CHAIN_PROP_MAP } from '@blocklet/constant';
-import { getComponentMissingConfigs, getSharedConfigObj } from '@blocklet/meta/lib/util';
+import { getComponentMissingConfigs, getSharedConfigObj, isEnvShareable } from '@blocklet/meta/lib/util';
 import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
 import ClickToCopy from '../../click-to-copy';
@@ -23,7 +23,7 @@ const getDescription = (data, t) => {
   let {
     description
   } = data;
-  if (Object.values(CHAIN_PROP_MAP).includes(data.key)) {
+  if (Object.values(CHAIN_PROP_MAP).includes(data.key) || isEnvShareable(data)) {
     if (description) {
       description = `${description} (${t('blocklet.config.sharedToAllComponents')})`;
     } else {
@@ -37,6 +37,19 @@ const getDescription = (data, t) => {
     children: description
   });
 };
+const isCustom = (env, blocklet, ancestors = []) => {
+  if (!ancestors?.length &&
+  // is container
+  !env.custom &&
+  // is not manual
+  !['CHAIN_ID', 'CHAIN_HOST'].includes(env.key) && !blocklet.meta.environments.find(y => y.name === env.key) &&
+  // is not declared in blocklet.yml
+  blocklet.children.every(child => !child.meta.environments.find(y => y.name === env.key)) // is not declared in all children
+  ) {
+    return true;
+  }
+  return env.custom;
+};
 export default function ComponentEnvironment({
   blocklet,
   ancestors
@@ -50,7 +63,7 @@ export default function ComponentEnvironment({
   } = useContext(LocaleContext);
   const dids = [...ancestors.map(x => x.meta.did), blocklet.meta.did];
   const onConfigChanged = () => Toast.success(t('blocklet.config.changedTip'));
-  const isConfigEditable = x => x.custom;
+  const isConfigEditable = x => isCustom(x, blocklet, ancestors);
   if (isInstalling(blocklet.status)) {
     return null;
   }
@@ -96,7 +109,7 @@ export default function ComponentEnvironment({
     }
     const configs = [newData];
     if (newData.key !== oldData.key) {
-      if (!newData.custom) {
+      if (!isCustom(newData, blocklet, ancestors)) {
         Toast.error('Only key of custom env can be changed');
         return;
       }
@@ -124,7 +137,7 @@ export default function ComponentEnvironment({
       Toast.error(t('blocklet.config.environment.deleteForbidden'));
       return;
     }
-    if (!data.custom) {
+    if (!isCustom(data, blocklet, ancestors)) {
       Toast.error('Only key of custom env can be changed');
       return;
     }
@@ -144,8 +157,8 @@ export default function ComponentEnvironment({
 
   // configs
   const componentConfigs = (blocklet.configs || []).filter(x => !BLOCKLET_CONFIGURABLE_KEY[x.key]);
-  const sharedConfigObj = getSharedConfigObj(blocklet, ancestors);
-  const missingRequiredConfigs = getComponentMissingConfigs(blocklet, ancestors);
+  const sharedConfigObj = getSharedConfigObj(ancestors[0], blocklet);
+  const missingRequiredConfigs = getComponentMissingConfigs(blocklet, ancestors[0]);
   const configs = componentConfigs.map(x => ({
     ...x,
     value: Object.values(CHAIN_PROP_MAP).includes(x.key) && Object.keys(sharedConfigObj).includes(x.key) ? sharedConfigObj[x.key] : sharedConfigObj[x.key] || x.value

package/es/blocklet/component/index.js

@@ -364,7 +364,7 @@ function ComponentItem({
             color: "error",
             badgeContent: "",
             variant: "dot",
-            invisible: !getComponentMissingConfigs(blocklet, ancestors).length,
+            invisible: !getComponentMissingConfigs(blocklet, ancestors[0]).length,
             children: /*#__PURE__*/_jsx(IconButton, {
               onClick: open,
               size: "small",

package/lib/analytics/cpu.js

@@ -28,7 +28,7 @@ function CpuMonitor(_ref) {
     current: "".concat(Math.floor(currentLoad || 0), "%"),
     data: history,
     description: "".concat(t('system.cores'), ": ").concat((cpus === null || cpus === void 0 ? void 0 : cpus.length) || 0),
-    dateFn: v => (0, _util.formatTime)(v, 'HH:mm', locale),
+    dateFn: v => (0, _util.formatTime)(v, 'HH:mm:ss', locale),
     valueFn: formatNumber
   });
 }

package/lib/analytics/memory.js

@@ -60,7 +60,7 @@ function MemoryMonitor(_ref) {
       },
       children: [x.title, ": ", x.metric]
     }, x.title)),
-    dateFn: v => (0, _util.formatTime)(v, 'HH:mm', locale),
+    dateFn: v => (0, _util.formatTime)(v, 'HH:mm:ss', locale),
     valueFn: _filesize.default
   });
 }

package/lib/blocklet/component/add.js

@@ -550,9 +550,9 @@ function AddComponent(_ref2) {
         }
         return 0;
       });
-      const sharedConfigObj = (0, _util.getSharedConfigObj)({
+      const sharedConfigObj = (0, _util.getSharedConfigObj)(ancestors[0], {
         configs: componentAllConfigs
-      }, ancestors);
+      });
       const configsValue = {};
       const configsList = componentAllConfigs.map(item => {
         const {

package/lib/blocklet/component/environment.js

@@ -34,7 +34,7 @@ const getDescription = (data, t) => {
   let {
     description
   } = data;
-  if (Object.values(_constant.CHAIN_PROP_MAP).includes(data.key)) {
+  if (Object.values(_constant.CHAIN_PROP_MAP).includes(data.key) || (0, _util.isEnvShareable)(data)) {
     if (description) {
       description = "".concat(description, " (").concat(t('blocklet.config.sharedToAllComponents'), ")");
     } else {
@@ -48,6 +48,20 @@ const getDescription = (data, t) => {
     children: description
   });
 };
+const isCustom = function isCustom(env, blocklet) {
+  let ancestors = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  if (!(ancestors !== null && ancestors !== void 0 && ancestors.length) &&
+  // is container
+  !env.custom &&
+  // is not manual
+  !['CHAIN_ID', 'CHAIN_HOST'].includes(env.key) && !blocklet.meta.environments.find(y => y.name === env.key) &&
+  // is not declared in blocklet.yml
+  blocklet.children.every(child => !child.meta.environments.find(y => y.name === env.key)) // is not declared in all children
+  ) {
+    return true;
+  }
+  return env.custom;
+};
 function ComponentEnvironment(_ref) {
   let {
     blocklet,
@@ -62,7 +76,7 @@ function ComponentEnvironment(_ref) {
   } = (0, _react.useContext)(_context.LocaleContext);
   const dids = [...ancestors.map(x => x.meta.did), blocklet.meta.did];
   const onConfigChanged = () => _Toast.default.success(t('blocklet.config.changedTip'));
-  const isConfigEditable = x => x.custom;
+  const isConfigEditable = x => isCustom(x, blocklet, ancestors);
   if ((0, _util2.isInstalling)(blocklet.status)) {
     return null;
   }
@@ -108,7 +122,7 @@ function ComponentEnvironment(_ref) {
     }
     const configs = [newData];
     if (newData.key !== oldData.key) {
-      if (!newData.custom) {
+      if (!isCustom(newData, blocklet, ancestors)) {
         _Toast.default.error('Only key of custom env can be changed');
         return;
       }
@@ -136,7 +150,7 @@ function ComponentEnvironment(_ref) {
       _Toast.default.error(t('blocklet.config.environment.deleteForbidden'));
       return;
     }
-    if (!data.custom) {
+    if (!isCustom(data, blocklet, ancestors)) {
       _Toast.default.error('Only key of custom env can be changed');
       return;
     }
@@ -156,8 +170,8 @@ function ComponentEnvironment(_ref) {
 
   // configs
   const componentConfigs = (blocklet.configs || []).filter(x => !_constant.BLOCKLET_CONFIGURABLE_KEY[x.key]);
-  const sharedConfigObj = (0, _util.getSharedConfigObj)(blocklet, ancestors);
-  const missingRequiredConfigs = (0, _util.getComponentMissingConfigs)(blocklet, ancestors);
+  const sharedConfigObj = (0, _util.getSharedConfigObj)(ancestors[0], blocklet);
+  const missingRequiredConfigs = (0, _util.getComponentMissingConfigs)(blocklet, ancestors[0]);
   const configs = componentConfigs.map(x => _objectSpread(_objectSpread({}, x), {}, {
     value: Object.values(_constant.CHAIN_PROP_MAP).includes(x.key) && Object.keys(sharedConfigObj).includes(x.key) ? sharedConfigObj[x.key] : sharedConfigObj[x.key] || x.value
   }));

package/lib/blocklet/component/index.js

@@ -389,7 +389,7 @@ function ComponentItem(_ref) {
               color: "error",
               badgeContent: "",
               variant: "dot",
-              invisible: !(0, _util.getComponentMissingConfigs)(blocklet, ancestors).length,
+              invisible: !(0, _util.getComponentMissingConfigs)(blocklet, ancestors[0]).length,
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
                 onClick: open,
                 size: "small",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.16-beta-d8a9fb09",
+  "version": "1.16.16-beta-740ea329",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,23 +27,23 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.16-beta-d8a9fb09",
-    "@abtnode/constant": "1.16.16-beta-d8a9fb09",
-    "@abtnode/util": "1.16.16-beta-d8a9fb09",
+    "@abtnode/auth": "1.16.16-beta-740ea329",
+    "@abtnode/constant": "1.16.16-beta-740ea329",
+    "@abtnode/util": "1.16.16-beta-740ea329",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.89",
-    "@arcblock/did-connect": "^2.7.15",
+    "@arcblock/did-connect": "^2.7.16",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.7.15",
-    "@arcblock/nft-display": "2.7.15",
-    "@arcblock/react-hooks": "^2.7.15",
-    "@arcblock/terminal": "^2.7.15",
-    "@arcblock/ux": "^2.7.15",
-    "@blocklet/constant": "1.16.16-beta-d8a9fb09",
+    "@arcblock/icons": "^2.7.16",
+    "@arcblock/nft-display": "2.7.16",
+    "@arcblock/react-hooks": "^2.7.16",
+    "@arcblock/terminal": "^2.7.16",
+    "@arcblock/ux": "^2.7.16",
+    "@blocklet/constant": "1.16.16-beta-740ea329",
     "@blocklet/launcher-layout": "2.2.5",
-    "@blocklet/list": "^0.12.34",
-    "@blocklet/meta": "1.16.16-beta-d8a9fb09",
-    "@blocklet/ui-react": "^2.7.15",
+    "@blocklet/list": "^0.12.35",
+    "@blocklet/meta": "1.16.16-beta-740ea329",
+    "@blocklet/ui-react": "^2.7.16",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -98,7 +98,7 @@
     "babel-plugin-inline-react-svg": "^1.1.2",
     "glob": "^10.3.3"
   },
-  "gitHead": "a03d8972fd0fafe810369efa89b03ccd0647dce5",
+  "gitHead": "6abb5a7319ad1093f1e2d04d76215d4a127b538d",
   "exports": {
     ".": {
       "import": "./es/index.js",