@abtnode/ux 1.16.21-beta-7b40ffb4 → 1.16.21-beta-420f105a
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.
- package/es/blocklet/component/add-component-core.js +4 -0
- package/es/blocklet/component/index.js +3 -8
- package/es/blocklet/component/store-blocklet-list.js +10 -5
- package/es/blocklet/configuration.js +8 -2
- package/es/blocklet/publish/create-release.js +1 -1
- package/es/blocklet/publish/resource.js +3 -3
- package/es/form/form-autocomplete-input.js +6 -2
- package/es/locales/en.js +1 -0
- package/es/locales/zh.js +1 -0
- package/es/util/index.js +2 -8
- package/lib/blocklet/component/add-component-core.js +4 -0
- package/lib/blocklet/component/index.js +6 -8
- package/lib/blocklet/component/store-blocklet-list.js +12 -7
- package/lib/blocklet/configuration.js +8 -2
- package/lib/blocklet/publish/create-release.js +4 -1
- package/lib/blocklet/publish/resource.js +3 -3
- package/lib/form/form-autocomplete-input.js +7 -3
- package/lib/locales/en.js +1 -0
- package/lib/locales/zh.js +1 -0
- package/lib/util/index.js +1 -7
- package/package.json +8 -8
|
@@ -153,6 +153,7 @@ export default function AddComponentCore({
|
|
|
153
153
|
mode,
|
|
154
154
|
stores,
|
|
155
155
|
resourceType,
|
|
156
|
+
resourceDid,
|
|
156
157
|
storageKey,
|
|
157
158
|
inDialog
|
|
158
159
|
}) {
|
|
@@ -740,6 +741,7 @@ export default function AddComponentCore({
|
|
|
740
741
|
},
|
|
741
742
|
storeUrl: currentRegistry.url,
|
|
742
743
|
resourceType: resourceType,
|
|
744
|
+
resourceDid: resourceDid,
|
|
743
745
|
handleButtonClick: chooseParams => {
|
|
744
746
|
setConfigValue({
|
|
745
747
|
chooseParams: {
|
|
@@ -1114,6 +1116,7 @@ AddComponentCore.propTypes = {
|
|
|
1114
1116
|
inDialog: PropTypes.bool,
|
|
1115
1117
|
stores: PropTypes.arrayOf(PropTypes.string),
|
|
1116
1118
|
resourceType: PropTypes.string,
|
|
1119
|
+
resourceDid: PropTypes.string,
|
|
1117
1120
|
storageKey: PropTypes.string
|
|
1118
1121
|
};
|
|
1119
1122
|
AddComponentCore.defaultProps = {
|
|
@@ -1121,6 +1124,7 @@ AddComponentCore.defaultProps = {
|
|
|
1121
1124
|
mode: 'normal',
|
|
1122
1125
|
stores: [],
|
|
1123
1126
|
resourceType: '',
|
|
1127
|
+
resourceDid: '',
|
|
1124
1128
|
storageKey: '',
|
|
1125
1129
|
inDialog: true
|
|
1126
1130
|
};
|
|
@@ -38,7 +38,6 @@ import Tag from '../../tag';
|
|
|
38
38
|
import BlockletSource from '../blocklet-source';
|
|
39
39
|
import BlockletStatus from '../status';
|
|
40
40
|
import BlockletVersion from '../version';
|
|
41
|
-
import ResourceType from '../resource-type';
|
|
42
41
|
import Confirm from '../../confirm';
|
|
43
42
|
import { useNodeContext } from '../../contexts/node';
|
|
44
43
|
import { formatPerson, formatError, sleep, BlockletAdminRoles, formatToDatetime } from '../../util';
|
|
@@ -120,6 +119,7 @@ const getComponentName = (componentId, app) => {
|
|
|
120
119
|
}
|
|
121
120
|
return names.join(' / ');
|
|
122
121
|
};
|
|
122
|
+
const isPack = component => component?.meta?.group === 'pack';
|
|
123
123
|
function ComponentItem({
|
|
124
124
|
blocklet,
|
|
125
125
|
ancestors,
|
|
@@ -299,11 +299,6 @@ function ComponentItem({
|
|
|
299
299
|
},
|
|
300
300
|
status: status,
|
|
301
301
|
source: blocklet.source
|
|
302
|
-
}), !hasStartEngine(blocklet.meta) && /*#__PURE__*/_jsx(ResourceType, {
|
|
303
|
-
style: {
|
|
304
|
-
marginLeft: 4
|
|
305
|
-
},
|
|
306
|
-
blocklet: blocklet
|
|
307
302
|
}), /*#__PURE__*/_jsx(BlockletMode, {
|
|
308
303
|
style: {
|
|
309
304
|
marginLeft: 4
|
|
@@ -399,7 +394,7 @@ function ComponentItem({
|
|
|
399
394
|
onClick: () => {
|
|
400
395
|
setComponentInfo(blocklet);
|
|
401
396
|
}
|
|
402
|
-
} : null, {
|
|
397
|
+
} : null, !isPack(blocklet) && {
|
|
403
398
|
icon: /*#__PURE__*/_jsx(RestartIcon, {}),
|
|
404
399
|
text: t('common.restart'),
|
|
405
400
|
onClick: () => {
|
|
@@ -417,7 +412,7 @@ function ComponentItem({
|
|
|
417
412
|
});
|
|
418
413
|
},
|
|
419
414
|
disabled: appInProgress || componentInProgress || blocklet.status !== 'running'
|
|
420
|
-
}, {
|
|
415
|
+
}, !isPack(blocklet) && {
|
|
421
416
|
icon: /*#__PURE__*/_jsx(ReloadIcon, {}),
|
|
422
417
|
text: t('common.reload'),
|
|
423
418
|
onClick: async () => {
|
|
@@ -135,6 +135,7 @@ export default function BlockletList({
|
|
|
135
135
|
extraFilter,
|
|
136
136
|
serverVersion,
|
|
137
137
|
resourceType,
|
|
138
|
+
resourceDid,
|
|
138
139
|
...rest
|
|
139
140
|
}) {
|
|
140
141
|
const {
|
|
@@ -148,13 +149,15 @@ export default function BlockletList({
|
|
|
148
149
|
const endpoint = storeUrl;
|
|
149
150
|
useEffect(() => {
|
|
150
151
|
setFilters({
|
|
151
|
-
resourceType
|
|
152
|
+
resourceType,
|
|
153
|
+
resourceDid
|
|
152
154
|
});
|
|
153
|
-
}, [endpoint, resourceType]);
|
|
155
|
+
}, [endpoint, resourceType, resourceDid]);
|
|
154
156
|
useEffect(() => {
|
|
155
157
|
setInitialized(true);
|
|
156
158
|
setFilters({
|
|
157
|
-
resourceType
|
|
159
|
+
resourceType,
|
|
160
|
+
resourceDid
|
|
158
161
|
});
|
|
159
162
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
160
163
|
}, []);
|
|
@@ -197,7 +200,8 @@ BlockletList.propTypes = {
|
|
|
197
200
|
handleBlockletRender: PropTypes.func,
|
|
198
201
|
extraFilter: PropTypes.func,
|
|
199
202
|
serverVersion: PropTypes.string,
|
|
200
|
-
resourceType: PropTypes.string
|
|
203
|
+
resourceType: PropTypes.string,
|
|
204
|
+
resourceDid: PropTypes.string
|
|
201
205
|
};
|
|
202
206
|
BlockletList.defaultProps = {
|
|
203
207
|
handleButtonClick: null,
|
|
@@ -205,7 +209,8 @@ BlockletList.defaultProps = {
|
|
|
205
209
|
handleBlockletRender: null,
|
|
206
210
|
extraFilter: undefined,
|
|
207
211
|
serverVersion: '',
|
|
208
|
-
resourceType: ''
|
|
212
|
+
resourceType: '',
|
|
213
|
+
resourceDid: ''
|
|
209
214
|
};
|
|
210
215
|
const StyledBlocklet = styled(Blocklet)`
|
|
211
216
|
.ms-highlight {
|
|
@@ -364,8 +364,14 @@ function BlockletEnvironment({
|
|
|
364
364
|
initialValue: customLanguages ? customLanguages.value.split(',') : ['en', 'zh'],
|
|
365
365
|
onSubmit: value => onSubmitConfig('BLOCKLET_APP_LANGUAGES', value),
|
|
366
366
|
helperText: t('blocklet.config.selectLanguagesTip'),
|
|
367
|
-
placeholder: t('
|
|
368
|
-
filterKeys: languagesFilterKeys
|
|
367
|
+
placeholder: t('blocklet.config.languagesSearch'),
|
|
368
|
+
filterKeys: languagesFilterKeys,
|
|
369
|
+
renderLabel: (code, item) => {
|
|
370
|
+
if (item.name === item.enName) {
|
|
371
|
+
return `${item.name} (${code.toUpperCase()})`;
|
|
372
|
+
}
|
|
373
|
+
return `${item.name}, ${item.enName} (${code.toUpperCase()})`;
|
|
374
|
+
}
|
|
369
375
|
})]
|
|
370
376
|
}), /*#__PURE__*/_jsx(Box, {
|
|
371
377
|
className: "config-form",
|
|
@@ -131,7 +131,7 @@ export default function CreateRelease({
|
|
|
131
131
|
const releaseId = inputReleaseId === 'create' ? '' : inputReleaseId;
|
|
132
132
|
const mode = inputReleaseId === 'create' ? 'create' : 'edit';
|
|
133
133
|
const tabs = [];
|
|
134
|
-
const resourceComponents = (blocklet?.children || []).filter(x => x.meta.
|
|
134
|
+
const resourceComponents = (blocklet?.children || []).filter(x => x.meta.resource?.exportApi).filter(x => !componentDid || x.meta.did === componentDid);
|
|
135
135
|
resourceComponents.forEach(item => {
|
|
136
136
|
addComponentTabs({
|
|
137
137
|
tabs,
|
|
@@ -45,9 +45,9 @@ export default function Resource({
|
|
|
45
45
|
const releaseId = release.id;
|
|
46
46
|
const readonly = release.status === 'published';
|
|
47
47
|
const {
|
|
48
|
-
|
|
49
|
-
} = component?.meta.
|
|
50
|
-
const urlObj = new URL(joinUrl('http://127.0.0.1', component.mountPoint,
|
|
48
|
+
exportApi = '/'
|
|
49
|
+
} = component?.meta.resource || {};
|
|
50
|
+
const urlObj = new URL(joinUrl('http://127.0.0.1', component.mountPoint, exportApi || '/').replace(/\/+/g, '/'));
|
|
51
51
|
urlObj.searchParams.set('projectId', projectId);
|
|
52
52
|
urlObj.searchParams.set('releaseId', releaseId);
|
|
53
53
|
urlObj.searchParams.set('local', locale);
|
|
@@ -32,6 +32,7 @@ export default function FormAutocompleteInput({
|
|
|
32
32
|
helperText,
|
|
33
33
|
placeholder,
|
|
34
34
|
renderImage,
|
|
35
|
+
renderLabel,
|
|
35
36
|
filterKeys,
|
|
36
37
|
noEmpty,
|
|
37
38
|
...rest
|
|
@@ -148,7 +149,7 @@ export default function FormAutocompleteInput({
|
|
|
148
149
|
flex: 1,
|
|
149
150
|
fontWeight: selected ? '700' : 'normal'
|
|
150
151
|
},
|
|
151
|
-
children: optionsMap[code]?.name
|
|
152
|
+
children: renderLabel(code, optionsMap[code]) || optionsMap[code]?.name
|
|
152
153
|
}), /*#__PURE__*/_jsx(Box, {
|
|
153
154
|
component: CloseIcon,
|
|
154
155
|
sx: {
|
|
@@ -237,7 +238,8 @@ FormAutocompleteInput.propTypes = {
|
|
|
237
238
|
placeholder: PropTypes.string,
|
|
238
239
|
renderImage: PropTypes.func,
|
|
239
240
|
filterKeys: PropTypes.arrayOf(PropTypes.string),
|
|
240
|
-
noEmpty: PropTypes.bool
|
|
241
|
+
noEmpty: PropTypes.bool,
|
|
242
|
+
renderLabel: PropTypes.func
|
|
241
243
|
};
|
|
242
244
|
FormAutocompleteInput.defaultProps = {
|
|
243
245
|
style: {},
|
|
@@ -254,6 +256,8 @@ FormAutocompleteInput.defaultProps = {
|
|
|
254
256
|
placeholder: '',
|
|
255
257
|
filterKeys: ['name'],
|
|
256
258
|
renderImage: () => null,
|
|
259
|
+
// eslint-disable-next-line no-unused-vars
|
|
260
|
+
renderLabel: (code, item) => '',
|
|
257
261
|
noEmpty: false
|
|
258
262
|
};
|
|
259
263
|
const Row = styled.div`
|
package/es/locales/en.js
CHANGED
|
@@ -420,6 +420,7 @@ export default {
|
|
|
420
420
|
},
|
|
421
421
|
languages: 'Supported Languages',
|
|
422
422
|
selectLanguagesTip: 'Adjust the order by removing and re-adding',
|
|
423
|
+
languagesSearch: "Search by Country's Local Name, English Name, or ISO Code...",
|
|
423
424
|
passportColor: 'Passport Color',
|
|
424
425
|
appUrl: 'App URL',
|
|
425
426
|
access: {
|
package/es/locales/zh.js
CHANGED
package/es/util/index.js
CHANGED
|
@@ -14,7 +14,7 @@ import axios from '@abtnode/util/lib/axios';
|
|
|
14
14
|
import dayjs from '@abtnode/util/lib/dayjs';
|
|
15
15
|
import formatError from '@abtnode/util/lib/format-error';
|
|
16
16
|
import normalizePathPrefix from '@abtnode/util/lib/normalize-path-prefix';
|
|
17
|
-
import { evaluateURLs
|
|
17
|
+
import { evaluateURLs } from '@abtnode/util/lib/url-evaluation';
|
|
18
18
|
import checkAccessible from '@abtnode/util/lib/url-evaluation/check-accessible-browser';
|
|
19
19
|
import { BLOCKLET_MODES } from '@blocklet/constant';
|
|
20
20
|
import urlPathFriendly from '@blocklet/meta/lib/url-path-friendly';
|
|
@@ -48,18 +48,12 @@ export function getAccessUrl(hostname, path = '', params = undefined) {
|
|
|
48
48
|
if (!hostname) {
|
|
49
49
|
return '';
|
|
50
50
|
}
|
|
51
|
-
let protocol = 'http';
|
|
52
|
-
if (window.location.protocol === 'https:') {
|
|
53
|
-
if (isIpEcho(hostname) || isSlpDomain(hostname) || isDidDomain(hostname)) {
|
|
54
|
-
protocol = 'https';
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
51
|
let port = '';
|
|
58
52
|
const browserPort = Number(window.location.port);
|
|
59
53
|
if (process.env.NODE_ENV !== 'development' && browserPort && ![80, 443].includes(browserPort)) {
|
|
60
54
|
port = `:${browserPort}`;
|
|
61
55
|
}
|
|
62
|
-
const urlObj = new URL(`${protocol}
|
|
56
|
+
const urlObj = new URL(`${window.location.protocol}//${hostname}${port}`);
|
|
63
57
|
urlObj.pathname = path;
|
|
64
58
|
const url = urlObj.href.replace(/\/$/, '');
|
|
65
59
|
if (!params || !Object.keys(params)) {
|
|
@@ -174,6 +174,7 @@ function AddComponentCore(_ref3) {
|
|
|
174
174
|
mode,
|
|
175
175
|
stores,
|
|
176
176
|
resourceType,
|
|
177
|
+
resourceDid,
|
|
177
178
|
storageKey,
|
|
178
179
|
inDialog
|
|
179
180
|
} = _ref3;
|
|
@@ -750,6 +751,7 @@ function AddComponentCore(_ref3) {
|
|
|
750
751
|
},
|
|
751
752
|
storeUrl: currentRegistry.url,
|
|
752
753
|
resourceType: resourceType,
|
|
754
|
+
resourceDid: resourceDid,
|
|
753
755
|
handleButtonClick: chooseParams => {
|
|
754
756
|
setConfigValue({
|
|
755
757
|
chooseParams: _objectSpread(_objectSpread({}, chooseParams), {}, {
|
|
@@ -1121,6 +1123,7 @@ AddComponentCore.propTypes = {
|
|
|
1121
1123
|
inDialog: _propTypes.default.bool,
|
|
1122
1124
|
stores: _propTypes.default.arrayOf(_propTypes.default.string),
|
|
1123
1125
|
resourceType: _propTypes.default.string,
|
|
1126
|
+
resourceDid: _propTypes.default.string,
|
|
1124
1127
|
storageKey: _propTypes.default.string
|
|
1125
1128
|
};
|
|
1126
1129
|
AddComponentCore.defaultProps = {
|
|
@@ -1128,6 +1131,7 @@ AddComponentCore.defaultProps = {
|
|
|
1128
1131
|
mode: 'normal',
|
|
1129
1132
|
stores: [],
|
|
1130
1133
|
resourceType: '',
|
|
1134
|
+
resourceDid: '',
|
|
1131
1135
|
storageKey: '',
|
|
1132
1136
|
inDialog: true
|
|
1133
1137
|
};
|
|
@@ -44,7 +44,6 @@ var _tag = _interopRequireDefault(require("../../tag"));
|
|
|
44
44
|
var _blockletSource = _interopRequireDefault(require("../blocklet-source"));
|
|
45
45
|
var _status = _interopRequireDefault(require("../status"));
|
|
46
46
|
var _version = _interopRequireDefault(require("../version"));
|
|
47
|
-
var _resourceType = _interopRequireDefault(require("../resource-type"));
|
|
48
47
|
var _confirm = _interopRequireDefault(require("../../confirm"));
|
|
49
48
|
var _node = require("../../contexts/node");
|
|
50
49
|
var _util2 = require("../../util");
|
|
@@ -138,6 +137,10 @@ const getComponentName = (componentId, app) => {
|
|
|
138
137
|
}
|
|
139
138
|
return names.join(' / ');
|
|
140
139
|
};
|
|
140
|
+
const isPack = component => {
|
|
141
|
+
var _component$meta;
|
|
142
|
+
return (component === null || component === void 0 ? void 0 : (_component$meta = component.meta) === null || _component$meta === void 0 ? void 0 : _component$meta.group) === 'pack';
|
|
143
|
+
};
|
|
141
144
|
function ComponentItem(_ref) {
|
|
142
145
|
var _blocklet$dependents, _blocklet$meta$resour, _blocklet$dependents2, _blocklet$meta, _blocklet$dependents3;
|
|
143
146
|
let {
|
|
@@ -322,11 +325,6 @@ function ComponentItem(_ref) {
|
|
|
322
325
|
},
|
|
323
326
|
status: status,
|
|
324
327
|
source: blocklet.source
|
|
325
|
-
}), !(0, _util.hasStartEngine)(blocklet.meta) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_resourceType.default, {
|
|
326
|
-
style: {
|
|
327
|
-
marginLeft: 4
|
|
328
|
-
},
|
|
329
|
-
blocklet: blocklet
|
|
330
328
|
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_mode.default, {
|
|
331
329
|
style: {
|
|
332
330
|
marginLeft: 4
|
|
@@ -425,7 +423,7 @@ function ComponentItem(_ref) {
|
|
|
425
423
|
onClick: () => {
|
|
426
424
|
setComponentInfo(blocklet);
|
|
427
425
|
}
|
|
428
|
-
} : null, {
|
|
426
|
+
} : null, !isPack(blocklet) && {
|
|
429
427
|
icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Replay.default, {}),
|
|
430
428
|
text: t('common.restart'),
|
|
431
429
|
onClick: () => {
|
|
@@ -443,7 +441,7 @@ function ComponentItem(_ref) {
|
|
|
443
441
|
});
|
|
444
442
|
},
|
|
445
443
|
disabled: appInProgress || componentInProgress || blocklet.status !== 'running'
|
|
446
|
-
}, {
|
|
444
|
+
}, !isPack(blocklet) && {
|
|
447
445
|
icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Autorenew.default, {}),
|
|
448
446
|
text: t('common.reload'),
|
|
449
447
|
onClick: async () => {
|
|
@@ -21,7 +21,7 @@ var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
|
|
|
21
21
|
var _util2 = require("../../util");
|
|
22
22
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
23
23
|
var _templateObject;
|
|
24
|
-
const _excluded = ["handleButtonClick", "handleSearchSelect", "storeUrl", "handleBlockletRender", "extraFilter", "serverVersion", "resourceType"];
|
|
24
|
+
const _excluded = ["handleButtonClick", "handleSearchSelect", "storeUrl", "handleBlockletRender", "extraFilter", "serverVersion", "resourceType", "resourceDid"];
|
|
25
25
|
/* eslint-disable react/no-unstable-nested-components */
|
|
26
26
|
/* eslint-disable react/jsx-wrap-multilines */
|
|
27
27
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
@@ -154,7 +154,8 @@ function BlockletList(_ref3) {
|
|
|
154
154
|
handleBlockletRender,
|
|
155
155
|
extraFilter,
|
|
156
156
|
serverVersion,
|
|
157
|
-
resourceType
|
|
157
|
+
resourceType,
|
|
158
|
+
resourceDid
|
|
158
159
|
} = _ref3,
|
|
159
160
|
rest = _objectWithoutProperties(_ref3, _excluded);
|
|
160
161
|
const {
|
|
@@ -168,13 +169,15 @@ function BlockletList(_ref3) {
|
|
|
168
169
|
const endpoint = storeUrl;
|
|
169
170
|
(0, _react.useEffect)(() => {
|
|
170
171
|
setFilters({
|
|
171
|
-
resourceType
|
|
172
|
+
resourceType,
|
|
173
|
+
resourceDid
|
|
172
174
|
});
|
|
173
|
-
}, [endpoint, resourceType]);
|
|
175
|
+
}, [endpoint, resourceType, resourceDid]);
|
|
174
176
|
(0, _react.useEffect)(() => {
|
|
175
177
|
setInitialized(true);
|
|
176
178
|
setFilters({
|
|
177
|
-
resourceType
|
|
179
|
+
resourceType,
|
|
180
|
+
resourceDid
|
|
178
181
|
});
|
|
179
182
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
180
183
|
}, []);
|
|
@@ -212,7 +215,8 @@ BlockletList.propTypes = {
|
|
|
212
215
|
handleBlockletRender: _propTypes.default.func,
|
|
213
216
|
extraFilter: _propTypes.default.func,
|
|
214
217
|
serverVersion: _propTypes.default.string,
|
|
215
|
-
resourceType: _propTypes.default.string
|
|
218
|
+
resourceType: _propTypes.default.string,
|
|
219
|
+
resourceDid: _propTypes.default.string
|
|
216
220
|
};
|
|
217
221
|
BlockletList.defaultProps = {
|
|
218
222
|
handleButtonClick: null,
|
|
@@ -220,6 +224,7 @@ BlockletList.defaultProps = {
|
|
|
220
224
|
handleBlockletRender: null,
|
|
221
225
|
extraFilter: undefined,
|
|
222
226
|
serverVersion: '',
|
|
223
|
-
resourceType: ''
|
|
227
|
+
resourceType: '',
|
|
228
|
+
resourceDid: ''
|
|
224
229
|
};
|
|
225
230
|
const StyledBlocklet = (0, _styled.default)(_Blocklet.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n .ms-highlight {\n color: ", ";\n }\n"])), props => props.theme.palette.primary.main);
|
|
@@ -383,8 +383,14 @@ function BlockletEnvironment(_ref) {
|
|
|
383
383
|
initialValue: customLanguages ? customLanguages.value.split(',') : ['en', 'zh'],
|
|
384
384
|
onSubmit: value => onSubmitConfig('BLOCKLET_APP_LANGUAGES', value),
|
|
385
385
|
helperText: t('blocklet.config.selectLanguagesTip'),
|
|
386
|
-
placeholder: t('
|
|
387
|
-
filterKeys: languagesFilterKeys
|
|
386
|
+
placeholder: t('blocklet.config.languagesSearch'),
|
|
387
|
+
filterKeys: languagesFilterKeys,
|
|
388
|
+
renderLabel: (code, item) => {
|
|
389
|
+
if (item.name === item.enName) {
|
|
390
|
+
return "".concat(item.name, " (").concat(code.toUpperCase(), ")");
|
|
391
|
+
}
|
|
392
|
+
return "".concat(item.name, ", ").concat(item.enName, " (").concat(code.toUpperCase(), ")");
|
|
393
|
+
}
|
|
388
394
|
})]
|
|
389
395
|
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
|
|
390
396
|
className: "config-form",
|
|
@@ -147,7 +147,10 @@ function CreateRelease(_ref2) {
|
|
|
147
147
|
const releaseId = inputReleaseId === 'create' ? '' : inputReleaseId;
|
|
148
148
|
const mode = inputReleaseId === 'create' ? 'create' : 'edit';
|
|
149
149
|
const tabs = [];
|
|
150
|
-
const resourceComponents = ((blocklet === null || blocklet === void 0 ? void 0 : blocklet.children) || []).filter(x =>
|
|
150
|
+
const resourceComponents = ((blocklet === null || blocklet === void 0 ? void 0 : blocklet.children) || []).filter(x => {
|
|
151
|
+
var _x$meta$resource;
|
|
152
|
+
return (_x$meta$resource = x.meta.resource) === null || _x$meta$resource === void 0 ? void 0 : _x$meta$resource.exportApi;
|
|
153
|
+
}).filter(x => !componentDid || x.meta.did === componentDid);
|
|
151
154
|
resourceComponents.forEach(item => {
|
|
152
155
|
addComponentTabs({
|
|
153
156
|
tabs,
|
|
@@ -54,9 +54,9 @@ function Resource(_ref) {
|
|
|
54
54
|
const releaseId = release.id;
|
|
55
55
|
const readonly = release.status === 'published';
|
|
56
56
|
const {
|
|
57
|
-
|
|
58
|
-
} = (component === null || component === void 0 ? void 0 : component.meta.
|
|
59
|
-
const urlObj = new URL((0, _urlJoin.default)('http://127.0.0.1', component.mountPoint,
|
|
57
|
+
exportApi = '/'
|
|
58
|
+
} = (component === null || component === void 0 ? void 0 : component.meta.resource) || {};
|
|
59
|
+
const urlObj = new URL((0, _urlJoin.default)('http://127.0.0.1', component.mountPoint, exportApi || '/').replace(/\/+/g, '/'));
|
|
60
60
|
urlObj.searchParams.set('projectId', projectId);
|
|
61
61
|
urlObj.searchParams.set('releaseId', releaseId);
|
|
62
62
|
urlObj.searchParams.set('local', locale);
|
|
@@ -22,7 +22,7 @@ var _formWrapper = _interopRequireDefault(require("./form-wrapper"));
|
|
|
22
22
|
var _inputTriggers = _interopRequireDefault(require("./input-triggers"));
|
|
23
23
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
24
24
|
var _templateObject;
|
|
25
|
-
const _excluded = ["label", "disabled", "required", "initialValue", "onChange", "style", "onSubmit", "triggers", "options", "formatterBeforeSubmit", "helperText", "placeholder", "renderImage", "filterKeys", "noEmpty"];
|
|
25
|
+
const _excluded = ["label", "disabled", "required", "initialValue", "onChange", "style", "onSubmit", "triggers", "options", "formatterBeforeSubmit", "helperText", "placeholder", "renderImage", "renderLabel", "filterKeys", "noEmpty"];
|
|
26
26
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
27
27
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
28
28
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
@@ -49,6 +49,7 @@ function FormAutocompleteInput(_ref) {
|
|
|
49
49
|
helperText,
|
|
50
50
|
placeholder,
|
|
51
51
|
renderImage,
|
|
52
|
+
renderLabel,
|
|
52
53
|
filterKeys,
|
|
53
54
|
noEmpty
|
|
54
55
|
} = _ref,
|
|
@@ -169,7 +170,7 @@ function FormAutocompleteInput(_ref) {
|
|
|
169
170
|
flex: 1,
|
|
170
171
|
fontWeight: selected ? '700' : 'normal'
|
|
171
172
|
},
|
|
172
|
-
children: (_optionsMap$code = optionsMap[code]) === null || _optionsMap$code === void 0 ? void 0 : _optionsMap$code.name
|
|
173
|
+
children: renderLabel(code, optionsMap[code]) || ((_optionsMap$code = optionsMap[code]) === null || _optionsMap$code === void 0 ? void 0 : _optionsMap$code.name)
|
|
173
174
|
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
|
|
174
175
|
component: _Close.default,
|
|
175
176
|
sx: {
|
|
@@ -257,7 +258,8 @@ FormAutocompleteInput.propTypes = {
|
|
|
257
258
|
placeholder: _propTypes.default.string,
|
|
258
259
|
renderImage: _propTypes.default.func,
|
|
259
260
|
filterKeys: _propTypes.default.arrayOf(_propTypes.default.string),
|
|
260
|
-
noEmpty: _propTypes.default.bool
|
|
261
|
+
noEmpty: _propTypes.default.bool,
|
|
262
|
+
renderLabel: _propTypes.default.func
|
|
261
263
|
};
|
|
262
264
|
FormAutocompleteInput.defaultProps = {
|
|
263
265
|
style: {},
|
|
@@ -274,6 +276,8 @@ FormAutocompleteInput.defaultProps = {
|
|
|
274
276
|
placeholder: '',
|
|
275
277
|
filterKeys: ['name'],
|
|
276
278
|
renderImage: () => null,
|
|
279
|
+
// eslint-disable-next-line no-unused-vars
|
|
280
|
+
renderLabel: (code, item) => '',
|
|
277
281
|
noEmpty: false
|
|
278
282
|
};
|
|
279
283
|
const Row = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n display: flex;\n justify-content: space-between;\n align-items: center;\n height: 48px;\n border-bottom: 1px solid rgba(0, 0, 0, 0.08);\n font-size: 1.1em;\n"])));
|
package/lib/locales/en.js
CHANGED
|
@@ -426,6 +426,7 @@ var _default = exports.default = {
|
|
|
426
426
|
},
|
|
427
427
|
languages: 'Supported Languages',
|
|
428
428
|
selectLanguagesTip: 'Adjust the order by removing and re-adding',
|
|
429
|
+
languagesSearch: "Search by Country's Local Name, English Name, or ISO Code...",
|
|
429
430
|
passportColor: 'Passport Color',
|
|
430
431
|
appUrl: 'App URL',
|
|
431
432
|
access: {
|
package/lib/locales/zh.js
CHANGED
package/lib/util/index.js
CHANGED
|
@@ -95,18 +95,12 @@ function getAccessUrl(hostname) {
|
|
|
95
95
|
if (!hostname) {
|
|
96
96
|
return '';
|
|
97
97
|
}
|
|
98
|
-
let protocol = 'http';
|
|
99
|
-
if (window.location.protocol === 'https:') {
|
|
100
|
-
if ((0, _urlEvaluation.isIpEcho)(hostname) || (0, _urlEvaluation.isSlpDomain)(hostname) || (0, _urlEvaluation.isDidDomain)(hostname)) {
|
|
101
|
-
protocol = 'https';
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
98
|
let port = '';
|
|
105
99
|
const browserPort = Number(window.location.port);
|
|
106
100
|
if (process.env.NODE_ENV !== 'development' && browserPort && ![80, 443].includes(browserPort)) {
|
|
107
101
|
port = ":".concat(browserPort);
|
|
108
102
|
}
|
|
109
|
-
const urlObj = new URL("".concat(protocol, "
|
|
103
|
+
const urlObj = new URL("".concat(window.location.protocol, "//").concat(hostname).concat(port));
|
|
110
104
|
urlObj.pathname = path;
|
|
111
105
|
const url = urlObj.href.replace(/\/$/, '');
|
|
112
106
|
if (!params || !Object.keys(params)) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abtnode/ux",
|
|
3
|
-
"version": "1.16.21-beta-
|
|
3
|
+
"version": "1.16.21-beta-420f105a",
|
|
4
4
|
"description": "UX components shared across abtnode packages",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
"author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
|
|
28
28
|
"license": "Apache-2.0",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@abtnode/auth": "1.16.21-beta-
|
|
31
|
-
"@abtnode/constant": "1.16.21-beta-
|
|
32
|
-
"@abtnode/util": "1.16.21-beta-
|
|
30
|
+
"@abtnode/auth": "1.16.21-beta-420f105a",
|
|
31
|
+
"@abtnode/constant": "1.16.21-beta-420f105a",
|
|
32
|
+
"@abtnode/util": "1.16.21-beta-420f105a",
|
|
33
33
|
"@ahooksjs/use-url-state": "^3.5.1",
|
|
34
34
|
"@arcblock/did": "^1.18.107",
|
|
35
35
|
"@arcblock/did-connect": "^2.8.23",
|
|
@@ -39,12 +39,12 @@
|
|
|
39
39
|
"@arcblock/react-hooks": "^2.8.23",
|
|
40
40
|
"@arcblock/terminal": "^2.8.23",
|
|
41
41
|
"@arcblock/ux": "^2.8.23",
|
|
42
|
-
"@blocklet/constant": "1.16.21-beta-
|
|
42
|
+
"@blocklet/constant": "1.16.21-beta-420f105a",
|
|
43
43
|
"@blocklet/launcher-layout": "2.2.48",
|
|
44
44
|
"@blocklet/list": "^0.12.60",
|
|
45
|
-
"@blocklet/meta": "1.16.21-beta-
|
|
45
|
+
"@blocklet/meta": "1.16.21-beta-420f105a",
|
|
46
46
|
"@blocklet/ui-react": "^2.8.23",
|
|
47
|
-
"@blocklet/uploader": "^0.0.
|
|
47
|
+
"@blocklet/uploader": "^0.0.56",
|
|
48
48
|
"@emotion/react": "^11.10.4",
|
|
49
49
|
"@emotion/styled": "^11.10.4",
|
|
50
50
|
"@iconify/react": "^4.0.0",
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
"babel-plugin-inline-react-svg": "^1.1.2",
|
|
103
103
|
"glob": "^10.3.3"
|
|
104
104
|
},
|
|
105
|
-
"gitHead": "
|
|
105
|
+
"gitHead": "f38219e9051563984543127087d6d88fc8b1be98",
|
|
106
106
|
"exports": {
|
|
107
107
|
".": {
|
|
108
108
|
"import": "./es/index.js",
|