@blocklet/ui-react 2.9.84 → 2.9.85

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/es/ComponentManager/components/add-component.js +10 -12
  2. package/lib/ComponentManager/components/add-component.js +9 -8
  3. package/package.json +4 -4
  4. package/src/ComponentManager/components/add-component.tsx +10 -13
package/es/ComponentManager/components/add-component.js CHANGED
@@ -5,7 +5,7 @@ import { useLocaleContext } from "@arcblock/ux/lib/Locale/context";
5
5
  import { WELLKNOWN_SERVICE_PATH_PREFIX } from "@arcblock/ux/lib/Util/constant";
6
6
  import { useMemoizedFn, useReactive } from "ahooks";
7
7
  import { translate } from "@arcblock/ux/lib/Locale/util";
8
- import { joinURL } from "ufo";
8
+ import { joinURL, withQuery } from "ufo";
9
9
  import ResourceDialog from "./resource-dialog.js";
10
10
  import { translations } from "../libs/locales.js";
11
11
  export default function AddComponent({
@@ -25,17 +25,15 @@ export default function AddComponent({
25
25
  loading: false,
26
26
  showDialog: false
27
27
  });
28
- const baseUrl = new URL(
29
- joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, "embed/resources", componentDid, "add"),
30
- window.location.origin
31
- );
32
- baseUrl.searchParams.set("resourceDid", resourceDid);
33
- baseUrl.searchParams.set("resourceType", resourceType);
34
- baseUrl.searchParams.set("mode", "dialog");
35
- baseUrl.searchParams.set("showFromUrl", "false");
36
- baseUrl.searchParams.set("showResourcesSwitch", "false");
37
- baseUrl.searchParams.set("enableRunBackground", "false");
38
- const importUrl = baseUrl.pathname + baseUrl.search;
28
+ const importUrl = withQuery(joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, "embed/resources", componentDid, "add"), {
29
+ resourceDid,
30
+ resourceType,
31
+ mode: "dialog",
32
+ showFromUrl: "false",
33
+ showResourcesSwitch: "false",
34
+ enableRunBackground: "false",
35
+ showCategory: "false"
36
+ });
39
37
  const handleClose = useMemoizedFn(() => {
40
38
  currentState.showDialog = false;
41
39
  onClose?.();
package/lib/ComponentManager/components/add-component.js CHANGED
@@ -34,14 +34,15 @@ function AddComponent({
34
34
  loading: false,
35
35
  showDialog: false
36
36
  });
37
- const baseUrl = new URL((0, _ufo.joinURL)(_constant.WELLKNOWN_SERVICE_PATH_PREFIX, "embed/resources", componentDid, "add"), window.location.origin);
38
- baseUrl.searchParams.set("resourceDid", resourceDid);
39
- baseUrl.searchParams.set("resourceType", resourceType);
40
- baseUrl.searchParams.set("mode", "dialog");
41
- baseUrl.searchParams.set("showFromUrl", "false");
42
- baseUrl.searchParams.set("showResourcesSwitch", "false");
43
- baseUrl.searchParams.set("enableRunBackground", "false");
44
- const importUrl = baseUrl.pathname + baseUrl.search;
37
+ const importUrl = (0, _ufo.withQuery)((0, _ufo.joinURL)(_constant.WELLKNOWN_SERVICE_PATH_PREFIX, "embed/resources", componentDid, "add"), {
38
+ resourceDid,
39
+ resourceType,
40
+ mode: "dialog",
41
+ showFromUrl: "false",
42
+ showResourcesSwitch: "false",
43
+ enableRunBackground: "false",
44
+ showCategory: "false"
45
+ });
45
46
  const handleClose = (0, _ahooks.useMemoizedFn)(() => {
46
47
  currentState.showDialog = false;
47
48
  onClose?.();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blocklet/ui-react",
3
- "version": "2.9.84",
3
+ "version": "2.9.85",
4
4
  "description": "Some useful front-end web components that can be used in Blocklets.",
5
5
  "keywords": [
6
6
  "react",
@@ -62,8 +62,8 @@
62
62
  }
63
63
  },
64
64
  "dependencies": {
65
- "@arcblock/bridge": "^2.9.84",
66
- "@arcblock/react-hooks": "^2.9.84",
65
+ "@arcblock/bridge": "^2.9.85",
66
+ "@arcblock/react-hooks": "^2.9.85",
67
67
  "@blocklet/js-sdk": "1.16.27-beta-c450492a",
68
68
  "@iconify-icons/logos": "^1.2.36",
69
69
  "@iconify-icons/material-symbols": "^1.2.58",
@@ -108,5 +108,5 @@
108
108
  "jest": "^28.1.3",
109
109
  "unbuild": "^2.0.0"
110
110
  },
111
- "gitHead": "d4b772964ded283937e1d333d3e07be4aedcb934"
111
+ "gitHead": "64611c46693e639234c617a69f8265aa981a1602"
112
112
  }
package/src/ComponentManager/components/add-component.tsx CHANGED
@@ -4,7 +4,7 @@ import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
4
4
  import { WELLKNOWN_SERVICE_PATH_PREFIX } from '@arcblock/ux/lib/Util/constant';
5
5
  import { useMemoizedFn, useReactive } from 'ahooks';
6
6
  import { translate } from '@arcblock/ux/lib/Locale/util';
7
- import { joinURL } from 'ufo';
7
+ import { joinURL, withQuery } from 'ufo';
8
8
 
9
9
  import ResourceDialog from './resource-dialog';
10
10
  import { translations } from '../libs/locales';
@@ -35,18 +35,15 @@ export default function AddComponent({
35
35
  loading: false,
36
36
  showDialog: false,
37
37
  });
38
- const baseUrl = new URL(
39
- joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, 'embed/resources', componentDid, 'add'),
40
- window.location.origin
41
- );
42
- baseUrl.searchParams.set('resourceDid', resourceDid);
43
- baseUrl.searchParams.set('resourceType', resourceType);
44
- baseUrl.searchParams.set('mode', 'dialog');
45
- // 以下为添加组件特有的参数
46
- baseUrl.searchParams.set('showFromUrl', 'false');
47
- baseUrl.searchParams.set('showResourcesSwitch', 'false');
48
- baseUrl.searchParams.set('enableRunBackground', 'false');
49
- const importUrl = baseUrl.pathname + baseUrl.search;
38
+ const importUrl = withQuery(joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, 'embed/resources', componentDid, 'add'), {
39
+ resourceDid,
40
+ resourceType,
41
+ mode: 'dialog',
42
+ showFromUrl: 'false',
43
+ showResourcesSwitch: 'false',
44
+ enableRunBackground: 'false',
45
+ showCategory: 'false',
46
+ });
50
47
 
51
48
  const handleClose = useMemoizedFn(() => {
52
49
  currentState.showDialog = false;