@steedos-widgets/amis-lib 1.2.0-beta.1 → 1.2.0-beta.2

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/dist/index.umd.js CHANGED
@@ -360,7 +360,7 @@
360
360
  * @Author: baozhoutao@steedos.com
361
361
  * @Date: 2022-08-16 17:02:08
362
362
  * @LastEditors: baozhoutao@steedos.com
363
- * @LastEditTime: 2023-03-03 14:52:18
363
+ * @LastEditTime: 2023-04-11 09:57:37
364
364
  * @Description:
365
365
  */
366
366
 
@@ -387,10 +387,11 @@
387
387
  },
388
388
  getObjectDetailPath(props){
389
389
  const {formFactor, appId, objectName, recordId, listViewName, _templateType} = props;
390
+ // var urlParams = new URLSearchParams(window.location.search);
390
391
  // if(objectName === 'instances'){
391
392
  // return `/workflow/space/\${context.tenantId}/\${listName}/${recordId}`;
392
393
  // }
393
- const displayAs = Router.getTabDisplayAs(objectName);
394
+ const displayAs = Router.getTabDisplayAs(objectName); //urlParams.get("display") ||
394
395
  if(_templateType === 'JavaScript'){
395
396
  return `/app/${appId}/${objectName}/view/${recordId}?display=${displayAs}&side_object=<%=item.objectName%>&side_listview_id=<%=item.listName%>`;
396
397
  }
@@ -406,7 +407,7 @@
406
407
  * @Author: baozhoutao@steedos.com
407
408
  * @Date: 2022-05-23 09:53:08
408
409
  * @LastEditors: baozhoutao@steedos.com
409
- * @LastEditTime: 2023-03-09 10:00:44
410
+ * @LastEditTime: 2023-04-10 11:22:54
410
411
  * @Description:
411
412
  */
412
413
 
@@ -601,6 +602,7 @@
601
602
  case 'number':
602
603
  case 'currency':
603
604
  return await getNumberTpl(field);
605
+ case 'percent':
604
606
  case 'formula':
605
607
  case 'summary':
606
608
  return getUiFieldTpl(field)
@@ -633,7 +635,7 @@
633
635
  if(_$1.includes(['time','date','datetime','boolean','number','currency'], field.type)){
634
636
  fieldsName.push(`${field.name}`);
635
637
  }
636
- if(_$1.includes(['time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
638
+ if(_$1.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
637
639
  displayFields.push(`${field.name}`);
638
640
  }
639
641
  }
@@ -1388,7 +1390,7 @@
1388
1390
  * @Author: baozhoutao@steedos.com
1389
1391
  * @Date: 2022-11-01 15:51:00
1390
1392
  * @LastEditors: Please set LastEditors
1391
- * @LastEditTime: 2023-04-08 12:05:19
1393
+ * @LastEditTime: 2023-04-11 13:58:24
1392
1394
  * @Description:
1393
1395
  */
1394
1396
 
@@ -1412,16 +1414,20 @@
1412
1414
  const relatedKey = _master.relatedKey;
1413
1415
  const masterObjectName = _master.objectName;
1414
1416
  const recordId = _master.recordId;
1417
+ let relatedKeySaveValue = recordId;
1415
1418
  const fields = ${JSON.stringify(uiSchema.fields)};
1416
1419
  const relatedField = fields[relatedKey];
1420
+ if(relatedField.reference_to_field && relatedField.reference_to_field !== '_id'){
1421
+ relatedKeySaveValue = _master.record[relatedField.reference_to_field];
1422
+ }
1417
1423
  let defaultData = {};
1418
1424
  let relatedKeyValue;
1419
1425
  if(!_.isString(relatedField.reference_to)){
1420
- relatedKeyValue = { o: masterObjectName, ids: [recordId] };
1426
+ relatedKeyValue = { o: masterObjectName, ids: [relatedKeySaveValue] };
1421
1427
  }else if (relatedField.multiple) {
1422
- relatedKeyValue = [recordId];
1428
+ relatedKeyValue = [relatedKeySaveValue];
1423
1429
  } else {
1424
- relatedKeyValue = recordId;
1430
+ relatedKeyValue = relatedKeySaveValue;
1425
1431
  }
1426
1432
  defaultData[relatedKey]=relatedKeyValue;
1427
1433
  if(payload.schema){
@@ -1457,7 +1463,6 @@
1457
1463
  "_master": "${_master}",
1458
1464
  "_master._isRelated": "${_isRelated}",
1459
1465
  "_master.relatedKey": "${relatedKey}",
1460
- "defaultData": "${defaultData}",
1461
1466
  "appId": "${appId}",
1462
1467
  "objectName": "${objectName}",
1463
1468
  "context": "${context}",
@@ -1514,7 +1519,7 @@
1514
1519
  * @Author: baozhoutao@steedos.com
1515
1520
  * @Date: 2022-07-13 15:18:03
1516
1521
  * @LastEditors: baozhoutao@steedos.com
1517
- * @LastEditTime: 2022-11-08 09:35:03
1522
+ * @LastEditTime: 2023-04-11 10:34:26
1518
1523
  * @Description:
1519
1524
  */
1520
1525
 
@@ -1522,6 +1527,13 @@
1522
1527
  const api = `/api/pageSchema/${type}?app=${appId}&objectApiName=${objectName}&recordId=${recordId}&pageId=${pageId}&formFactor=${formFactor}`;
1523
1528
  const page = await fetchAPI(api);
1524
1529
  if (page && page.schema) {
1530
+ page.schema = JSON.parse(page.schema);
1531
+ if(page.schema.data){
1532
+ delete page.schema.data.recordId;
1533
+ delete page.schema.data.objectName;
1534
+ delete page.schema.data.context;
1535
+ delete page.schema.data.global;
1536
+ }
1525
1537
  return page;
1526
1538
  }
1527
1539
  }
@@ -7502,8 +7514,8 @@ setTimeout(()=>{
7502
7514
  /*
7503
7515
  * @Author: baozhoutao@steedos.com
7504
7516
  * @Date: 2022-07-05 15:55:39
7505
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
7506
- * @LastEditTime: 2023-04-08 18:14:55
7517
+ * @LastEditors: Please set LastEditors
7518
+ * @LastEditTime: 2023-04-11 13:13:00
7507
7519
  * @Description:
7508
7520
  */
7509
7521
 
@@ -7625,8 +7637,6 @@ setTimeout(()=>{
7625
7637
  }
7626
7638
  }
7627
7639
  }
7628
-
7629
- let relatedValue = "${recordId}";
7630
7640
  // if(refField.reference_to_field && refField.reference_to_field != '_id'){
7631
7641
  // const masterRecord = await getRecord(objectName, recordId, [refField.reference_to_field]);
7632
7642
  // relatedValue = masterRecord[refField.reference_to_field]
@@ -7688,14 +7698,7 @@ setTimeout(()=>{
7688
7698
  _isRelated: true
7689
7699
  },
7690
7700
  body:[
7691
- {
7692
- ...amisSchema,
7693
- data: {
7694
- defaultData: {
7695
- ...{[relatedKey]: getRelatedFieldValue(objectName, relatedValue, relatedObjectUiSchema, relatedKey)}
7696
- }
7697
- }
7698
- }
7701
+ amisSchema
7699
7702
  ]
7700
7703
  }
7701
7704
  };
@@ -7848,7 +7851,7 @@ setTimeout(()=>{
7848
7851
  * @Author: baozhoutao@steedos.com
7849
7852
  * @Date: 2022-07-05 15:55:39
7850
7853
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
7851
- * @LastEditTime: 2023-04-08 17:31:57
7854
+ * @LastEditTime: 2023-04-11 11:28:11
7852
7855
  * @Description:
7853
7856
  */
7854
7857
 
@@ -8297,35 +8300,19 @@ setTimeout(()=>{
8297
8300
  amisSchema: {
8298
8301
  "type": "service",
8299
8302
  "body": [
8300
- {
8301
- "type": "steedos-record-detail-header",
8302
- "label": "标题面板",
8303
- "objectApiName": "${objectName}",
8304
- "recordId": "${recordId}",
8305
- "id": "u:48d2c28eb755",
8306
- onEvent: {
8307
- "recordLoaded": {
8308
- "actions": [
8309
- {
8310
- "actionType": "reload",
8311
- "data": {
8312
- "name": `\${event.data.record.${uiSchema?.NAME_FIELD_KEY || 'name'}}`,
8313
- "record": `\${event.data.record}`,
8314
- "_id": "\${event.data.record._id}",
8315
- "recordId": "\${event.data.record._id}",
8316
- "recordLoaded": true,
8317
- }
8318
- }
8319
- ]
8320
- }
8303
+ {
8304
+ "type": "steedos-record-detail-header",
8305
+ "label": "标题面板",
8306
+ "objectApiName": "${objectName}",
8307
+ "recordId": "${recordId}",
8308
+ "id": "u:48d2c28eb755"
8321
8309
  },
8322
- },
8323
- content
8310
+ content
8324
8311
  ],
8325
- // data: {
8326
- // "_master.objectName": "${objectName}",
8327
- // "_master.recordId": "${recordId}"
8328
- // },
8312
+ data: {
8313
+ "_master.objectName": "${objectName}",
8314
+ "_master.recordId": "${recordId}"
8315
+ },
8329
8316
  onEvent: {
8330
8317
  "recordLoaded": {
8331
8318
  "actions": [
@@ -8333,10 +8320,10 @@ setTimeout(()=>{
8333
8320
  "actionType": "reload",
8334
8321
  "data": {
8335
8322
  "name": `\${record.${uiSchema.NAME_FIELD_KEY || 'name'}}`,
8336
- // "_master.record": `\${record}`,
8337
- // // 不清楚reload 如何给对象下的某个key复制, 所以此处重复设置_master的objectName、recordId
8338
- // "_master.objectName": "${objectName}",
8339
- // "_master.recordId": "${recordId}"
8323
+ "_master.record": `\${record}`,
8324
+ // 不清楚reload 如何给对象下的某个key复制, 所以此处重复设置_master的objectName、recordId
8325
+ "_master.objectName": "${objectName}",
8326
+ "_master.recordId": "${recordId}"
8340
8327
  }
8341
8328
  }
8342
8329
  ]