@steedos-widgets/sortable 6.3.0-beta.15 → 6.3.0-beta.17

package/dist/sortable.umd.js

@@ -20800,6 +20800,29 @@
         }
     }
 
+    /*
+     * @Author: baozhoutao@steedos.com
+     * @Date: 2022-07-13 15:18:03
+     * @LastEditors: baozhoutao@steedos.com
+     * @LastEditTime: 2023-04-11 10:34:26
+     * @Description: 
+     */
+
+    async function getPage({type, pageId = '', appId, objectName = '', recordId = '', formFactor = 'LARGE'}){
+        const api = `/api/pageSchema/${type}?app=${appId}&objectApiName=${objectName}&recordId=${recordId}&pageId=${pageId}&formFactor=${formFactor}`;
+        const page = await fetchAPI(api);
+        if (page && page.schema) {
+            page.schema = JSON.parse(page.schema);
+            if(page.schema.data){
+                delete page.schema.data.recordId;
+                delete page.schema.data.objectName;
+                delete page.schema.data.context;
+                delete page.schema.data.global;
+            }
+            return page;
+        }
+    }
+
     /*
      * @Author: baozhoutao@steedos.com
      * @Date: 2022-10-28 14:15:09
@@ -20823,9 +20846,74 @@
         return getAmisStaticFieldType(steedosField.type === 'avatar' ? 'image' : steedosField.type, readonly, {multiple: steedosField.multiple});
     };
 
-    const getAmisFileReadonlySchema = (steedosField)=>{
+    async function getLookupLinkOnClick(field, options) {
+        const recordPage = await getPage({ type: 'record', appId: options.appId, objectName: options.objectName, formFactor: options.formFactor });
+
+        const drawerRecordDetailSchema = recordPage ? Object.assign({}, recordPage.schema, {
+            "recordId": "${value}",
+            "data": {
+                ...recordPage.schema.data,
+                "_inDrawer": true,  // 用于判断是否在抽屉中
+                "recordLoaded": false, // 重置数据加载状态
+                "objectName": options.objectName,
+            }
+        }) : {
+            "type": "steedos-record-detail",
+            "objectApiName": options.objectName,
+            "recordId": "${value}",
+            "showBackButton": false,
+            "showButtons": true,
+            "data": {
+                "_inDrawer": true,  // 用于判断是否在抽屉中
+                "recordLoaded": false, // 重置数据加载状态
+            }
+        };
+        return {
+            "click": {
+                "actions": [
+                    // {
+                    //     "type": "custom",
+                    //     "script": `
+                    //         let fileRecordId = url.match(${regFileRecordId})[2]; 
+                    //         console.log('fileRecordId:',fileRecordId);
+                    //         event.data.recordId = fileRecordId;
+                    //     `,
+                    // },
+                    {
+                        "actionType": "drawer",
+                        "drawer": {
+                            "type": "drawer",
+                            "title": " ",
+                            "headerClassName": "hidden",
+                            "size": "lg",
+                            "bodyClassName": "p-0 m-0 bg-gray-100",
+                            "closeOnEsc": true,
+                            "closeOnOutside": true,
+                            "resizable": true,
+                            "actions": [],
+                            "body": [
+                                drawerRecordDetailSchema
+                            ],
+                            "className": "steedos-record-detail-drawer app-popover"
+                        },
+                        "preventDefault": true
+                    }
+                ]
+            }
+        }
+    }
+
+    const  getAmisFileReadonlySchema = async (steedosField,ctx)=>{
         const type = steedosField.type;
+        const { appId, formFactor } = ctx.amisData || {};
         const amisFieldType = getAmisFieldType$1(steedosField, true);
+        
+        let lookupATagClick = 'onclick="return false;"';
+
+        if(window.innerWidth < 768){
+            lookupATagClick = "";
+        }
+
         if(_.includes(['avatar','image'], type)){
             return {
                 type: amisFieldType,
@@ -20860,13 +20948,34 @@
                     }
                 }
             } : {
-                type: amisFieldType,
-                tpl: `
-                <% let fileData = data._display.${steedosField.name}; if (fileData) { %>
-                    <% if(!Array.isArray(fileData)){ fileData = [fileData]}  %>
-                    <% fileData.forEach(function(item) { %> 
-                        <a href='<%= item.url %>' target='_self' class='block'><%= item.name %></a> 
-                <% });} %>`
+                // type: amisFieldType,
+                // tpl: `
+                //     <% let fileData = data._display.${steedosField.name}; if (fileData) { %>
+                //         <% if(!Array.isArray(fileData)){ fileData = [fileData]}  %>
+                //         <% fileData.forEach(function(item) { %> 
+                //             <a href='<%= item.url %>' target='_self' class='block'><%= item.name %></a> 
+                //     <% });} %>`
+                "type": "control",
+                "body": {
+                    type: 'each',
+                    placeholder: "",
+                    // className: `steedos-field-lookup-each flex flex-wrap gap-2`,
+                    source: `\${_display.${steedosField.name}|asArray}`,
+                    items: {
+                        type: 'static',
+                        labelClassName: "hidden",
+                        label: false,
+                        className: 'm-0',
+                        tpl: `<a href="/app/-/cfs_files_filerecord/view/\${value}" ${lookupATagClick}>\${name}</a>`,
+                        // tpl: "<%= item.name >",
+                        // onEvent: window.innerWidth < 768 ? null : REFERENCE_VALUE_ITEM_ONCLICK
+                        onEvent: window.innerWidth < 768 ? null : await getLookupLinkOnClick(steedosField, {
+                            appId,
+                            objectName: "cfs_files_filerecord",
+                            formFactor
+                        })
+                    }
+                }
             }
         }
     };
@@ -20928,8 +21037,8 @@
         return convertData;
     };
 
-    const getAmisFileSchema = (steedosField, readonly)=>{
-        return readonly ? getAmisFileReadonlySchema(steedosField) : getAmisFileEditSchema(steedosField);
+    const getAmisFileSchema = async (steedosField, readonly, ctx)=>{
+        return readonly ? await getAmisFileReadonlySchema(steedosField,ctx) : getAmisFileEditSchema(steedosField);
     };
 
     var frontend_field_group_generalization$1 = "General";
@@ -21324,29 +21433,6 @@
         }
       });
 
-    /*
-     * @Author: baozhoutao@steedos.com
-     * @Date: 2022-07-13 15:18:03
-     * @LastEditors: baozhoutao@steedos.com
-     * @LastEditTime: 2023-04-11 10:34:26
-     * @Description: 
-     */
-
-    async function getPage({type, pageId = '', appId, objectName = '', recordId = '', formFactor = 'LARGE'}){
-        const api = `/api/pageSchema/${type}?app=${appId}&objectApiName=${objectName}&recordId=${recordId}&pageId=${pageId}&formFactor=${formFactor}`;
-        const page = await fetchAPI(api);
-        if (page && page.schema) {
-            page.schema = JSON.parse(page.schema);
-            if(page.schema.data){
-                delete page.schema.data.recordId;
-                delete page.schema.data.objectName;
-                delete page.schema.data.context;
-                delete page.schema.data.global;
-            }
-            return page;
-        }
-    }
-
     async function getQuickEditSchema(object, columnField, options){
         let field = object.fields[columnField.name];
         //判断在amis3.2以上环境下，放开批量编辑与lookup的单元格编辑
@@ -26239,8 +26325,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             const isAllowCreate = refObjectConfig.permissions.allowCreate;
             const isCreate = lodash.exports.isBoolean(field.create) ? field.create : true;
             // lookup字段配置过滤条件就强制不显示新建按钮
-            let isHasFilters = (field.filters || field.filtersFunction || field._filtersFunction) ? true : false;
-            if (isAllowCreate && isCreate && !isHasFilters) {
+            let hasFilters = !lodash.exports.isEmpty(field.filters) || !!field.filtersFunction || !!field._filtersFunction;
+            if (isAllowCreate && isCreate && !hasFilters) {
                 const new_button = await getSchema$5(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
                 new_button.align = "right";
                 // 保持快速搜索放在最左侧，新建按钮往里插，而不是push到最后
@@ -27574,13 +27660,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 };
                 break;
             case 'avatar':
-                convertData = getAmisFileSchema(field, readonly);
+                convertData = await getAmisFileSchema(field, readonly, ctx);
                 break;
             case 'image':
-                convertData = getAmisFileSchema(field, readonly);
+                convertData = await getAmisFileSchema(field, readonly, ctx);
                 break;
             case 'file':
-                convertData = getAmisFileSchema(field, readonly);
+                convertData = await getAmisFileSchema(field, readonly, ctx);
                 break;
             case 'formula':
                 if(readonly){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "6.3.0-beta.15",
+  "version": "6.3.0-beta.17",
   "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": "6.3.0-beta.15"
+    "@steedos-widgets/amis-lib": "6.3.0-beta.17"
   },
-  "gitHead": "2814297d85c3ef6567fb501ada86fb28edb92b9d"
+  "gitHead": "dd25c4f945f423790ba2fd447daa5136e1d08b11"
 }