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

package/dist/sortable.umd.js

@@ -20446,7 +20446,11 @@
         if(ctx && ctx.isLookup){
             linkTarget = "target='_blank'";
         }
-        return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
+        if(ctx.isRelated && window.innerWidth >= 768){
+            return `<a href="${href}" ${linkTarget} onclick="return false;">\${${field.name} | raw}</a>`
+        }else {
+            return `<a href="${href}" ${linkTarget}>\${${field.name} | raw}</a>`
+        }
     }
 
     function getRelatedFieldTpl(field, ctx){
@@ -20475,6 +20479,9 @@
         if(_.isString(field.reference_to) || !field.reference_to){
             if(field.multiple){
                 let labelTpl = `<%=item.label%>`;
+                if(ctx.isRelated){
+                    linkTarget = "target='_blank'";
+                }
                 if(!onlyDisplayLookLabel){
                     const href = Router.getObjectDetailPath({
                         formFactor: ctx.formFactor, appId: "<%=data.appId%>", objectName: `<%=item.objectName%>`, recordId: `<%=item.value%>`, _templateType: "JavaScript"
@@ -20497,7 +20504,12 @@
                     const href = Router.getObjectDetailPath({
                         formFactor: ctx.formFactor, appId: "${appId}", objectName: `${objectNameTpl}`, recordId: `${recordIdTpl}`
                     });
-                    labelTpl = `<a href="${href}" ${linkTarget}>${labelTpl}</a>`;
+                    if(ctx.isRelated && window.innerWidth >= 768){
+                        labelTpl = `<a href="${href}" ${linkTarget} onclick="return false;">${labelTpl}</a>`;
+                    }else {
+                        labelTpl = `<a href="${href}" ${linkTarget}>${labelTpl}</a>`;
+                    }
+                    
                 }
                 tpl = labelTpl;
             }
@@ -20612,27 +20624,29 @@
             fieldsArr = lodash.exports.values(fields);
         }
         for (const field of fieldsArr) {
-            //graphql 的  ui\display 中使用的字段需要先在query中查询. 否则会返回null
-            if(field.expand){
-                expandFields.push(field);
-            }else {
-                if(field.name.indexOf('.') < 0){
-                    if(display && (field.type == 'lookup' || field.type == 'master_detail')){
-                        fieldsName.push(`${field.name}`);
-                        displayFields.push(`${field.name}`);
+            if(field.name){
+                //graphql 的  ui\display 中使用的字段需要先在query中查询. 否则会返回null
+                if(field.expand){
+                    expandFields.push(field);
+                }else {
+                    if(field.name.indexOf('.') < 0){
+                        if(display && (field.type == 'lookup' || field.type == 'master_detail')){
+                            fieldsName.push(`${field.name}`);
+                            displayFields.push(`${field.name}`);
+                        }else {
+                            fieldsName.push( field.alias ? `${field.alias}:${field.name}` : field.name);
+                        }
+                        if(lodash.exports.includes(['time','date','datetime','boolean','number','currency'], field.type)){
+                            fieldsName.push(`${field.name}`);
+                        }
+                        if(lodash.exports.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
+                            displayFields.push(`${field.name}`);
+                        }
                     }else {
-                        fieldsName.push( field.alias ? `${field.alias}:${field.name}` : field.name);
+                        objectFieldName = field.name.split('.')[0];
+                        fieldsName.push(objectFieldName);
+                        displayFields.push(objectFieldName);
                     }
-                    if(lodash.exports.includes(['time','date','datetime','boolean','number','currency'], field.type)){
-                        fieldsName.push(`${field.name}`);
-                    }
-                    if(lodash.exports.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
-                        displayFields.push(`${field.name}`);
-                    }
-                }else {
-                    objectFieldName = field.name.split('.')[0];
-                    fieldsName.push(objectFieldName);
-                    displayFields.push(objectFieldName);
                 }
             }
         }
@@ -21914,6 +21928,55 @@
                         columnItem.type = 'color';
                         columnItem.defaultColor = null;
                     }
+
+                    if(window.innerWidth >= 768 && ((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){
+                        
+                        const drawerRecordDetailSchema = {
+                            "type": "steedos-record-detail",
+                            "objectApiName": "${objectName}",
+                            "recordId": `\${${options.idFieldName}}`,
+                            "showBackButton": false,
+                            "showButtons": true,
+                            "data": {
+                              "_inDrawer": true,  // 用于判断是否在抽屉中
+                              "recordLoaded": false, // 重置数据加载状态
+                            }
+                        };
+
+
+                        if(!(field.is_name || field.name === options.labelFieldName)){
+                            drawerRecordDetailSchema.objectApiName = field.reference_to;
+                            drawerRecordDetailSchema.recordId = `\${_display.${field.name}.value}`;
+                        }
+                        
+                        columnItem.onEvent = {
+                            "click": {
+                              "actions": [
+                                {
+                                    "actionType": "drawer",
+                                    "drawer": {
+                                      "type": "drawer",
+                                      "title": "&nbsp;",
+                                      "headerClassName": "hidden",
+                                      "size": "lg",
+                                      "bodyClassName": "p-0 m-0",
+                                      "closeOnEsc": true,
+                                      "closeOnOutside": true,
+                                      "resizable": true,
+                                      "actions": [],
+                                      "body": [
+                                        drawerRecordDetailSchema
+                                      ],
+                                      "className": "steedos-record-detail-drawer app-popover",
+                                      "id": "u:fc5f055afa8c"
+                                    },
+                                    "preventDefault": true
+                                }
+                              ]
+                            }
+                        };
+                    }
+
                 }
             }
             if(columnItem){
@@ -21962,7 +22025,7 @@
         let isNewLine = false;
         let isLeft = true;
         let lineChildrenClassName = "";
-        let lineClassName = "flex items-center justify-between";
+        let lineClassName = "flex items-center justify-between mb-1";
         tpls.forEach(function(item){
             if(isNewLine && lines.length < maxLineCount){
                 lines.push({
@@ -22563,8 +22626,8 @@
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-11-01 15:51:00
-     * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-     * @LastEditTime: 2023-09-25 14:53:05
+     * @LastEditors: baozhoutao@steedos.com
+     * @LastEditTime: 2024-02-18 18:37:35
      * @Description: 
      */
 
@@ -22604,13 +22667,13 @@
             const recordId = _master.recordId;
             let relatedKeySaveValue = recordId;
             const relatedField = fields[relatedKey];
-            if(relatedField.reference_to_field && relatedField.reference_to_field !== '_id'){
+            if(relatedField && relatedField.reference_to_field && relatedField.reference_to_field !== '_id'){
                 relatedKeySaveValue = _master.record[relatedField.reference_to_field];
             }
             let relatedKeyValue; 
-            if(!_.isString(relatedField.reference_to)){
+            if(relatedField && !_.isString(relatedField.reference_to)){
                 relatedKeyValue = { o: masterObjectName, ids: [relatedKeySaveValue] };
-            }else if (relatedField.multiple) {
+            }else if (relatedField && relatedField.multiple) {
                 relatedKeyValue = [relatedKeySaveValue];
             } else {
                 relatedKeyValue = relatedKeySaveValue;
@@ -24945,8 +25008,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-07-05 15:55:39
-     * @LastEditors: liaodaxue
-     * @LastEditTime: 2024-02-05 17:56:27
+     * @LastEditors: baozhoutao@steedos.com
+     * @LastEditTime: 2024-02-18 16:05:21
      * @Description:
      */
 
@@ -26385,6 +26448,33 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
     }
 
+    async function getAutoFill(field, refObject) {
+        let autoFillMapping = field.auto_fill_mapping;
+        if (autoFillMapping && autoFillMapping.length) {
+            let fillMapping = {};
+            let fieldsForApi = [];
+            autoFillMapping.forEach(function (item) {
+                fillMapping[item.to] = `\${${item.from}}`;
+                fieldsForApi.push(item.from);
+            });
+            // let api = {
+            //     // "url": "/amis/api/mock2/form/autoUpdate?browser=${browser}&version=${version}",
+            //     "url": `/api/v1/${refObject.name}/\${${field.name}}?fields=${JSON.stringify(fieldsForApi)}`,
+            //     // "responseData": {
+            //     //     "name": "${name}"
+            //     // },
+            //     "silent": false
+            // }
+            // return {
+            //     fillMapping,
+            //     // api
+            // }
+            // 因为autoFill中配置了api的话，在表单初始化（比如新建记录）时并不会触发执行autoFill，所以只能暂时不用api
+            // 给amis报过问题了，见：https://github.com/baidu/amis/issues/9631
+            return fillMapping;
+        }
+    }
+
     async function lookupToAmis(field, readonly, ctx){
         if(!ctx){
             ctx = {};
@@ -26468,6 +26558,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 amisSchema = lodash.exports.defaultsDeep({}, pageAmisSchema, amisSchema);
             }
         }
+        const autoFill = await getAutoFill(field);
+        if(autoFill){
+            amisSchema.autoFill = autoFill;
+        }
         return amisSchema;
     }
 
@@ -26639,6 +26733,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                           {
                             "type": "editor",
                             "name": field.name,
+                            "labelClassName": "none",
                             "language": "markdown",
                           }
                         ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.3",
+  "version": "3.6.4-beta.2",
   "main": "dist/sortable.cjs.js",
   "module": "dist/sortable.esm.js",
   "unpkg": "dist/sortable.umd.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/sortable": "^7.0.1",
-    "@steedos-widgets/amis-lib": "3.6.3"
+    "@steedos-widgets/amis-lib": "3.6.4-beta.2"
   },
-  "gitHead": "7452deb6cf82a1c24e1f645cd2d243efa126521b"
+  "gitHead": "74e7975b7f134d1192dea186f90e0a1c6c11275c"
 }