@steedos-widgets/sortable 3.6.3 → 3.6.4-beta.1

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 (7) hide show
  1. package/dist/assets.json +5 -5
  2. package/dist/sortable.cjs.js +90 -28
  3. package/dist/sortable.cjs.js.map +1 -1
  4. package/dist/sortable.esm.js +90 -28
  5. package/dist/sortable.esm.js.map +1 -1
  6. package/dist/sortable.umd.js +90 -28
  7. package/package.json +3 -3
package/dist/sortable.umd.js CHANGED
@@ -20446,7 +20446,11 @@
20446
20446
  if(ctx && ctx.isLookup){
20447
20447
  linkTarget = "target='_blank'";
20448
20448
  }
20449
- return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
20449
+ if(ctx.isRelated){
20450
+ return `<a href="${href}" ${linkTarget} onclick="return false;">\${${field.name} | raw}</a>`
20451
+ }else {
20452
+ return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
20453
+ }
20450
20454
  }
20451
20455
 
20452
20456
  function getRelatedFieldTpl(field, ctx){
@@ -20475,6 +20479,9 @@
20475
20479
  if(_.isString(field.reference_to) || !field.reference_to){
20476
20480
  if(field.multiple){
20477
20481
  let labelTpl = `<%=item.label%>`;
20482
+ if(ctx.isRelated){
20483
+ linkTarget = "target='_blank'";
20484
+ }
20478
20485
  if(!onlyDisplayLookLabel){
20479
20486
  const href = Router.getObjectDetailPath({
20480
20487
  formFactor: ctx.formFactor, appId: "<%=data.appId%>", objectName: `<%=item.objectName%>`, recordId: `<%=item.value%>`, _templateType: "JavaScript"
@@ -20497,7 +20504,12 @@
20497
20504
  const href = Router.getObjectDetailPath({
20498
20505
  formFactor: ctx.formFactor, appId: "${appId}", objectName: `${objectNameTpl}`, recordId: `${recordIdTpl}`
20499
20506
  });
20500
- labelTpl = `<a href="${href}" ${linkTarget}>${labelTpl}</a>`;
20507
+ if(ctx.isRelated){
20508
+ labelTpl = `<a href="${href}" ${linkTarget} onclick="return false;">${labelTpl}</a>`;
20509
+ }else {
20510
+ labelTpl = `<a href="${href}" ${linkTarget}>${labelTpl}</a>`;
20511
+ }
20512
+
20501
20513
  }
20502
20514
  tpl = labelTpl;
20503
20515
  }
@@ -20612,27 +20624,29 @@
20612
20624
  fieldsArr = lodash.exports.values(fields);
20613
20625
  }
20614
20626
  for (const field of fieldsArr) {
20615
- //graphql 的 ui\display 中使用的字段需要先在query中查询. 否则会返回null
20616
- if(field.expand){
20617
- expandFields.push(field);
20618
- }else {
20619
- if(field.name.indexOf('.') < 0){
20620
- if(display && (field.type == 'lookup' || field.type == 'master_detail')){
20621
- fieldsName.push(`${field.name}`);
20622
- displayFields.push(`${field.name}`);
20627
+ if(field.name){
20628
+ //graphql 的 ui\display 中使用的字段需要先在query中查询. 否则会返回null
20629
+ if(field.expand){
20630
+ expandFields.push(field);
20631
+ }else {
20632
+ if(field.name.indexOf('.') < 0){
20633
+ if(display && (field.type == 'lookup' || field.type == 'master_detail')){
20634
+ fieldsName.push(`${field.name}`);
20635
+ displayFields.push(`${field.name}`);
20636
+ }else {
20637
+ fieldsName.push( field.alias ? `${field.alias}:${field.name}` : field.name);
20638
+ }
20639
+ if(lodash.exports.includes(['time','date','datetime','boolean','number','currency'], field.type)){
20640
+ fieldsName.push(`${field.name}`);
20641
+ }
20642
+ if(lodash.exports.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
20643
+ displayFields.push(`${field.name}`);
20644
+ }
20623
20645
  }else {
20624
- fieldsName.push( field.alias ? `${field.alias}:${field.name}` : field.name);
20625
- }
20626
- if(lodash.exports.includes(['time','date','datetime','boolean','number','currency'], field.type)){
20627
- fieldsName.push(`${field.name}`);
20646
+ objectFieldName = field.name.split('.')[0];
20647
+ fieldsName.push(objectFieldName);
20648
+ displayFields.push(objectFieldName);
20628
20649
  }
20629
- if(lodash.exports.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
20630
- displayFields.push(`${field.name}`);
20631
- }
20632
- }else {
20633
- objectFieldName = field.name.split('.')[0];
20634
- fieldsName.push(objectFieldName);
20635
- displayFields.push(objectFieldName);
20636
20650
  }
20637
20651
  }
20638
20652
  }
@@ -21914,6 +21928,54 @@
21914
21928
  columnItem.type = 'color';
21915
21929
  columnItem.defaultColor = null;
21916
21930
  }
21931
+
21932
+ if(((field.is_name || field.name === options.labelFieldName) || ((field.type == 'lookup' || field.type == 'master_detail') && lodash.exports.isString(field.reference_to) && field.multiple != true)) && options.isRelated){
21933
+
21934
+ const drawerRecordDetailSchema = {
21935
+ "type": "steedos-record-detail",
21936
+ "objectApiName": "${objectName}",
21937
+ "recordId": `\${${options.idFieldName}}`,
21938
+ "showBackButton": false,
21939
+ "showButtons": true,
21940
+ "data": {
21941
+ "_inDrawer": true, // 用于判断是否在抽屉中
21942
+ "recordLoaded": false, // 重置数据加载状态
21943
+ }
21944
+ };
21945
+
21946
+
21947
+ if(!(field.is_name || field.name === options.labelFieldName)){
21948
+ drawerRecordDetailSchema.objectApiName = field.reference_to;
21949
+ drawerRecordDetailSchema.recordId = `\${_display.${field.name}.value}`;
21950
+ }
21951
+
21952
+ columnItem.onEvent = {
21953
+ "click": {
21954
+ "actions": [
21955
+ {
21956
+ "actionType": "drawer",
21957
+ "drawer": {
21958
+ "type": "drawer",
21959
+ "title": "&nbsp;",
21960
+ "headerClassName": "",
21961
+ "size": "lg",
21962
+ "bodyClassName": "p-0 m-0 border-t",
21963
+ "closeOnEsc": true,
21964
+ "resizable": true,
21965
+ "actions": [],
21966
+ "body": [
21967
+ drawerRecordDetailSchema
21968
+ ],
21969
+ "className": "app-popover",
21970
+ "id": "u:fc5f055afa8c"
21971
+ },
21972
+ "preventDefault": true
21973
+ }
21974
+ ]
21975
+ }
21976
+ };
21977
+ }
21978
+
21917
21979
  }
21918
21980
  }
21919
21981
  if(columnItem){
@@ -22563,8 +22625,8 @@
22563
22625
  /*
22564
22626
  * @Author: baozhoutao@steedos.com
22565
22627
  * @Date: 2022-11-01 15:51:00
22566
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
22567
- * @LastEditTime: 2023-09-25 14:53:05
22628
+ * @LastEditors: baozhoutao@steedos.com
22629
+ * @LastEditTime: 2024-02-18 18:37:35
22568
22630
  * @Description:
22569
22631
  */
22570
22632
 
@@ -22604,13 +22666,13 @@
22604
22666
  const recordId = _master.recordId;
22605
22667
  let relatedKeySaveValue = recordId;
22606
22668
  const relatedField = fields[relatedKey];
22607
- if(relatedField.reference_to_field && relatedField.reference_to_field !== '_id'){
22669
+ if(relatedField && relatedField.reference_to_field && relatedField.reference_to_field !== '_id'){
22608
22670
  relatedKeySaveValue = _master.record[relatedField.reference_to_field];
22609
22671
  }
22610
22672
  let relatedKeyValue;
22611
- if(!_.isString(relatedField.reference_to)){
22673
+ if(relatedField && !_.isString(relatedField.reference_to)){
22612
22674
  relatedKeyValue = { o: masterObjectName, ids: [relatedKeySaveValue] };
22613
- }else if (relatedField.multiple) {
22675
+ }else if (relatedField && relatedField.multiple) {
22614
22676
  relatedKeyValue = [relatedKeySaveValue];
22615
22677
  } else {
22616
22678
  relatedKeyValue = relatedKeySaveValue;
@@ -24945,8 +25007,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
24945
25007
  /*
24946
25008
  * @Author: baozhoutao@steedos.com
24947
25009
  * @Date: 2022-07-05 15:55:39
24948
- * @LastEditors: liaodaxue
24949
- * @LastEditTime: 2024-02-05 17:56:27
25010
+ * @LastEditors: baozhoutao@steedos.com
25011
+ * @LastEditTime: 2024-02-18 16:05:21
24950
25012
  * @Description:
24951
25013
  */
24952
25014
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos-widgets/sortable",
3
- "version": "3.6.3",
3
+ "version": "3.6.4-beta.1",
4
4
  "main": "dist/sortable.cjs.js",
5
5
  "module": "dist/sortable.esm.js",
6
6
  "unpkg": "dist/sortable.umd.js",
@@ -45,7 +45,7 @@
45
45
  "dependencies": {
46
46
  "@dnd-kit/core": "^6.0.5",
47
47
  "@dnd-kit/sortable": "^7.0.1",
48
- "@steedos-widgets/amis-lib": "3.6.3"
48
+ "@steedos-widgets/amis-lib": "3.6.4-beta.1"
49
49
  },
50
- "gitHead": "7452deb6cf82a1c24e1f645cd2d243efa126521b"
50
+ "gitHead": "4845f0b33367b8873df484ef174863d6789d4d43"
51
51
  }