@steedos-widgets/amis-lib 3.6.2-beta.17 → 3.6.2-beta.19

package/dist/index.esm.js

@@ -2127,7 +2127,7 @@ async function getTableColumns(fields, options){
             const previewFileScript = `
                 var data = event.data;
                 var file_name = data.versions ? data.name : "${field.label}";
-                var file_id = data._id;
+                var file_id = data.versions && data.versions[0] && data.versions[0]._id;
                 window.previewFile && window.previewFile({file_name, file_id});
             `;
             columnItem = {
@@ -2976,7 +2976,13 @@ async function getTableApi(mainObject, fields, options){
                     value = [value]
                 };
                 if(field.type === 'file'){
-                    item[key] = value
+                    // item[key] = value
+                    // PC客户端附件子表列表点击标题预览附件功能依赖了_id，所以这里拼出来
+                    let itemKeyValue = item[key];
+                    item[key] = value.map(function(item, index){
+                        item._id = itemKeyValue[index];
+                        return item;
+                    });
                 }else{
                     item[key] = _.map(value, (item)=>{
                         if(field.type === 'image'){
@@ -6930,7 +6936,7 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
         "className": "flex justify-between"
       }
     ],
-    "className": "steedos-record-related-header py-2 px-0"
+    "className": "steedos-record-related-header py-2 px-3 bg-gray-50 border"
   };
   return recordRelatedListHeader;
 }
@@ -8343,7 +8349,6 @@ async function getObjectFilter(objectSchema, fields, options) {
         "timeOut": 1000
       }
     });
-    resizeWindow();
     const scope = event.context.scoped;
     // let filterFormValues = event.data;
     let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
@@ -9230,7 +9235,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         setDataToComponentId: componentId,
         // tableHiddenOn: hiddenEmptyTable ? "this.$count === 0" : null,
         appId: appId,
-        crudClassName: 'steedos-record-related-crud hidden',
+        crudClassName: 'steedos-record-related-crud border-l border-r hidden',
         refField,
         ...ctx
     };
@@ -9243,7 +9248,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         amisSchema: {
             type: "service",
             id: componentId,
-            className: `steedos-record-related-list py-2 first:pt-0 border-b-0 last:border-b-0 ${componentId} ${className}`,
+            className: `steedos-record-related-list mb-4 last:mb-0 ${componentId} ${className}`,
             data: {
                 relatedKey: relatedKey,   
                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
@@ -9989,7 +9994,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     };
     const content = {
         "type": "tabs",
-        "className": "steedos-record-tabs bg-white p-4 m-0 border-b",
+        "className": "steedos-record-tabs bg-white p-4 mt-3 border-y",
         "contentClassName": "bg-none",
         "tabs": [
             detailed
@@ -12206,13 +12211,31 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             };
             break;
         case 'input-datetime-range':
+            // convertData = {
+            //     type: "input-datetime-range",
+            //     inputFormat: 'YYYY-MM-DD HH:mm',
+            //     format:'YYYY-MM-DDTHH:mm:ss.SSSZ',
+            //     tpl: readonly ? Tpl.getDateTimeTpl(field) : null,
+            //     utc: true,
+            //     joinValues: false
+            // }
+            // 日期时间字段，按日期方式展现显示控件，用户不用关心小时分钟
             convertData = {
-                type: "input-datetime-range",
-                inputFormat: 'YYYY-MM-DD HH:mm',
+                type: "input-date-range",
+                inputFormat: "YYYY-MM-DD HH:mm",
                 format:'YYYY-MM-DDTHH:mm:ss.SSSZ',
                 tpl: readonly ? getDateTimeTpl(field) : null,
                 utc: true,
-                joinValues: false
+                joinValues: false,
+                "shortcuts": [
+                    "thismonth",
+                    "2monthsago",
+                    "3monthslater",
+                    "prevquarter",
+                    "thisquarter",
+                    "thisyear",
+                    "lastYear"
+                  ]
             };
             break;
         case 'datetime':
@@ -12729,8 +12752,9 @@ async function getFieldSearchable(perField, permissionFields, ctx){
             fieldNamePrefix = `${fieldNamePrefix}between__`;
         }
         if(_field.type === 'datetime'){
-            // 特意改为日期范围而不是日期时间范围，因为搜索时一般精确到日期就足够了，需要精确到日期时间范围需要在字段上配置amis属性来实现
-            _field.type = 'input-date-range';
+            // 这里如果想把搜索范围展示效果改为日期范围，不可以直接改为input-date-range，因为它们规则不一样，包括时区规则和小时分秒的存值规则都不一样
+            // 所以想改为展示日期范围效果，只能改input-datetime-range类型本身的属性来实现
+            _field.type = 'input-datetime-range';
             _field.is_wide = true;
             fieldNamePrefix = `${fieldNamePrefix}between__`;
         }