@steedos-widgets/amis-object 1.2.6-beta.17 → 1.2.6-beta.18

package/dist/amis/AmisRecordDetailHeader.d.ts

@@ -50,7 +50,45 @@ export declare const AmisRecordDetailHeader: (props: any) => Promise<{
                         objectName: any;
                         visibleOn: any;
                         className: string;
-                    }[];
+                    }[] | {
+                        type: string;
+                        icon: string;
+                        onEvent: {
+                            click: {
+                                actions: {
+                                    actionType: string;
+                                    drawer: {
+                                        type: string;
+                                        title: string;
+                                        body: {
+                                            type: string;
+                                            id: string;
+                                            vertical: boolean;
+                                            tiled: boolean;
+                                            buttons: {
+                                                type: string;
+                                                name: any;
+                                                objectName: any;
+                                                visibleOn: any;
+                                            }[];
+                                            btnLevel: string;
+                                            className: string;
+                                            btnClassName: string;
+                                            size: string;
+                                        }[];
+                                        id: string;
+                                        position: string;
+                                        closeOnOutside: boolean;
+                                        resizable: boolean;
+                                        className: string;
+                                        bodyClassName: string;
+                                        actions: any[];
+                                    };
+                                }[];
+                            };
+                        };
+                        id: string;
+                    };
                 };
                 md: string;
             })[];

package/dist/amis-object.cjs.css

@@ -248,6 +248,10 @@ body {
     display: flex;
     align-items: center;
 }
