@tddc/assign-modal 3.0.8 → 3.0.9

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 (6) hide show
  1. package/es/AssignModal/AssignApp/Edit.js +64 -114
  2. package/es/AssignModal/AssignApp/Edit_without_TntdVirtualTree.js +21 -21
  3. package/es/AssignModal/AssignApp/View.js +30 -35
  4. package/es/AssignModal/index.js +7 -5
  5. package/es/locale.js +65 -15
  6. package/package.json +1 -1
package/es/AssignModal/AssignApp/Edit.js CHANGED
@@ -182,7 +182,23 @@ var AssignModal = function AssignModal(props) {
182
182
  userList = _props$userList === void 0 ? [] : _props$userList,
183
183
  showUser = props.showUser,
184
184
  customOrgDisabled = props.customOrgDisabled,
185
- customAppDisabled = props.customAppDisabled;
185
+ customAppDisabled = props.customAppDisabled,
186
+ locale = props.locale;
187
+
188
+ // 封装 getText，自动传入 locale
189
+ var t = function t(key) {
190
+ for (
191
+ var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1;
192
+ _key < _len;
193
+ _key++
194
+ ) {
195
+ params[_key - 1] = arguments[_key];
196
+ }
197
+ return getText.apply(
198
+ void 0,
199
+ [key, props === null || props === void 0 ? void 0 : props.lang, locale].concat(params),
200
+ );
201
+ };
186
202
  var _dataItem$appCodes = dataItem.appCodes,
187
203
  appCodes = _dataItem$appCodes === void 0 ? [] : _dataItem$appCodes,
188
204
  _dataItem$orgCodes = dataItem.orgCodes,
@@ -225,18 +241,9 @@ var AssignModal = function AssignModal(props) {
225
241
  allApp = _useMemo2[1],
226
242
  allUser = _useMemo2[2];
227
243
  var titleOptions = [
228
- ''.concat(
229
- orgTitle ||
230
- getText('availableOrgs', props === null || props === void 0 ? void 0 : props.lang),
231
- ),
232
- ''.concat(
233
- appTitle ||
234
- getText('availableApps', props === null || props === void 0 ? void 0 : props.lang),
235
- ),
236
- ''.concat(
237
- userTitle ||
238
- getText('availableUsers', props === null || props === void 0 ? void 0 : props.lang),
239
- ),
244
+ ''.concat(orgTitle || t('availableOrgs')),
245
+ ''.concat(appTitle || t('availableApps')),
246
+ ''.concat(userTitle || t('availableUsers')),
240
247
  ];
241
248
  if (!showUser) {
242
249
  titleOptions.pop();
@@ -258,37 +265,37 @@ var AssignModal = function AssignModal(props) {
258
265
  checkedKeys = _useState8[0],
259
266
  setCheckedKeys = _useState8[1];
260
267
  var _useState9 = useState(appCodes || []),
261
- _useState0 = _slicedToArray(_useState9, 2),
262
- appKeys = _useState0[0],
263
- setAppKeys = _useState0[1];
264
- var _useState1 = useState(accounts || []),
265
- _useState10 = _slicedToArray(_useState1, 2),
266
- userKeys = _useState10[0],
267
- setUserKeys = _useState10[1];
268
- var _useState11 = useState(false),
268
+ _useState10 = _slicedToArray(_useState9, 2),
269
+ appKeys = _useState10[0],
270
+ setAppKeys = _useState10[1];
271
+ var _useState11 = useState(accounts || []),
269
272
  _useState12 = _slicedToArray(_useState11, 2),
270
- allOrgChecked = _useState12[0],
271
- setAllOrgChecked = _useState12[1];
273
+ userKeys = _useState12[0],
274
+ setUserKeys = _useState12[1];
272
275
  var _useState13 = useState(false),
273
276
  _useState14 = _slicedToArray(_useState13, 2),
274
- allAppChecked = _useState14[0],
275
- setAllAppChecked = _useState14[1];
277
+ allOrgChecked = _useState14[0],
278
+ setAllOrgChecked = _useState14[1];
276
279
  var _useState15 = useState(false),
277
280
  _useState16 = _slicedToArray(_useState15, 2),
278
- allUserChecked = _useState16[0],
279
- setAllUserChecked = _useState16[1];
280
- var _useState17 = useState(),
281
+ allAppChecked = _useState16[0],
282
+ setAllAppChecked = _useState16[1];
283
+ var _useState17 = useState(false),
281
284
  _useState18 = _slicedToArray(_useState17, 2),
282
- filterOrg = _useState18[0],
283
- setFilterOrg = _useState18[1];
285
+ allUserChecked = _useState18[0],
286
+ setAllUserChecked = _useState18[1];
284
287
  var _useState19 = useState(),
285
288
  _useState20 = _slicedToArray(_useState19, 2),
286
- filterUser = _useState20[0],
287
- setFilterUser = _useState20[1];
289
+ filterOrg = _useState20[0],
290
+ setFilterOrg = _useState20[1];
288
291
  var _useState21 = useState(),
289
292
  _useState22 = _slicedToArray(_useState21, 2),
290
- filterApp = _useState22[0],
291
- setFilterApp = _useState22[1];
293
+ filterUser = _useState22[0],
294
+ setFilterUser = _useState22[1];
295
+ var _useState23 = useState(),
296
+ _useState24 = _slicedToArray(_useState23, 2),
297
+ filterApp = _useState24[0],
298
+ setFilterApp = _useState24[1];
292
299
  var gap = 335;
293
300
  var windowHeight = useWindowHeight(gap);
294
301
  useEffect(
@@ -399,8 +406,8 @@ var AssignModal = function AssignModal(props) {
399
406
  );
400
407
  var onCheck = function onCheck() {
401
408
  var _node$childrenValues;
402
- for (var _len = arguments.length, rest = new Array(_len), _key = 0; _key < _len; _key++) {
403
- rest[_key] = arguments[_key];
409
+ for (var _len2 = arguments.length, rest = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
410
+ rest[_key2] = arguments[_key2];
404
411
  }
405
412
  var checked = rest[0],
406
413
  node = rest[1],
@@ -1085,11 +1092,7 @@ var AssignModal = function AssignModal(props) {
1085
1092
  {
1086
1093
  className: 'title',
1087
1094
  },
1088
- orgTitle ||
1089
- getText(
1090
- 'authorizesOrgList',
1091
- props === null || props === void 0 ? void 0 : props.lang,
1092
- ),
1095
+ orgTitle || t('authorizesOrgList'),
1093
1096
  ),
1094
1097
  /*#__PURE__*/ React.createElement(
1095
1098
  'div',
@@ -1103,11 +1106,7 @@ var AssignModal = function AssignModal(props) {
1103
1106
  checked: allOrgChecked,
1104
1107
  disabled: disabled,
1105
1108
  },
1106
- orgCheckboxTitle ||
1107
- getText(
1108
- 'allOrgAvailable',
1109
- props === null || props === void 0 ? void 0 : props.lang,
1110
- ),
1109
+ orgCheckboxTitle || t('allOrgAvailable'),
1111
1110
  ),
1112
1111
  ),
1113
1112
  ),
@@ -1126,10 +1125,7 @@ var AssignModal = function AssignModal(props) {
1126
1125
  },
1127
1126
  /*#__PURE__*/ React.createElement(_Input, {
1128
1127
  size: 'small',
1129
- placeholder: getText(
1130
- 'search',
1131
- props === null || props === void 0 ? void 0 : props.lang,
1132
- ),
1128
+ placeholder: t('search'),
1133
1129
  onChange: function onChange(e) {
1134
1130
  debouncedOrgSearch(e.target.value);
1135
1131
  },
@@ -1174,17 +1170,9 @@ var AssignModal = function AssignModal(props) {
1174
1170
  /*#__PURE__*/ React.createElement(
1175
1171
  'span',
1176
1172
  null,
1177
- getText(
1178
- 'hasBeenSelected',
1179
- props === null || props === void 0 ? void 0 : props.lang,
1180
- ),
1181
- ':',
1182
- ' ',
1183
- getText(
1184
- 'numOfOrg',
1185
- props === null || props === void 0 ? void 0 : props.lang,
1186
- areadySelectOrg.length || 0,
1187
- ),
1173
+ t('hasBeenSelected'),
1174
+ ': ',
1175
+ t('numOfOrg', areadySelectOrg.length || 0),
1188
1176
  ),
1189
1177
  /*#__PURE__*/ React.createElement(
1190
1178
  'a',
@@ -1194,7 +1182,7 @@ var AssignModal = function AssignModal(props) {
1194
1182
  return onRemoveAllOrg();
1195
1183
  },
1196
1184
  },
1197
- getText('clear', props === null || props === void 0 ? void 0 : props.lang),
1185
+ t('clear'),
1198
1186
  ),
1199
1187
  ),
1200
1188
  /*#__PURE__*/ React.createElement(
@@ -1265,11 +1253,7 @@ var AssignModal = function AssignModal(props) {
1265
1253
  {
1266
1254
  className: 'title',
1267
1255
  },
1268
- appTitle ||
1269
- getText(
1270
- 'authorizesAppList',
1271
- props === null || props === void 0 ? void 0 : props.lang,
1272
- ),
1256
+ appTitle || t('authorizesAppList'),
1273
1257
  ),
1274
1258
  /*#__PURE__*/ React.createElement(
1275
1259
  'div',
@@ -1283,11 +1267,7 @@ var AssignModal = function AssignModal(props) {
1283
1267
  checked: allAppChecked,
1284
1268
  disabled: disabled,
1285
1269
  },
1286
- appCheckboxTitle ||
1287
- getText(
1288
- 'allAppAvailable',
1289
- props === null || props === void 0 ? void 0 : props.lang,
1290
- ),
1270
+ appCheckboxTitle || t('allAppAvailable'),
1291
1271
  ),
1292
1272
  ),
1293
1273
  ),
@@ -1305,10 +1285,7 @@ var AssignModal = function AssignModal(props) {
1305
1285
  onChange: function onChange(e) {
1306
1286
  debouncedAppSearch(e.target.value);
1307
1287
  },
1308
- placeholder: getText(
1309
- 'enterAppName',
1310
- props === null || props === void 0 ? void 0 : props.lang,
1311
- ),
1288
+ placeholder: t('enterAppName'),
1312
1289
  size: 'small',
1313
1290
  suffix: /*#__PURE__*/ React.createElement(_Icon, {
1314
1291
  type: 'zoom',
@@ -1333,17 +1310,9 @@ var AssignModal = function AssignModal(props) {
1333
1310
  /*#__PURE__*/ React.createElement(
1334
1311
  'span',
1335
1312
  null,
1336
- getText(
1337
- 'hasBeenSelected',
1338
- props === null || props === void 0 ? void 0 : props.lang,
1339
- ),
1340
- ':',
1341
- ' ',
1342
- getText(
1343
- 'numOfApp',
1344
- props === null || props === void 0 ? void 0 : props.lang,
1345
- areadySelectApp.length || 0,
1346
- ),
1313
+ t('hasBeenSelected'),
1314
+ ': ',
1315
+ t('numOfApp', areadySelectApp.length || 0),
1347
1316
  ),
1348
1317
  /*#__PURE__*/ React.createElement(
1349
1318
  'a',
@@ -1353,7 +1322,7 @@ var AssignModal = function AssignModal(props) {
1353
1322
  return onRemoveAllApp();
1354
1323
  },
1355
1324
  },
1356
- getText('clear', props === null || props === void 0 ? void 0 : props.lang),
1325
+ t('clear'),
1357
1326
  ),
1358
1327
  ),
1359
1328
  /*#__PURE__*/ React.createElement(
@@ -1412,11 +1381,7 @@ var AssignModal = function AssignModal(props) {
1412
1381
  {
1413
1382
  className: 'title',
1414
1383
  },
1415
- userTitle ||
1416
- getText(
1417
- 'authorizesUserList',
1418
- props === null || props === void 0 ? void 0 : props.lang,
1419
- ),
1384
+ userTitle || t('authorizesUserList'),
1420
1385
  ),
1421
1386
  /*#__PURE__*/ React.createElement(
1422
1387
  'div',
@@ -1430,11 +1395,7 @@ var AssignModal = function AssignModal(props) {
1430
1395
  checked: allUserChecked,
1431
1396
  disabled: disabled,
1432
1397
  },
1433
- userCheckboxTitle ||
1434
- getText(
1435
- 'allUserAvailable',
1436
- props === null || props === void 0 ? void 0 : props.lang,
1437
- ),
1398
+ userCheckboxTitle || t('allUserAvailable'),
1438
1399
  ),
1439
1400
  ),
1440
1401
  ),
@@ -1450,10 +1411,7 @@ var AssignModal = function AssignModal(props) {
1450
1411
  },
1451
1412
  /*#__PURE__*/ React.createElement(_Input, {
1452
1413
  size: 'small',
1453
- placeholder: getText(
1454
- 'enterUserName',
1455
- props === null || props === void 0 ? void 0 : props.lang,
1456
- ),
1414
+ placeholder: t('enterUserName'),
1457
1415
  onChange: function onChange(e) {
1458
1416
  debouncedUserSearch(e.target.value);
1459
1417
  },
@@ -1480,17 +1438,9 @@ var AssignModal = function AssignModal(props) {
1480
1438
  /*#__PURE__*/ React.createElement(
1481
1439
  'span',
1482
1440
  null,
1483
- getText(
1484
- 'hasBeenSelected',
1485
- props === null || props === void 0 ? void 0 : props.lang,
1486
- ),
1487
- ':',
1488
- ' ',
1489
- getText(
1490
- 'numOfUser',
1491
- props === null || props === void 0 ? void 0 : props.lang,
1492
- areadySelectUser.length || 0,
1493
- ),
1441
+ t('hasBeenSelected'),
1442
+ ': ',
1443
+ t('numOfUser', areadySelectUser.length || 0),
1494
1444
  ),
1495
1445
  /*#__PURE__*/ React.createElement(
1496
1446
  'a',
@@ -1499,7 +1449,7 @@ var AssignModal = function AssignModal(props) {
1499
1449
  return onRemoveAllOrg();
1500
1450
  },
1501
1451
  },
1502
- getText('clear', props === null || props === void 0 ? void 0 : props.lang),
1452
+ t('clear'),
1503
1453
  ),
1504
1454
  ),
1505
1455
  /*#__PURE__*/ React.createElement(
package/es/AssignModal/AssignApp/Edit_without_TntdVirtualTree.js CHANGED
@@ -188,37 +188,37 @@ var AssignModal = function AssignModal(props) {
188
188
  checkedKeys = _useState8[0],
189
189
  setCheckedKeys = _useState8[1];
190
190
  var _useState9 = useState(appCodes || []),
191
- _useState0 = _slicedToArray(_useState9, 2),
192
- appKeys = _useState0[0],
193
- setAppKeys = _useState0[1];
194
- var _useState1 = useState(accounts || []),
195
- _useState10 = _slicedToArray(_useState1, 2),
196
- userKeys = _useState10[0],
197
- setUserKeys = _useState10[1];
198
- var _useState11 = useState(false),
191
+ _useState10 = _slicedToArray(_useState9, 2),
192
+ appKeys = _useState10[0],
193
+ setAppKeys = _useState10[1];
194
+ var _useState11 = useState(accounts || []),
199
195
  _useState12 = _slicedToArray(_useState11, 2),
200
- allOrgChecked = _useState12[0],
201
- setAllOrgChecked = _useState12[1];
196
+ userKeys = _useState12[0],
197
+ setUserKeys = _useState12[1];
202
198
  var _useState13 = useState(false),
203
199
  _useState14 = _slicedToArray(_useState13, 2),
204
- allAppChecked = _useState14[0],
205
- setAllAppChecked = _useState14[1];
200
+ allOrgChecked = _useState14[0],
201
+ setAllOrgChecked = _useState14[1];
206
202
  var _useState15 = useState(false),
207
203
  _useState16 = _slicedToArray(_useState15, 2),
208
- allUserChecked = _useState16[0],
209
- setAllUserChecked = _useState16[1];
210
- var _useState17 = useState(),
204
+ allAppChecked = _useState16[0],
205
+ setAllAppChecked = _useState16[1];
206
+ var _useState17 = useState(false),
211
207
  _useState18 = _slicedToArray(_useState17, 2),
212
- filterOrg = _useState18[0],
213
- setFilterOrg = _useState18[1];
208
+ allUserChecked = _useState18[0],
209
+ setAllUserChecked = _useState18[1];
214
210
  var _useState19 = useState(),
215
211
  _useState20 = _slicedToArray(_useState19, 2),
216
- filterUser = _useState20[0],
217
- setFilterUser = _useState20[1];
212
+ filterOrg = _useState20[0],
213
+ setFilterOrg = _useState20[1];
218
214
  var _useState21 = useState(),
219
215
  _useState22 = _slicedToArray(_useState21, 2),
220
- filterApp = _useState22[0],
221
- setFilterApp = _useState22[1];
216
+ filterUser = _useState22[0],
217
+ setFilterUser = _useState22[1];
218
+ var _useState23 = useState(),
219
+ _useState24 = _slicedToArray(_useState23, 2),
220
+ filterApp = _useState24[0],
221
+ setFilterApp = _useState24[1];
222
222
  useEffect(
223
223
  function () {
224
224
  // path 和 allOrgList 赋值
package/es/AssignModal/AssignApp/View.js CHANGED
@@ -105,7 +105,23 @@ var AssignModal = function AssignModal(props) {
105
105
  userTitle = props.userTitle,
106
106
  _props$userList = props.userList,
107
107
  userList = _props$userList === void 0 ? [] : _props$userList,
108
- showUser = props.showUser;
108
+ showUser = props.showUser,
109
+ locale = props.locale;
110
+
111
+ // 封装 getText，自动传入 locale
112
+ var t = function t(key) {
113
+ for (
114
+ var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1;
115
+ _key < _len;
116
+ _key++
117
+ ) {
118
+ params[_key - 1] = arguments[_key];
119
+ }
120
+ return getText.apply(
121
+ void 0,
122
+ [key, props === null || props === void 0 ? void 0 : props.lang, locale].concat(params),
123
+ );
124
+ };
109
125
  var _dataItem$appCodes = dataItem.appCodes,
110
126
  appCodes = _dataItem$appCodes === void 0 ? [] : _dataItem$appCodes,
111
127
  _dataItem$orgCodes = dataItem.orgCodes,
@@ -163,13 +179,13 @@ var AssignModal = function AssignModal(props) {
163
179
  filterOrg = _useState8[0],
164
180
  setFilterOrg = _useState8[1];
165
181
  var _useState9 = useState(),
166
- _useState0 = _slicedToArray(_useState9, 2),
167
- filterUser = _useState0[0],
168
- setFilterUser = _useState0[1];
169
- var _useState1 = useState(),
170
- _useState10 = _slicedToArray(_useState1, 2),
171
- filterApp = _useState10[0],
172
- setFilterApp = _useState10[1];
182
+ _useState10 = _slicedToArray(_useState9, 2),
183
+ filterUser = _useState10[0],
184
+ setFilterUser = _useState10[1];
185
+ var _useState11 = useState(),
186
+ _useState12 = _slicedToArray(_useState11, 2),
187
+ filterApp = _useState12[0],
188
+ setFilterApp = _useState12[1];
173
189
  useEffect(
174
190
  function () {
175
191
  // path 和 allOrgList 赋值
@@ -498,11 +514,7 @@ var AssignModal = function AssignModal(props) {
498
514
  {
499
515
  className: 'title',
500
516
  },
501
- orgTitle ||
502
- getText(
503
- 'authorizesOrgList',
504
- props === null || props === void 0 ? void 0 : props.lang,
505
- ),
517
+ orgTitle || t('authorizesOrgList'),
506
518
  ),
507
519
  ),
508
520
  /*#__PURE__*/ React.createElement(
@@ -517,10 +529,7 @@ var AssignModal = function AssignModal(props) {
517
529
  },
518
530
  /*#__PURE__*/ React.createElement(_Input, {
519
531
  size: 'small',
520
- placeholder: getText(
521
- 'search',
522
- props === null || props === void 0 ? void 0 : props.lang,
523
- ),
532
+ placeholder: t('search'),
524
533
  onChange: function onChange(e) {
525
534
  debouncedOrgSearch(e.target.value);
526
535
  },
@@ -550,11 +559,7 @@ var AssignModal = function AssignModal(props) {
550
559
  {
551
560
  className: 'title',
552
561
  },
553
- appTitle ||
554
- getText(
555
- 'authorizesAppList',
556
- props === null || props === void 0 ? void 0 : props.lang,
557
- ),
562
+ appTitle || t('authorizesAppList'),
558
563
  ),
559
564
  ),
560
565
  /*#__PURE__*/ React.createElement(
@@ -566,10 +571,7 @@ var AssignModal = function AssignModal(props) {
566
571
  onChange: function onChange(e) {
567
572
  debouncedAppSearch(e.target.value);
568
573
  },
569
- placeholder: getText(
570
- 'enterAppName',
571
- props === null || props === void 0 ? void 0 : props.lang,
572
- ),
574
+ placeholder: t('enterAppName'),
573
575
  size: 'small',
574
576
  suffix: /*#__PURE__*/ React.createElement(_Icon, {
575
577
  type: 'zoom',
@@ -603,11 +605,7 @@ var AssignModal = function AssignModal(props) {
603
605
  {
604
606
  className: 'title',
605
607
  },
606
- userTitle ||
607
- getText(
608
- 'authorizesUserList',
609
- props === null || props === void 0 ? void 0 : props.lang,
610
- ),
608
+ userTitle || t('authorizesUserList'),
611
609
  ),
612
610
  ),
613
611
  /*#__PURE__*/ React.createElement(
@@ -617,10 +615,7 @@ var AssignModal = function AssignModal(props) {
617
615
  },
618
616
  /*#__PURE__*/ React.createElement(_Input, {
619
617
  size: 'small',
620
- placeholder: getText(
621
- 'enterUserName',
622
- props === null || props === void 0 ? void 0 : props.lang,
623
- ),
618
+ placeholder: t('enterUserName'),
624
619
  onChange: function onChange(e) {
625
620
  debouncedUserSearch(e.target.value);
626
621
  },
package/es/AssignModal/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import _Drawer from 'tntd/es/drawer';
2
- var _excluded = ['visible', 'close', 'disabled', 'title', 'onSubmit'];
2
+ var _excluded = ['visible', 'close', 'disabled', 'title', 'onSubmit', 'locale'];
3
3
  function _extends() {
4
4
  return (
5
5
  (_extends = Object.assign
@@ -83,9 +83,9 @@ function _objectWithoutProperties(e, t) {
83
83
  r,
84
84
  i = _objectWithoutPropertiesLoose(e, t);
85
85
  if (Object.getOwnPropertySymbols) {
86
- var n = Object.getOwnPropertySymbols(e);
87
- for (r = 0; r < n.length; r++)
88
- (o = n[r]), -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
86
+ var s = Object.getOwnPropertySymbols(e);
87
+ for (r = 0; r < s.length; r++)
88
+ (o = s[r]), t.includes(o) || ({}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]));
89
89
  }
90
90
  return i;
91
91
  }
@@ -94,7 +94,7 @@ function _objectWithoutPropertiesLoose(r, e) {
94
94
  var t = {};
95
95
  for (var n in r)
96
96
  if ({}.hasOwnProperty.call(r, n)) {
97
- if (-1 !== e.indexOf(n)) continue;
97
+ if (e.includes(n)) continue;
98
98
  t[n] = r[n];
99
99
  }
100
100
  return t;
@@ -112,6 +112,7 @@ var AssignModal = function AssignModal(props) {
112
112
  _props$title = props.title,
113
113
  title = _props$title === void 0 ? '' : _props$title,
114
114
  onSubmit = props.onSubmit,
115
+ locale = props.locale,
115
116
  restProps = _objectWithoutProperties(props, _excluded);
116
117
  var _useState = useState({}),
117
118
  _useState2 = _slicedToArray(_useState, 2),
@@ -148,6 +149,7 @@ var AssignModal = function AssignModal(props) {
148
149
  (props === null || props === void 0 ? void 0 : props.lang) ||
149
150
  cookies.get('lang') ||
150
151
  'cn',
152
+ locale: locale,
151
153
  },
152
154
  restProps,
153
155
  ),
package/es/locale.js CHANGED
@@ -1,3 +1,22 @@
1
+ function _typeof(o) {
2
+ '@babel/helpers - typeof';
3
+ return (
4
+ (_typeof =
5
+ 'function' == typeof Symbol && 'symbol' == typeof Symbol.iterator
6
+ ? function (o) {
7
+ return typeof o;
8
+ }
9
+ : function (o) {
10
+ return o &&
11
+ 'function' == typeof Symbol &&
12
+ o.constructor === Symbol &&
13
+ o !== Symbol.prototype
14
+ ? 'symbol'
15
+ : typeof o;
16
+ }),
17
+ _typeof(o)
18
+ );
19
+ }
1
20
  import Cookies from 'universal-cookie';
2
21
  var cookies = new Cookies();
3
22
  export var zh_CN = {
@@ -38,26 +57,57 @@ export var en_US = {
38
57
  enterAppName: 'Enter Channel name',
39
58
  enterUserName: 'Enter Account name',
40
59
  };
41
- export var getText = function getText(key, language) {
42
- var _ref;
43
- var text =
44
- (_ref =
45
- {
46
- cn: zh_CN,
47
- en: en_US,
48
- }[language || getLanguage()] || zh_CN) === null || _ref === void 0
49
- ? void 0
50
- : _ref[key];
60
+
61
+ // 内置语言包
62
+ var builtInLocales = {
63
+ cn: zh_CN,
64
+ en: en_US,
65
+ };
66
+
67
+ /**
68
+ * 获取文本，支持外部传入的语言包覆盖
69
+ * @param {string} key - 文本 key
70
+ * @param {string} language - 语言标识
71
+ * @param {Object} locale - 外部传入的语言包（可选），通过 createOtp 生成的扁平对象
72
+ * @param {...any} params - 替换参数
73
+ */
74
+ export var getText = function getText(key, language, locale) {
75
+ var _actualLocale$key, _actualLocale, _actualParams;
76
+ // 兼容旧的调用方式：getText(key, language, ...params)
77
+ // 新的调用方式：getText(key, language, locale, ...params)
78
+ var actualLocale = locale;
51
79
  for (
52
- var _len = arguments.length, params = new Array(_len > 2 ? _len - 2 : 0), _key = 2;
80
+ var _len = arguments.length, params = new Array(_len > 3 ? _len - 3 : 0), _key = 3;
53
81
  _key < _len;
54
82
  _key++
55
83
  ) {
56
- params[_key - 2] = arguments[_key];
84
+ params[_key - 3] = arguments[_key];
57
85
  }
58
- if (params === null || params === void 0 ? void 0 : params.length) {
59
- return params.reduce(function (acc, cur) {
60
- return acc.replace(/%s/, cur);
86
+ var actualParams = params;
87
+
88
+ // 如果 locale 不是对象或为 null，则认为是旧的调用方式
89
+ if (_typeof(locale) !== 'object' || locale === null) {
90
+ actualLocale = null;
91
+ actualParams = locale !== undefined ? [locale].concat(params) : params;
92
+ }
93
+ var lang = language || getLanguage();
94
+ var builtIn = builtInLocales[lang] || zh_CN;
95
+
96
+ // locale 是扁平对象（通过 createOtp 生成），直接覆盖内置语言包
97
+ var text =
98
+ (_actualLocale$key =
99
+ (_actualLocale = actualLocale) === null || _actualLocale === void 0
100
+ ? void 0
101
+ : _actualLocale[key]) !== null && _actualLocale$key !== void 0
102
+ ? _actualLocale$key
103
+ : builtIn[key];
104
+ if (
105
+ (_actualParams = actualParams) === null || _actualParams === void 0
106
+ ? void 0
107
+ : _actualParams.length
108
+ ) {
109
+ return actualParams.reduce(function (acc, cur) {
110
+ return acc === null || acc === void 0 ? void 0 : acc.replace(/%s/, cur);
61
111
  }, text);
62
112
  }
63
113
  return text;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tddc/assign-modal",
3
- "version": "3.0.8",
3
+ "version": "3.0.9",
4
4
  "description": "assign-modal",
5
5
  "author": "zj <jun.zhang002383@tongdun.net>",
6
6
  "license": "ISC",