@steedos-widgets/amis-object 1.1.4-beta.4 → 1.1.4

package/dist/amis-object.cjs.css

@@ -285,12 +285,21 @@ body {
 .absolute {
     position: absolute
 }
+.sticky {
+    position: sticky
+}
 .bottom-4 {
     bottom: 1rem
 }
 .right-4 {
     right: 1rem
 }
+.top-0 {
+    top: 0px
+}
+.z-50 {
+    z-index: 50
+}
 .col-span-2 {
     grid-column: span 2 / span 2
 }
@@ -495,6 +504,9 @@ body {
 .animate-spin {
     animation: spin 1s linear infinite
 }
+.resize {
+    resize: both
+}
 .flex-col {
     flex-direction: column
 }
@@ -797,9 +809,6 @@ body {
     .sm\:mt-3 {
         margin-top: 0.75rem
     }
-    .sm\:mb-0 {
-        margin-bottom: 0px
-    }
     .sm\:grid {
         display: grid
     }
@@ -958,9 +967,10 @@ body {
 .antd-Table-toolbar .antd-Crud-loadMore .antd-Button {
   border: none;
   position: absolute;
-  bottom: -10px;
+  bottom: 0px;
   left: 30px;
   right: 30px;
+  background: transparent;
 }
 .antd-Table-toolbar .antd-Crud-loadMore .antd-Button.is-disabled {
   display: none;
@@ -981,7 +991,7 @@ body {
 }
 
 #main {
-    overflow: scroll;
+    overflow: hidden;
 }
 .steedos-listview .is-loading .antd-Table-contentWrap {
   height: 50px;

package/dist/amis-object.cjs.js

@@ -1200,10 +1200,11 @@ function getSaveDataTpl(fields){
     `
 }
 
-function getSaveRequestAdaptor(fields){
+function getSaveRequestAdaptor(fields, options){
     return `
         ${getSaveDataTpl(fields)}
         api.data = {query: query.replace('{__saveData}', __saveData)};
+        ${options.apiRequestAdaptor || ''}
         return api;
     `
 }
@@ -2983,6 +2984,10 @@ async function getObjectFieldsFilterBarSchema(objectSchema, fields, ctx) {
       });
       sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify(localListViewProps));
     }
+    //触发amis crud 高度重算
+    setTimeout(()=>{
+      window.dispatchEvent(new Event("resize"))
+    }, 100)
     // ===END===
   `;
   return {
@@ -3712,6 +3717,10 @@ const filterService = filterForm.context.getComponents().find(function(n){
   return n.props.type === "service";
 });
 filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsFilter});
+//触发amis crud 高度重算
+setTimeout(()=>{
+  window.dispatchEvent(new Event("resize"))
+}, 100)
 `;
 
 function getExportApiRequestAdaptorScript(){
@@ -5758,7 +5767,7 @@ function getScriptForRewriteValueForFileFields(fields){
     `
 }
 
-async function getEditFormInitApi(object, recordId, fields){
+async function getEditFormInitApi(object, recordId, fields, options){
     const data = await getFindOneQuery$1(object, recordId, fields);
     data.recordId = "${recordId}";
     data.objectName = "${objectName}";
@@ -5779,6 +5788,7 @@ async function getEditFormInitApi(object, recordId, fields){
                 data.query = "{data:" + objectName + "(filters: " + JSON.stringify(["_id", "=", null]) + ", top: 1){_id}}";
             }
             api.data = data;
+            ${options.initApiRequestAdaptor || ''}
             return api;
         `,
         adaptor: `
@@ -5850,6 +5860,7 @@ async function getEditFormInitApi(object, recordId, fields){
                 initialValues,
                 editFormInited: true
             }
+            ${options.initApiAdaptor || ''}
             return payload;
         `,
         data: data,
@@ -5865,7 +5876,7 @@ function getSaveApi(object, recordId, fields, options){
         method: 'post',
         url: getApi$2(),
         data: getSaveQuery(object, recordId),
-        requestAdaptor: getSaveRequestAdaptor(fields),
+        requestAdaptor: getSaveRequestAdaptor(fields, options),
         responseData: {
             "recordId": "${record._id}"
         },
@@ -5874,6 +5885,7 @@ function getSaveApi(object, recordId, fields, options){
                 payload.status = 2;
                 payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
             }
+            ${options.apiAdaptor || ''}
             return payload;
         `,
         headers: {
@@ -6127,7 +6139,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         keepItemSelectionOnPageChange: true, 
         api: await getTableApi(objectSchema, fields, options),
         hiddenOn: options.tableHiddenOn,
-        autoFillHeight: false,
+        autoFillHeight: true,
         className: `flex-auto ${crudClassName || ""}`,
         crudClassName: crudClassName,
       }, 
@@ -6237,7 +6249,7 @@ async function getObjectForm(objectSchema, ctx){
       type: 'service',
       className: 'p-0',
       name: `page_edit_${recordId}`,
-      api: await getEditFormInitApi(objectSchema, recordId, fields),
+      api: await getEditFormInitApi(objectSchema, recordId, fields, ctx),
       data:{
         editFormInited: false
       },
@@ -6258,7 +6270,7 @@ async function getObjectForm(objectSchema, ctx){
         debug: false,
         title: "",
         submitText: "", // amis 表单不显示提交按钮, 表单提交由项目代码接管
-        api: await getSaveApi(objectSchema, recordId, fields),
+        api: await getSaveApi(objectSchema, recordId, fields, ctx),
         initFetch: recordId != 'new',
         body: await getFormBody(fields, formFields, ctx),
         panelClassName:'m-0 sm:rounded-lg shadow-none border-none',
@@ -11900,11 +11912,11 @@ var SteedosLoading = function (props) {
 };
 
 var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, recordId, mode, layout, labelAlign, appId, fieldsExtend, _a, excludedFields, _b, fields, _c, className, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, uiSchema, schema, schema, formData;
+    var $schema, recordId, mode, layout, labelAlign, appId, fieldsExtend, _a, excludedFields, _b, fields, _c, className, initApiRequestAdaptor, initApiAdaptor, apiRequestAdaptor, apiAdaptor, objectApiName, schemaKeys, formSchema, defaults, options, globalData, amisSchema, uiSchema, schema, schema, formData;
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
-                $schema = props.$schema, recordId = props.recordId, mode = props.mode, layout = props.layout, labelAlign = props.labelAlign, appId = props.appId, fieldsExtend = props.fieldsExtend, _a = props.excludedFields, excludedFields = _a === void 0 ? null : _a, _b = props.fields, fields = _b === void 0 ? null : _b, _c = props.className, className = _c === void 0 ? "" : _c;
+                $schema = props.$schema, recordId = props.recordId, mode = props.mode, layout = props.layout, labelAlign = props.labelAlign, appId = props.appId, fieldsExtend = props.fieldsExtend, _a = props.excludedFields, excludedFields = _a === void 0 ? null : _a, _b = props.fields, fields = _b === void 0 ? null : _b, _c = props.className, className = _c === void 0 ? "" : _c, initApiRequestAdaptor = props.initApiRequestAdaptor, initApiAdaptor = props.initApiAdaptor, apiRequestAdaptor = props.apiRequestAdaptor, apiAdaptor = props.apiAdaptor;
                 objectApiName = props.objectApiName || "space_users";
                 schemaKeys = ___default.difference(___default.keys($schema), ["type", "mode", "layout"]);
                 formSchema = ___default.pick(props, schemaKeys);
@@ -11930,7 +11942,12 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
                 globalData = props.data.global || {};
                 globalData.mode = mode === 'edit' ? 'edit' : 'read';
                 if (!(mode === 'edit')) return [3 /*break*/, 2];
-                return [4 /*yield*/, getFormSchema(objectApiName, options)];
+                return [4 /*yield*/, getFormSchema(objectApiName, Object.assign({}, options, {
+                        initApiRequestAdaptor: initApiRequestAdaptor,
+                        initApiAdaptor: initApiAdaptor,
+                        apiRequestAdaptor: apiRequestAdaptor,
+                        apiAdaptor: apiAdaptor
+                    }))];
             case 1:
                 schema = _d.sent();
                 amisSchema = schema.amisSchema;
@@ -12208,7 +12225,7 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
-                _a = props.className, className = _a === void 0 ? 'bg-gray-100 border-b sm:shadow sm:rounded sm:border border-slate-300 p-4' : _a;
+                _a = props.className, className = _a === void 0 ? 'sticky top-0 z-50 bg-gray-100 border-b sm:shadow sm:rounded sm:border border-slate-300 p-4' : _a;
                 return [4 /*yield*/, getUISchema(props.objectApiName || "space_users", false)];
             case 1:
                 objectUiSchema = _d.sent();
@@ -13278,7 +13295,7 @@ var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, f
                     "showHeader": true,
                     "showDisplayAs": (defaultFormFactor !== 'SMALL'),
                     "formFactor": formFactor,
-                    "className": (displayAs === 'split') ? 'w-full' : 'p-0 flex-1 sm:m-3 sm:mb-0 sm:border sm:shadow sm:rounded border-slate-300 border-solid bg-gray-100'
+                    "className": (displayAs === 'split') ? 'w-full' : 'p-0 flex-1 sm:m-3 sm:border sm:shadow sm:rounded border-slate-300 border-solid bg-gray-100'
                 };
                 defData = __assign$2(__assign$2({}, $schema.data), { objectName: objectApiName, listViewId: listViewId, listName: listName || listviewId, appId: appId, formFactor: formFactor, displayAs: displayAs });
                 // console.log("defData====>", defData)
@@ -13289,12 +13306,12 @@ var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, f
                         body: (displayAs === 'grid') ? ___default.defaultsDeep({ data: defData }, listSchema) : [
                             {
                                 "type": "wrapper",
-                                "className": "p-0 flex-shrink-0 min-w-[388px] overflow-y-auto border-r border-gray-300 bg-gray-100 shadow lg:order-first lg:flex lg:flex-col",
+                                "className": "p-0 flex-shrink-0 min-w-[388px] border-r border-gray-300 bg-gray-100 shadow lg:order-first lg:flex lg:flex-col",
                                 "body": ___default.defaultsDeep({ data: defData }, listSchema)
                             },
                             {
                                 "type": "wrapper",
-                                "className": 'p-0 flex-1 overflow-y-auto focus:outline-none xl:order-last',
+                                "className": 'p-0 flex-1 focus:outline-none xl:order-last',
                                 "body": []
                             }
                         ]
@@ -13346,6 +13363,7 @@ var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                     "formFactor": 'SMALL',
                 };
                 defData = __assign$2(__assign$2({}, $schema.data), { objectName: objectApiName, listViewId: sideListviewId, listName: sideListviewId, recordId: data.recordId || recordId, appId: appId, formFactor: formFactor, displayAs: displayAs });
+                // console.log('defData====>', defData)
                 return [2 /*return*/, {
                         type: 'service',
                         data: defData,
@@ -13353,7 +13371,7 @@ var PageRecordDetail = function (props) { return __awaiter(void 0, void 0, void
                         body: (displayAs === 'grid') ? ___default.defaultsDeep({ data: defData }, recordSchema) : [
                             {
                                 "type": "wrapper",
-                                "className": "p-0 flex-shrink-0 min-w-[388px] overflow-y-auto border-r border-gray-300 bg-gray-100 shadow lg:order-first lg:flex lg:flex-col",
+                                "className": "p-0 flex-shrink-0 min-w-[388px] border-r border-gray-300 bg-gray-100 shadow lg:order-first lg:flex lg:flex-col",
                                 "body": ___default.defaultsDeep({ data: defData }, listSchema)
                             },
                             {