+
+.antd-ButtonGroup > .antd-Button {
+    max-width: none !important;
+}
 /* @tailwind base; */
 .container {
     width: 100%
@@ -467,6 +471,9 @@ body {
 .\!max-h-\[80vh\] {
     max-height: 80vh !important
 }
+.w-full {
+    width: 100%
+}
 .w-14 {
     width: 3.5rem
 }
@@ -485,9 +492,6 @@ body {
 .w-1\/3 {
     width: 33.333333%
 }
-.w-full {
-    width: 100%
-}
 .w-10 {
     width: 2.5rem
 }
@@ -1111,6 +1115,43 @@ body {
 #steedosPageRoot{
     overflow: auto;
 }
+
+.buttons-drawer .antd-Drawer-content{
+    height: auto !important;
+    max-height: 70% !important;
+}
+
+.buttons-drawer .antd-Drawer-body{
+    overflow: inherit !important;
+}
+
+.buttons-drawer .antd-Drawer-body button{
+    border-color: #c9c9c9;
+    border-right: none !important;
+    border-left: none !important;
+    border-bottom: none !important;
+    border-radius: 0px !important;;
+}
+
+@media screen and (max-width: 767px) {
+    /* 手机版Modal全屏 */
+    .antd-Modal-content{
+        max-height: 100% !important;
+        margin: 0px !important;
+        border-radius: 0px !important;
+        height: 100% !important;
+    }
+
+    /* 修正手机版TreeSelect样式异常 */
+    .antd-TreeSelect-popup .antd-Tree{
+        width: 100% !important;
+    }
+
+    /* 修正手机版 body上的sidebar导致y滚动条异常 */
+    .sidebar{
+        padding-bottom: 0px !important;
+    }
+}
 .steedos-listview .is-loading .antd-Table-contentWrap {
   height: 50px;
 }

package/dist/amis-object.cjs.js

@@ -1737,21 +1737,6 @@ const parseSingleExpression$1 = function (func, formData, dataPath, global, user
     }
 };
 
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-08-04 10:42:49
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-08-25 10:28:47
- * @Description: 
- */
-var config = {
-    listView: {
-        newRecordMode: 'modal',
-        editRecordMode: 'modal',
-        perPage: 20
-    }
-};
-
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
@@ -2767,6 +2752,166 @@ const execute = (button, props) => {
 
 const executeButton = execute;
 
+
+const getObjectDetailHeaderButtons = (objectSchema, recordId)=>{
+    const { name } = objectSchema;
+    const buttons = getObjectDetailButtons(objectSchema, {});
+    const moreButtons = getObjectDetailMoreButtons(objectSchema, {
+        recordId: recordId,
+        objectName: name
+    });
+    let amisButtonsSchema = ___default__default["default"].map(buttons, (button) => {
+        return {
+        type: 'steedos-object-button',
+        name: button.name,
+        objectName: button.objectName,
+        visibleOn: getButtonVisibleOn$1(button),
+        className: `button_${button.name}`
+        }
+    });
+    let dropdownButtons = ___default__default["default"].map(moreButtons, (button) => {
+        return {
+        type: 'steedos-object-button',
+        name: button.name,
+        objectName: button.objectName,
+        visibleOn: getButtonVisibleOn$1(button),
+        }
+    });
+    return {
+        buttons: amisButtonsSchema,
+        moreButtons: dropdownButtons
+    };
+};
+
+const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
+    const { buttons, moreButtons } = getObjectDetailHeaderButtons(objectSchema, recordId);
+    if(ctx.formFactor === 'SMALL'){
+        return {
+            "type": "button",
+            "icon": "fa fa-angle-down",
+            "onEvent": {
+              "click": {
+                "actions": [
+                  {
+                    "actionType": "drawer",
+                    "drawer": {
+                      "type": "drawer",
+                      "title": "操作",
+                      "body": [
+                        {
+                          "type": "button-group",
+                          "id": "u:fd837823be5b",
+                          "vertical": true,
+                          "tiled": true,
+                          "buttons": [
+                            ...___default__default["default"].map(buttons, (button)=>{
+                                button.className += ' w-full';
+                                return button;
+                            }),
+                            ...___default__default["default"].map(moreButtons, (button)=>{
+                                button.className += ' w-full';
+                                return button;
+                            })
+                          ],
+                          "btnLevel": "enhance",
+                          "className": "w-full",
+                          "btnClassName": "w-full",
+                          "size": "lg"
+                        }
+                      ],
+                      "id": "u:9815f7366b9f",
+                      "position": "bottom",
+                      "closeOnOutside": true,
+                      "resizable": false,
+                      "className": "buttons-drawer",
+                      "bodyClassName": "m-none p-none",
+                      "actions": []
+                    }
+                  }
+                ]
+              }
+            },
+            "id": "u:ee7c7929e6ae"
+          }
+    }else {
+        if(moreButtons.length > 0){
+            const dropdownButtonsSchema = {
+                type: "steedos-dropdown-button",
+                label: "",
+                buttons: moreButtons,
+                className: 'slds-icon'
+            };
+            buttons.push(dropdownButtonsSchema);
+        }
+        return buttons;
+    }
+};
+
+
+const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
+    const buttons = getListViewButtons(objectSchema, ctx);
+    if(ctx.formFactor === 'SMALL'){
+        return {
+            "type": "button",
+            "icon": "fa fa-angle-down",
+            "onEvent": {
+              "click": {
+                "actions": [
+                  {
+                    "actionType": "drawer",
+                    "drawer": {
+                      "type": "drawer",
+                      "title": "操作",
+                      "body": [
+                        {
+                          "type": "button-group",
+                          "id": "u:fd837823be5b",
+                          "vertical": true,
+                          "tiled": true,
+                          "buttons": [
+                            ...___default__default["default"].map(buttons, (button)=>{
+                                return {
+                                    type: 'steedos-object-button',
+                                    name: button.name,
+                                    objectName: button.objectName,
+                                    visibleOn: getButtonVisibleOn$1(button),
+                                    className: `button_${button.name} w-full`
+                                }
+                            })
+                          ],
+                          "btnLevel": "enhance",
+                          "className": "w-full",
+                          "btnClassName": "w-full",
+                          "size": "lg"
+                        }
+                      ],
+                      "id": "u:9815f7366b9f",
+                      "position": "bottom",
+                      "closeOnOutside": true,
+                      "resizable": false,
+                      "className": "buttons-drawer",
+                      "bodyClassName": "m-none p-none",
+                      "actions": []
+                    }
+                  }
+                ]
+              }
+            },
+            "id": "u:ee7c7929e6ae"
+          }
+    }else {
+        return ___default__default["default"].map(buttons, (button) => {
+            return {
+            type: 'steedos-object-button',
+            name: button.name,
+            objectName: button.objectName,
+            visibleOn: getButtonVisibleOn$1(button),
+            className: `button_${button.name}`
+            }
+        });
+    }
+};
+
 async function getObjectFieldsFilterButtonSchema(objectSchema) {
   // const amisListViewId = `listview_${objectSchema.name}`;
   return {
@@ -3249,17 +3394,7 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
     }
   );
 
-  const buttons = getListViewButtons(objectSchema, {});
-  let amisButtonsSchema = ___default.map(buttons, (button) => {
-    return {
-      type: 'steedos-object-button',
-      name: button.name,
-      objectName: button.objectName,
-      visibleOn: getButtonVisibleOn$1(button),
-      className: `button_${button.name}`
-    }
-  });
-  
+  let amisButtonsSchema = getObjectListViewButtonsSchemas(objectSchema, {formFactor: ctx.formFactor});
   const reg = new RegExp('_', 'g');
   const standardIcon = icon && icon.replace(reg, '-');
   return {
@@ -3441,7 +3576,10 @@ async function getObjectListHeaderFieldsFilterBar(objectSchema, listViewName, ct
  * @returns amisSchema
  */
 function getObjectListHeader$1(objectSchema, listViewName, ctx) {
-  let firstLineSchema = getObjectListHeaderFirstLine(objectSchema);
+  if (!ctx) {
+    ctx = {};
+  }
+  let firstLineSchema = getObjectListHeaderFirstLine(objectSchema, listViewName, ctx);
   let body = [firstLineSchema];
   let headerSchema = [{
     "type": "wrapper",
@@ -3462,35 +3600,11 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
   const { showRecordTitle = true } = options || {};
   // console.log('getObjectRecordDetailHeader==>', objectSchema, recordId)
   const { name, label, icon, NAME_FIELD_KEY } = objectSchema;
-  const buttons = getObjectDetailButtons(objectSchema, {});
-  const moreButtons = getObjectDetailMoreButtons(objectSchema, {
-    recordId: recordId,
-    objectName: name
-  });
-  let amisButtonsSchema = ___default.map(buttons, (button) => {
-    return {
-      type: 'steedos-object-button',
-      name: button.name,
-      objectName: button.objectName,
-      visibleOn: getButtonVisibleOn$1(button),
-      className: `button_${button.name}`
-    }
-  });
-  let dropdownButtons = ___default.map(moreButtons, (button) => {
-    return {
-      type: 'steedos-object-button',
-      name: button.name,
-      objectName: button.objectName,
-      visibleOn: getButtonVisibleOn$1(button),
-    }
-  });
-  const dropdownButtonsSchema = {
-    type: "steedos-dropdown-button",
-    label: "",
-    buttons: dropdownButtons,
-    className: 'slds-icon'
-  };
-  amisButtonsSchema.push(dropdownButtonsSchema);
+  
+  let amisButtonsSchema = getObjectDetailButtonsSchemas(objectSchema, recordId, options);
+
+  // console.log(`getObjectRecordDetailHeader==>`, amisButtonsSchema)
+  
   const reg = new RegExp('_', 'g');
   const standardIcon = icon && icon.replace(reg, '-');
 
@@ -6735,7 +6849,7 @@ async function getObjectCRUD(objectSchema, fields, options){
       }), 
       filter: options.filterVisible !== false && await getObjectFilter(objectSchema, fields, options),
     };
-    if(options.formFactor !== 'SMALL'){
+    if(options.formFactor !== 'SMALL' || ["split"].indexOf(options.displayAs) == -1){
       Object.assign(bodyProps, {
         bulkActions: options.bulkActions != false ? bulkActions : false
       });
@@ -7068,6 +7182,21 @@ async function getObjectDetail(objectSchema, recordId, ctx){
     }
 }
 
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-08-04 10:42:49
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-08-25 10:28:47
+ * @Description: 
+ */
+var config = {
+    listView: {
+        newRecordMode: 'modal',
+        editRecordMode: 'modal',
+        perPage: 20
+    }
+};
+
 async function getTableColumns$1(fields, options){
     const columns = [{name: '_index',type: 'text', width: 32, placeholder: ""}];
     for (const field of fields) {
@@ -7418,7 +7547,7 @@ async function getTableSchema$1(fields, options){
         options = {};
     }
     let columns = [];
-    if(options.formFactor === 'SMALL'){
+    if(options.formFactor === 'SMALL' || ["split"].indexOf(options.displayAs) > -1){
         columns = await getMobileTableColumns(fields, options);
     }
     else {
@@ -9487,7 +9616,10 @@ async function getListviewInitSchema(objectApiName, listViewName, ctx) {
         const defaults = ctx.defaults || {};
         if(!defaults.headerSchema){
             //传入isListviewInit是区别于对象列表类型的微页面，即getListPageInitSchema函数中该属性为false
-            const headerSchema = await getObjectListHeader$1(uiSchema);
+            const headerSchema = await getObjectListHeader$1(uiSchema, listViewName, {
+                onlySecordLine: true,
+                isListviewInit: true
+            });
             defaults.headerSchema = headerSchema;
         }
         ctx.defaults = defaults;
@@ -12165,6 +12297,7 @@ var index_esm$1 = /*#__PURE__*/Object.freeze({
     getLookupSapceUserTreeSchema: getLookupSapceUserTreeSchema,
     getNotifications: getNotifications,
     getObjectDetailButtons: getObjectDetailButtons,
+    getObjectDetailButtonsSchemas: getObjectDetailButtonsSchemas,
     getObjectDetailMoreButtons: getObjectDetailMoreButtons,
     getObjectFieldsFilterBarSchema: getObjectFieldsFilterBarSchema,
     getObjectFieldsFilterButtonSchema: getObjectFieldsFilterButtonSchema,
@@ -12173,6 +12306,7 @@ var index_esm$1 = /*#__PURE__*/Object.freeze({
     getObjectListHeaderFieldsFilterBar: getObjectListHeaderFieldsFilterBar,
     getObjectListHeaderFirstLine: getObjectListHeaderFirstLine,
     getObjectListHeaderSecordLine: getObjectListHeaderSecordLine,
+    getObjectListViewButtonsSchemas: getObjectListViewButtonsSchemas,
     getObjectRecordDetailHeader: getObjectRecordDetailHeader,
     getObjectRecordDetailRelatedListHeader: getObjectRecordDetailRelatedListHeader,
     getObjectRelated: getObjectRelated,
@@ -12420,15 +12554,16 @@ var AmisObjectButton = function (props) {
             React__default["default"].createElement("svg", { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24", "stroke-width": "1.5", stroke: "currentColor", className: "animate-spin w-4 h-4" },
                 React__default["default"].createElement("path", { "stroke-linecap": "round", "stroke-linejoin": "round", d: "M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0l3.181 3.183a8.25 8.25 0 0013.803-3.7M4.031 9.865a8.25 8.25 0 0113.803-3.7l3.181 3.182m0-4.991v4.99" }))));
     }
+    // console.log('AmisObjectButton===>', button, className);
     if (button.type === "amis_button") {
         var amisSchema = button.amis_schema;
         var schema = ___default.isString(amisSchema) ? JSON.parse(amisSchema) : amisSchema;
         if (schema && schema.body.length > 0) {
             delete schema.body[0]['visibleOn'];
         }
-        // if(className){
-        //     schema.className = schema.className + ' ' + className;
-        // }
+        if (className) {
+            schema.className = schema.className + ' ' + className;
+        }
         var renderData = Object.assign(data, { objectName: objectName, app_id: appId, className: className });
         if (data._id) {
             renderData.recordId = data._id;
@@ -12454,7 +12589,10 @@ var AmisObjectButton = function (props) {
 
 var getMenu = function (render, buttons, btnClassName, props) {
     return ___default.map(buttons, function (button) {
-        button.className = "".concat(button.className, " ").concat(btnClassName);
+        if (btnClassName) {
+            button.className = "".concat(button.className, " ").concat(btnClassName);
+        }
+        delete button.className;
         return {
             key: button.name,
             label: (React__default["default"].createElement(React__default["default"].Fragment, null, render('body', button, props)))
@@ -12726,9 +12864,10 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                         formFactor = 'LARGE';
                     }
                 }
-                if (["split"].indexOf(displayAs) > -1) {
-                    formFactor = 'SMALL';
-                }
+                // 分栏模式不应该改变尺寸变量值
+                // if(["split"].indexOf(displayAs) > -1){
+                //   formFactor = 'SMALL';
+                // }
                 if (!ctx.formFactor) {
                     ctx.formFactor = formFactor;
                 }
@@ -12786,7 +12925,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                 listViewId = (ctx === null || ctx === void 0 ? void 0 : ctx.listViewId) || amisSchemaData.listViewId;
                 listViewSchemaProps = __assign$2(__assign$2({ top: top, perPage: perPage, showHeader: showHeader, defaults: defaults }, ctx), { listViewId: listViewId, setDataToComponentId: setDataToComponentId, filterVisible: filterVisible, showDisplayAs: showDisplayAs, displayAs: displayAs, headerToolbarItems: headerToolbarItems });
                 if (!headerSchema) {
-                    headerSchema = getObjectListHeader$1(uiSchema);
+                    headerSchema = getObjectListHeader$1(uiSchema, listName, ctx);
                 }
                 serviceData = Object.assign({}, { showDisplayAs: showDisplayAs, displayAs: displayAs, recordPermissions: uiSchema.permissions, _id: null, $listviewId: listName });
                 if (___default.has(props, 'objectApiName')) {
@@ -12835,7 +12974,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                                                             "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                                         },
                                                         "requestAdaptor": "console.log('service listview schemaApi requestAdaptor======>');api.data={query: '{spaces__findOne(id: \"none\"){_id,name}}'};return api;",
-                                                        "adaptor": "\n                        console.log('service listview schemaApi adaptor....', api.body); \n                        const { appId, objectName, defaultListName: listName, display, formFactor: defaultFormFactor} = api.body;\n                        return new Promise((resolve)=>{\n                          const listViewSchemaProps = ".concat(JSON.stringify(listViewSchemaProps), ";\n                          const formFactor = ([\"split\"].indexOf(display) > -1) ? 'SMALL': defaultFormFactor;\n                          listViewSchemaProps.formFactor = formFactor;\n                          // console.log(\"====listViewSchemaProps===>\", listViewSchemaProps)\n                          window.getListSchema(appId, objectName, listName, listViewSchemaProps).then((schema)=>{\n                            payload.data = schema.amisSchema;\n                            // console.log(\"payload================>\", payload)\n                            resolve(payload)\n                          });\n                        });\n                      ")
+                                                        "adaptor": "\n                        // console.log('service listview schemaApi adaptor....', api.body); \n                        let { appId, objectName, defaultListName: listName, display, formFactor: defaultFormFactor} = api.body;\n                        if(api.body.listName){\n                          listName = api.body.listName;\n                        }\n                        return new Promise((resolve)=>{\n                          const listViewSchemaProps = ".concat(JSON.stringify(listViewSchemaProps), ";\n                          const formFactor = ([\"split\"].indexOf(display) > -1) ? 'SMALL': defaultFormFactor;\n                          listViewSchemaProps.formFactor = formFactor;\n                          // console.log(\"====listViewSchemaProps===>\", listName, listViewSchemaProps)\n                          window.getListSchema(appId, objectName, listName, listViewSchemaProps).then((schema)=>{\n                            payload.data = schema.amisSchema;\n                            // console.log(\"payload================>\", payload)\n                            resolve(payload)\n                          });\n                        });\n                      ")
                                                     },
                                                     // "body": body,
                                                     // "data": serviceData
@@ -12990,7 +13129,7 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
                 };
                 props.$schema, recordId = props.recordId, _b = props.onEvent, onEvent = _b === void 0 ? defaultOnEvent : _b, _c = props.showRecordTitle, showRecordTitle = _c === void 0 ? true : _c;
                 objectApiName = props.objectApiName || "space_users";
-                return [4 /*yield*/, getRecordDetailHeaderSchema(objectApiName, recordId, { showRecordTitle: showRecordTitle })];
+                return [4 /*yield*/, getRecordDetailHeaderSchema(objectApiName, recordId, { showRecordTitle: showRecordTitle, formFactor: props.data.formFactor })];
             case 2:
                 schema = (_d.sent()).amisSchema;
                 schema.className = className;