@steedos-widgets/amis-lib 1.3.0-beta.11 → 1.3.0-beta.13

package/dist/index.cjs.js

@@ -2192,257 +2192,92 @@ const getSchema$2 = (uiSchema) => {
                   title: i18next__default["default"].t('frontend_import_data'),
                   body: [
                     {
-                      type: "form",
-                      mode: "edit",
-                      persistData: false,
-                      promptPageLeave: true,
-                      name: "form_edit_data_import",
-                      debug: false,
-                      title: "",
-                      submitText: "",
-                      api: {
-                        method: "post",
-                        url: "${context.rootUrl}/graphql",
-                        data: {
-                          objectName: "queue_import_history",
-                          $: "$$",
-                        },
-                        requestAdaptor:
-                          "\n        const formData = api.data.$;\n        for (key in formData){\n            // image、select等字段清空值后保存的空字符串转换为null。\n            if(formData[key] === ''){\n                formData[key] = null;\n            }\n        }\n        const objectName = api.data.objectName;\n        const fieldsName = Object.keys(formData);\n        delete formData.created;\n        delete formData.created_by;\n        delete formData.modified;\n        delete formData.modified_by;\n        delete formData._display;\n        delete formData.success_count;\ndelete formData.failure_count;\ndelete formData.total_count;\ndelete formData.start_time;\ndelete formData.end_time;\ndelete formData.state;\ndelete formData.error;\ndelete formData.created;\ndelete formData.created_by;\ndelete formData.modified;\ndelete formData.modified_by;\n        \n        \n        let fileFieldsKeys = [\"file\"];\n        let fileFields = {\"file\":{\"name\":\"file\"}};\n        fileFieldsKeys.forEach((item)=>{\n            let fileFieldValue = formData[item];\n            if(fileFieldValue){\n                // 因为表单初始化接口的接收适配器中为file字段值重写了值及格式（为了字段编辑时正常显示附件名、点击附件名正常下载），所以保存时还原（为了字段值保存时正常保存id）。\n                if(fileFields[item].multiple){\n                    if(fileFieldValue instanceof Array && fileFieldValue.length){\n                        formData[item] = fileFieldValue.map((value)=>{ \n                            if(typeof value === 'object'){\n                                return value.value;\n                            }else{\n                                return value;\n                            }\n                        });\n                    }\n                }else{\n                    formData[item] = typeof fileFieldValue === 'object' ? fileFieldValue.value : fileFieldValue;\n                }\n            }\n        })\n    \n        let query = `mutation{record: ${objectName}__insert(doc: {__saveData}){_id}}`;\n        if(formData.recordId && formData.recordId !='new'){\n            query = `mutation{record: ${objectName}__update(id: \"${formData._id}\", doc: {__saveData}){_id}}`;\n        };\n        delete formData._id;\n        let __saveData = JSON.stringify(JSON.stringify(formData));\n    \n        api.data = {query: query.replace('{__saveData}', __saveData)};\n        return api;\n    ",
-                        responseData: {
-                          recordId: "${record._id}",
-                        },
-                        adaptor:
-                          "console.log('payload', payload)\n            return payload;\n        ",
-                        headers: {
-                          Authorization:
-                            "Bearer ${context.tenantId},${context.authToken}",
-                        },
-                        dataType: "json",
+                      "type": "steedos-object-form",
+                      "label": "对象表单",
+                      "objectApiName": "queue_import_history",
+                      "recordId": "",
+                      "mode": "edit",
+                      "layout": "normal",
+                      "defaultData":{
+                        "object_name": "${objectName}"
                       },
-                      initFetch: true,
-                      body: [
-                        {
-                          type: "fieldSet",
-                          title: i18next__default["default"].t('frontend_field_group_generalization'),
-                          collapsable: true,
-                          body: [
-                            {
-                              name: "object_name",
-                              label: i18next__default["default"].t('frontend_import_data_object_name'),
-                              required: false,
-                              type: "select",
-                              joinValues: false,
-                              extractValue: true,
-                              autoComplete: {
-                                method: "post",
-                                url: "${context.rootUrl}/graphql",
-                                data: {
-                                  orderBy: "${orderBy}",
-                                  orderDir: "${orderDir}",
-                                  pageNo: "${page}",
-                                  pageSize: "${perPage}",
-                                  query:
-                                    "{options:objects(filters: {__filters}, top: {__top}){_id label:label value:name},count:objects__count(filters:{__filters})}",
-                                  $term: "$term",
-                                  $value: "$object_name.name",
-                                  $: "$$",
-                                  rfield: "${object_name}",
-                                },
-                                headers: {
-                                  Authorization:
-                                    "Bearer ${context.tenantId},${context.authToken}",
-                                },
-                                requestAdaptor:
-                                  "\n        var filters = '[]';\n        var top = 10;\n        if(api.data.$term){\n            filters = '[\"name\", \"contains\", \"'+ api.data.$term +'\"]';\n        }else if(api.data.$value){\n            filters = '[\"_id\", \"=\", \"'+ api.data.$value +'\"]';\n        }\n        api.data.query = api.data.query.replace(/{__filters}/g, filters).replace('{__top}', top);\n        return api;\n    ",
-                              },
-                              className: "m-1",
-                              labelClassName: "text-left",
-                              clearValueOnHidden: false,
-                              id: "u:04295fee3896",
-                              multiple: false,
-                              hidden: true,
-                            },
-                            {
-                              name: "queue_import",
-                              label: i18next__default["default"].t('frontend_import_data_queue_import'),
-                              required: true,
-                              type: "picker",
-                              labelField: "description",
-                              valueField: "_id",
-                              modalMode: "dialog",
-                              source: {
-                                method: "post",
-                                url: "${context.rootUrl}/graphql",
-                                data: {
-                                  orderBy: "${orderBy}",
-                                  orderDir: "${orderDir}",
-                                  pageNo: "${page}",
-                                  pageSize: "${perPage}",
-                                  query:
-                                    '{rows:queue_import(filters: {__filters}, top: {__top}, skip: {__skip}, sort: "{__sort}"){_id,description,object_name,encoding,template_url,_display:_ui{object_name,encoding}},count:queue_import__count(filters:{__filters})}',
-                                  $term: "$term",
-                                  $self: "$$",
+                      "fieldsExtend":{
+                        "object_name": {
+                          "amis": {
+                            "hidden": true
+                          }
+                        }
+                      },
+                      "form": {
+                        debug: false,
+                        resetAfterSubmit: false,
+                        initApi: {
+                          url: '/api/v1/queue_import_history/${recordId}?fields=["state"]',
+                          sendOn: 'this.recordId',
+                          responseData: {
+                            importState: "${state}"
+                          }
+                        },
+                        interval: 3000,
+                        stopAutoRefreshWhen: "this.importState === 'finished'",
+                        initFetch: false,
+                        onEvent: {
+                          inited: {
+                            weight: 0,
+                            actions: [
+                              {
+                                "actionType": "broadcast",
+                                "args": {
+                                  "eventName": `@data.changed.${uiSchema.name}`
                                 },
-                                headers: {
-                                  Authorization:
-                                    "Bearer ${context.tenantId},${context.authToken}",
+                                "data": {
+                                  "objectName": `${uiSchema.name}`,
+                                  "displayAs": "${displayAs}",
+                                  "recordId": "xxxx" //不可以省略，否则会进入进入记录详细页面
                                 },
-                                requestAdaptor:
-                                  "\n        const selfData = JSON.parse(JSON.stringify(api.data.$self));\n        var filters = [];\n        var pageSize = api.data.pageSize || 10;\n        var pageNo = api.data.pageNo || 1;\n        var skip = (pageNo - 1) * pageSize;\n        var orderBy = api.data.orderBy || '';\n        var orderDir = api.data.orderDir || '';\n        var sort = orderBy + ' ' + orderDir;\n        var allowSearchFields = [\"description\"];\n        if(api.data.$term){\n            filters = [[\"name\", \"contains\", \"'+ api.data.$term +'\"]];\n        }else if(selfData.op === 'loadOptions' && selfData.value){\n            if(selfData.value && selfData.value.indexOf(',') > 0){\n                filters = [[\"_id\", \"=\", selfData.value.split(',')]];\n            }else{\n                filters = [[\"_id\", \"=\", selfData.value]];\n            }\n        }\n        if(allowSearchFields){\n            allowSearchFields.forEach(function(key){\n                const keyValue = selfData[key];\n                if(keyValue){\n                    filters.push([key, \"contains\", keyValue]);\n                }\n            })\n        }\n\n        const filtersFunction = function(filters, values){return ['object_name', '=', values.object_name]};\n\n        if(filtersFunction){\n            const _filters = filtersFunction(filters, api.data.$self.__super.__super);\n            if(_filters && _filters.length > 0){\n                filters.push(_filters);\n            }\n        }\n\n        api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());\n        return api;\n    ",
-                                adaptor:
-                                  "\n    const enable_tree = undefined;\n    if(enable_tree){\n        const records = payload.data.rows;\n        const treeRecords = [];\n        const getChildren = (records, childrenIds)=>{\n            if(!childrenIds){\n                return;\n            }\n            const children = _.filter(records, (record)=>{\n                return _.includes(childrenIds, record._id)\n            });\n            _.each(children, (item)=>{\n                if(item.children){\n                    item.children = getChildren(records, item.children)\n                }\n            })\n            return children;\n        }\n\n        _.each(records, (record)=>{\n            if(!record.parent){\n                treeRecords.push(Object.assign({}, record, {children: getChildren(records, record.children)}));\n            }\n        });\n        payload.data.rows = treeRecords;\n    }\n    return payload;\n    ",
+                                "expression": "this.importState === 'finished'"
                               },
-                              size: "lg",
-                              pickerSchema: {
-                                mode: "table",
-                                name: "thelist",
-                                draggable: false,
-                                headerToolbar: ["reload"],
-                                defaultParams: {
-                                  perPage: 20,
-                                },
-                                columns: [
-                                  {
-                                    name: "_index",
-                                    type: "text",
-                                    width: 32,
-                                    placeholder: "",
-                                  },
-                                  {
-                                    name: "description",
-                                    label: i18next__default["default"].t('frontend_import_data_queue_import_description'),
-                                    type: "tpl",
-                                    tpl: '<a href="/app/undefined/undefined/view/${undefined}">${description}</a>',
-                                    className: "whitespace-nowrap",
-                                    html: null,
-                                  },
-                                  {
-                                    name: "object_name",
-                                    label: i18next__default["default"].t('frontend_import_data_object_name'),
-                                    type: "tpl",
-                                    tpl: '<a href="/app/undefined/${_display.object_name.objectName}/view/${_display.object_name.value}">${_display.object_name.label}</a>',
-                                    className: "whitespace-nowrap",
-                                    html: null,
-                                  },
-                                  {
-                                    name: "encoding",
-                                    label: i18next__default["default"].t('frontend_import_data_queue_import_encoding'),
-                                    type: "tpl",
-                                    tpl: "<div>${_display.encoding}</div>",
-                                    className: "whitespace-nowrap",
-                                    html: null,
-                                  },
-                                  {
-                                    name: "template_url",
-                                    label: i18next__default["default"].t('frontend_import_data_queue_import_template_url'),
-                                    type: "button-group",
-                                    buttons: [
-                                      {
-                                        type: "button",
-                                        label: i18next__default["default"].t('frontend_download'),
-                                        visibleOn: "${template_url}",
-                                        level: "link",
-                                        actionType: "download",
-                                        api:{
-                                          url: "${template_url}",
-                                          method: "get",
-                                          headers: {
-                                            Authorization: "Bearer ${context.tenantId},${context.authToken}"
-                                          }
-                                        }
-                                      }
-                                    ],
-                                    options: {
-                                      html: true
+                              {
+                                "actionType": "closeDialog",
+                                "expression": "this.importState === 'finished'"
+                              }
+                            ]
+                          },
+                          submitSucc: {
+                            weight: 0,
+                            actions: [
+                              {
+                                args: {
+                                  api: {
+                                    url: "${context.rootUrl}/api/data/initiateImport",
+                                    method: "post",
+                                    data: {
+                                      eventData: "${event.data}",
+                                    },
+                                    dataType: "json",
+                                    requestAdaptor:
+                                      "\napi.data = {\n  importObjectHistoryId: api.body.eventData.result.data.recordId\n}\nreturn api;",
+                                    adaptor:
+                                      "payload.status = payload.status === 'success' ? 0 : payload.status;\nconsole.log(\"payload ssss==>\", payload)\nreturn payload;",
+                                    headers: {
+                                      Authorization:
+                                        "Bearer ${context.tenantId},${context.authToken}",
                                     },
-                                    className: "whitespace-nowrap",
-                                  },
-                                  null,
-                                ],
-                                syncLocation: false,
-                                keepItemSelectionOnPageChange: true,
-                                checkOnItemClick: false,
-                                autoFillHeight: false,
-                              },
-                              joinValues: false,
-                              extractValue: true,
-                              className: "m-1",
-                              labelClassName: "text-left",
-                              clearValueOnHidden: true,
-                              id: "u:401df27113e0",
-                            },
-                            {
-                              name: "file",
-                              label: i18next__default["default"].t('frontend_import_data_file'),
-                              required: true,
-                              type: "input-file",
-                              accept: ".xlsx,.xls",
-                              className: "m-1",
-                              labelClassName: "text-left",
-                              clearValueOnHidden: true,
-                              useChunk: false,
-                              receiver: {
-                                method: "post",
-                                url: "${context.rootUrl}/s3/files",
-                                data: {
-                                  $: "$$",
-                                  context: "${context}",
-                                },
-                                adaptor:
-                                  '\n                const { context } = api.body; \n                var rootUrl = context.rootUrl + "/api/files/files/";\n                payload = {\n                    status: response.status == 200 ? 0 : response.status,\n                    msg: response.statusText,\n                    data: {\n                        value: payload._id,\n                        name: payload.original.name,\n                        url: rootUrl + payload._id,\n                    }\n                }\n                return payload;\n            ',
-                                headers: {
-                                  Authorization:
-                                    "Bearer ${context.tenantId},${context.authToken}",
-                                },
-                              },
-                              id: "u:0213f2cc365b",
-                            },
-                          ],
-                          id: "u:4899c260d667",
-                        },
-                      ],
-                      panelClassName: "m-0 sm:rounded-lg shadow-none",
-                      bodyClassName: "p-0",
-                      className: "p-4 sm:p-0 steedos-amis-form",
-                      label: "对象表单",
-                      objectApiName: "queue_import_history",
-                      id: "u:e4ef598eed61",
-                      onEvent: {
-                        submitSucc: {
-                          weight: 0,
-                          actions: [
-                            {
-                              args: {
-                                api: {
-                                  url: "${context.rootUrl}/api/data/initiateImport",
-                                  method: "post",
-                                  data: {
-                                    eventData: "${event.data}",
                                   },
-                                  dataType: "json",
-                                  requestAdaptor:
-                                    "\napi.data = {\n  importObjectHistoryId: api.body.eventData.result.data.recordId\n}\nreturn api;",
-                                  adaptor:
-                                    "payload.status = payload.status === 'success' ? 0 : payload.status;\nconsole.log(\"payload ssss==>\", payload)\nreturn payload;",
-                                  headers: {
-                                    Authorization:
-                                      "Bearer ${context.tenantId},${context.authToken}",
+                                  messages: {
+                                    success: i18next__default["default"].t('frontend_import_data_message_success'),
+                                    failed: i18next__default["default"].t('frontend_import_data_message_failed'),
                                   },
                                 },
-                                messages: {
-                                  success: i18next__default["default"].t('frontend_import_data_message_success'),
-                                  failed: i18next__default["default"].t('frontend_import_data_message_failed'),
-                                },
+                                actionType: "ajax",
+                                expression: "event.data.result",
                               },
-                              actionType: "ajax",
-                              expression: "event.data.result",
-                            },
-                          ],
+                            ],
+                          },
                         },
-                      },
-                      closeDialogOnSubmit: true,
-                    },
+                        closeDialogOnSubmit: false,
+                      }
+                    }
                   ],
                   id: "u:dc05498d3bd4",
                   closeOnEsc: false,
@@ -2632,7 +2467,7 @@ const StandardButtons = {
     getStandardImportData: async (uiSchema, ctx)=>{
         return {
             type: 'amis_button',
-            amis_schema: await getSchema$2()
+            amis_schema: await getSchema$2(uiSchema)
         }
     },
     getStandardOpenView: async (uiSchema, ctx)=>{
@@ -2662,7 +2497,7 @@ function getButtonVisibleOn$1(button){
         visible = button._visible;
     }
 
-    if(___default["default"].isBoolean(visible)){
+    if(___namespace.isBoolean(visible)){
         visible = visible.toString();
     }
 
@@ -2690,7 +2525,7 @@ function getButtonVisibleOn$1(button){
 
 const getButtonVisible = (button, ctx) => {
     if (button._visible) {
-        if (___default["default"].startsWith(___default["default"].trim(button._visible), "function")) {
+        if (___namespace.startsWith(___namespace.trim(button._visible), "function")) {
             window.eval("var fun = " + button._visible);
             button.visible = fun;
         } else if (isExpression(button._visible)) {
@@ -2705,7 +2540,7 @@ const getButtonVisible = (button, ctx) => {
             };
         }
     }
-    if (___default["default"].isFunction(button.visible)) {
+    if (___namespace.isFunction(button.visible)) {
         try {
             return button.visible(ctx);
         } catch (error) {
@@ -2727,7 +2562,7 @@ const standardButtonsTodo = {
         } = this;
         const listViewRef = SteedosUI?.getRef(scopeId || listViewId).getComponentById(`listview_${uiSchema.name}`);
           
-        if(___default["default"].isEmpty(listViewRef.props.store.toJSON().selectedItems)){
+        if(___namespace.isEmpty(listViewRef.props.store.toJSON().selectedItems)){
             listViewRef.handleAction({}, {
                 "actionType": "toast",
                 "toast": {
@@ -2754,19 +2589,19 @@ const standardButtonsTodo = {
  */
 const getButtons = (uiSchema, ctx) => {
     const disabledButtons = uiSchema.permissions && uiSchema.permissions.disabled_actions;
-    let buttons = ___default["default"].sortBy(___default["default"].values(uiSchema.actions), "sort");
-    if (___default["default"].has(uiSchema, "allow_customActions")) {
-        buttons = ___default["default"].filter(buttons, (button) => {
-            return ___default["default"].include(uiSchema.allow_customActions, button.name); // || _.include(_.keys(Creator.getObject('base').actions) || {}, button.name)
+    let buttons = ___namespace.sortBy(___namespace.values(uiSchema.actions), "sort");
+    if (___namespace.has(uiSchema, "allow_customActions")) {
+        buttons = ___namespace.filter(buttons, (button) => {
+            return ___namespace.include(uiSchema.allow_customActions, button.name); // || _.include(_.keys(Creator.getObject('base').actions) || {}, button.name)
         });
     }
-    if (___default["default"].has(uiSchema, "exclude_actions")) {
-        buttons = ___default["default"].filter(buttons, (button) => {
-            return !___default["default"].include(uiSchema.exclude_actions, button.name);
+    if (___namespace.has(uiSchema, "exclude_actions")) {
+        buttons = ___namespace.filter(buttons, (button) => {
+            return !___namespace.include(uiSchema.exclude_actions, button.name);
         });
     }
 
-    ___default["default"].each(buttons, (button) => {
+    ___namespace.each(buttons, (button) => {
         button.objectName = uiSchema.name;
         if (
             ctx.isMobile &&
@@ -2785,7 +2620,7 @@ const getButtons = (uiSchema, ctx) => {
         ctx.isMobile &&
         ["cms_files", "cfs.files.filerecord"].indexOf(uiSchema.name) > -1
     ) {
-        ___default["default"].map(buttons, (button) => {
+        ___namespace.map(buttons, (button) => {
             if (button.name === "standard_edit") {
                 button.on = "record_more";
             }
@@ -2795,14 +2630,14 @@ const getButtons = (uiSchema, ctx) => {
         });
     }
 
-    return ___default["default"].filter(buttons, (button) => {
-        return ___default["default"].indexOf(disabledButtons, button.name) < 0 && button.name != 'standard_query';
+    return ___namespace.filter(buttons, (button) => {
+        return ___namespace.indexOf(disabledButtons, button.name) < 0 && button.name != 'standard_query';
     });
 };
 
 const getListViewButtons = (uiSchema, ctx) => {
     const buttons = getButtons(uiSchema, ctx);
-    const listButtons = ___default["default"].filter(buttons, (button) => {
+    const listButtons = ___namespace.filter(buttons, (button) => {
         return button.on == "list";
     });
     return listButtons;
@@ -2810,23 +2645,23 @@ const getListViewButtons = (uiSchema, ctx) => {
 
 const getObjectDetailButtons = (uiSchema, ctx) => {
     const buttons = getButtons(uiSchema, ctx);
-    const detailButtons = ___default["default"].filter(buttons, (button) => {
+    const detailButtons = ___namespace.filter(buttons, (button) => {
         return button.on == "record" || button.on == "record_only";
     });
-    return ___default["default"].sortBy(detailButtons, "sort");
+    return ___namespace.sortBy(detailButtons, "sort");
 };
 
 const getObjectDetailMoreButtons = (uiSchema, ctx) => {
     const buttons = getButtons(uiSchema, ctx);
-    const moreButtons = ___default["default"].filter(buttons, (button) => {
+    const moreButtons = ___namespace.filter(buttons, (button) => {
         return button.on == "record_more" || button.on == "record_only_more";
     });
-    return ___default["default"].sortBy(moreButtons, "sort");
+    return ___namespace.sortBy(moreButtons, "sort");
 };
 
 const getListViewItemButtons = async (uiSchema, ctx)=>{
     const buttons = getButtons(uiSchema, ctx);
-    const listButtons = ___default["default"].filter(buttons, (button) => {
+    const listButtons = ___namespace.filter(buttons, (button) => {
         return button.on == "record" || button.on == "list_item" || button.on === 'record_more';
     });
     return listButtons;
@@ -2843,7 +2678,7 @@ const getObjectRelatedListButtons = (uiSchema, ctx)=>{
     // });
     // return relatedListButtons;
     const buttons = getButtons(uiSchema, ctx);
-    const listButtons = ___default["default"].filter(buttons, (button) => {
+    const listButtons = ___namespace.filter(buttons, (button) => {
         return button.on == "list";
     });
     return listButtons;
@@ -2860,7 +2695,7 @@ const getButton = async (objectName, buttonName, ctx)=>{
     const uiSchema = await getUISchema(objectName);
     if(uiSchema){
         const buttons = await getButtons(uiSchema, ctx);
-        const button = ___default["default"].find(buttons, (button)=>{
+        const button = ___namespace.find(buttons, (button)=>{
             return button.name === buttonName
         });
 
@@ -2946,13 +2781,13 @@ const execute = (button, props) => {
         return; //TODO 弹出提示未配置todo
     }
 
-    if (___default["default"].isString(button.todo)) {
-        if (___default["default"].startsWith(___default["default"].trim(button.todo), "function")) {
+    if (___namespace.isString(button.todo)) {
+        if (___namespace.startsWith(___namespace.trim(button.todo), "function")) {
             window.eval("var fun = " + button.todo);
             button.todo = fun;
         }
     }
-    if (___default["default"].isFunction(button.todo)) {
+    if (___namespace.isFunction(button.todo)) {
         const todoThis = {
             objectName: props.objectName, 
             object_name: props.objectName, 
@@ -2977,7 +2812,7 @@ const getObjectDetailHeaderButtons = (objectSchema, recordId)=>{
         recordId: recordId,
         objectName: name
     });
-    let amisButtonsSchema = ___default["default"].map(buttons, (button) => {
+    let amisButtonsSchema = ___namespace.map(buttons, (button) => {
         return {
         type: 'steedos-object-button',
         name: button.name,
@@ -2987,7 +2822,7 @@ const getObjectDetailHeaderButtons = (objectSchema, recordId)=>{
         }
     });
     let moreButtonsVisibleOn = '';
-    let dropdownButtons = ___default["default"].map(moreButtons, (button, index) => {
+    let dropdownButtons = ___namespace.map(moreButtons, (button, index) => {
         if(index === 0){
             moreButtonsVisibleOn = getButtonVisibleOn$1(button);
         }else {
@@ -3030,11 +2865,11 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
                           "vertical": true,
                           "tiled": true,
                           "buttons": [
-                            ...___default["default"].map(buttons, (button)=>{
+                            ...___namespace.map(buttons, (button)=>{
                                 button.className += ' w-full';
                                 return button;
                             }),
-                            ...___default["default"].map(moreButtons, (button)=>{
+                            ...___namespace.map(moreButtons, (button)=>{
                                 button.className += ' w-full';
                                 return button;
                             })
@@ -3096,7 +2931,7 @@ const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
                           "vertical": true,
                           "tiled": true,
                           "buttons": [
-                            ...___default["default"].map(buttons, (button)=>{
+                            ...___namespace.map(buttons, (button)=>{
                                 return {
                                     type: 'steedos-object-button',
                                     name: button.name,
@@ -3125,13 +2960,13 @@ const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
             }
           }
     }else {
-        return ___default["default"].map(buttons, (button) => {
+        return ___namespace.map(buttons, (button) => {
             return {
             type: 'steedos-object-button',
             name: button.name,
             objectName: button.objectName,
             visibleOn: getButtonVisibleOn$1(button),
-            className: `button_${button.name} mr-0`
+            className: `button_${button.name}`
             }
         });
     }
@@ -3158,7 +2993,7 @@ const getObjectRecordDetailRelatedListButtonsSchemas = (objectSchema, ctx)=>{
                           "vertical": true,
                           "tiled": true,
                           "buttons": [
-                            ...___default["default"].map(buttons, (button)=>{
+                            ...___namespace.map(buttons, (button)=>{
                                 return {
                                     type: 'steedos-object-button',
                                     name: button.name,
@@ -3187,7 +3022,7 @@ const getObjectRecordDetailRelatedListButtonsSchemas = (objectSchema, ctx)=>{
             }
           }
     }else {
-        return ___default["default"].map(buttons, (button) => {
+        return ___namespace.map(buttons, (button) => {
             return {
                 type: 'steedos-object-button',
                 name: button.name,
@@ -5272,6 +5107,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
 
   return {
     "type": "tooltip-wrapper",
+    "id": "steedos_crud_toolbar_quick_search",
     "align": "right",
     "title": "",
     "content": "可搜索字段：" + searchableFieldsLabel.join(","),
@@ -5303,76 +5139,134 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
   if(isMobile){
     showDisplayAs = false;
   }
+  let toolbarCount;
+  if(!hiddenCount){
+    toolbarCount = {
+      "type": "tpl",
+      "tpl":  "${count} " + i18next__default["default"].t('frontend_record_sum')
+    };
+  }
+  let toolbarReloadButton;
   if(formFactor === 'SMALL'){
-    const onReloadScript = `
-      const scope = event.context.scoped;
-      var listView = scope.parent.getComponents().find(function(n){
-        return n.props.type === "crud";
-      });
-      listView.handleChangePage(1);
-    `;
+    // const onReloadScript = `
+    //   const scope = event.context.scoped;
+    //   var listView = scope.parent.getComponents().find(function(n){
+    //     return n.props.type === "crud";
+    //   });
+    //   listView.handleChangePage(1);
+    // `;
+    // toolbarReloadButton = {
+    //   // "type": "reload",//不可以直接使用reload，因为它不会设置页码到第一页，这在加载更多按钮的翻页模式下会有问题
+    //   "type": "button",
+    //   "align": "right",
+    //   //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+    //   // "tooltip": i18next.t('frontend_button_reload_tooltip'),
+    //   "tooltipPlacement": "top",
+    //   "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+    //   "label": "",
+    //   "icon": "fa fa-sync",
+    //   "visibleOn": "${!showFieldsFilter}",
+    //   "onEvent": {
+    //     "click": {
+    //       "actions": [
+    //         {
+    //           "actionType": "custom",
+    //           "script": onReloadScript
+    //         }
+    //       ]
+    //     }
+    //   },
+    // };
+
+    // 后续如果换成加载更多按钮的翻页模式的话，不可以直接使用下面的reload，需要换成上面的自定义脚本模式
+    toolbarReloadButton = {
+      "type": "reload",
+      "align": "right",
+      //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+      // "tooltip": i18next.t('frontend_button_reload_tooltip'),
+      "tooltip":"",
+      "tooltipPlacement": "top",
+      "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+    };
+  }
+  else {
+    toolbarReloadButton = {
+      "type": "reload",
+      "align": "right",
+      //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+      // "tooltip": i18next.t('frontend_button_reload_tooltip'),
+      "tooltip":"",
+      "tooltipPlacement": "top",
+      "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+    };
+  }
+  let toolbarFilter;
+  if(filterVisible){
+    toolbarFilter ={
+      "label": i18next__default["default"].t('frontend_button_search_tooltip'),
+      "icon": "fa fa-filter",
+      //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
+      // "tooltip": i18next.t('frontend_button_search_tooltip'),
+      // "tooltipPlacement": "top",
+      "type": "button",
+      "badge": {
+        "offset": [
+          -5,
+          1
+        ],
+        "size":8,
+        "animation": true,
+        "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
+      },
+      "align": "right",
+      "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+      "onEvent": {
+        "click": {
+          "actions": [
+            {
+              "actionType": "custom",
+              "script": onFieldsFilterToggleScript
+            }
+          ]
+        }
+      },
+      "id": "steedos_crud_toolbar_filter"
+    };
+  }
+  let toolbarDisplayAsButton = getDisplayAsButton(mainObject?.name);
+  let toolbarDQuickSearchBox = getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName });
+
+  // toolbars返回的数组元素不可以是空对象{}，比如hiddenCount ? {} : {"type": "tpl",...}，因为空对象最终还是会生成一个空的.antd-Crud-toolbar-item dom
+  // 当出现空的.antd-Crud-toolbar-item dom时会影响toolbar元素的maring-right css样式计算，如果有动态需要应该加到动态数组变量toolbars中
+  let toolbars = [];
+  if(formFactor === 'SMALL'){
+    if(toolbarCount){
+      toolbars.push(toolbarCount);
+    }
+    toolbars.push(toolbarReloadButton);
+    if(toolbarFilter){
+      toolbars.push(toolbarFilter);
+    }
+    toolbars.push(toolbarDisplayAsButton);
+    toolbars.push(toolbarDQuickSearchBox);
     return [
       // "bulkActions",
       ...(headerToolbarItems || []),
-      hiddenCount ? {} :{
-        "type": "tpl",
-        "tpl": "${count} " + i18next__default["default"].t('frontend_record_sum')
-      },
-      {
-        // "type": "reload",//不可以直接使用reload，因为它不会设置页码到第一页
-        "type": "button",
-        "align": "right",
-        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
-        // "tooltip": i18next.t('frontend_button_reload_tooltip'),
-        "tooltipPlacement": "top",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-        "label": "",
-        "icon": "fa fa-sync",
-        "visibleOn": "${!showFieldsFilter}",
-        "onEvent": {
-          "click": {
-            "actions": [
-              {
-                "actionType": "custom",
-                "script": onReloadScript
-              }
-            ]
-          }
-        },
-      },
-      filterVisible ? {
-        "label": i18next__default["default"].t('frontend_button_search_tooltip'),
-        "icon": "fa fa-search",
-        "type": "button",
-        "tooltipPlacement": "top",
-        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
-        // "tooltip": i18next.t('frontend_button_search_tooltip'),
-        "badge": {
-          "offset": [
-            -5,
-            1
-          ],
-          "size":8,
-          "animation": true,
-          "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
-        },
-        "align": "right",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-        "onEvent": {
-          "click": {
-            "actions": [
-              {
-                "actionType": "custom",
-                "script": onFieldsFilterToggleScript
-              }
-            ]
-          }
-        }
-      } : {},
-      getDisplayAsButton(mainObject?.name),
-      getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName })
+      ...toolbars,
   ]
   }else {
+    if(toolbarCount){
+      toolbars.push(toolbarCount);
+    }
+    if(toolbarFilter){
+      toolbars.push(toolbarFilter);
+    }
+    toolbars.push(toolbarReloadButton);
+    if(mainObject?.permissions?.allowCreateListViews){
+      toolbars.push(getSettingListviewToolbarButtonSchema());
+    }
+    toolbars.push(toolbarDisplayAsButton);
+    toolbars.push(toolbarDQuickSearchBox);
     return [
       // "filter-toggler",
       ...(headerToolbarItems || []),
@@ -5381,56 +5275,12 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
         "type": "columns-toggler",
         "className": "hidden"
       },
+      ...toolbars,
       // {
       //     "type": "columns-toggler",
       //     "className": "mr-2"
       // },
-      hiddenCount ? {} : {
-        "type": "tpl",
-        "tpl":  "${count} " + i18next__default["default"].t('frontend_record_sum')
-      },
-      filterVisible ? {
-        "label": i18next__default["default"].t('frontend_button_search_tooltip'),
-        "icon": "fa fa-filter",
-        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
-        // "tooltip": i18next.t('frontend_button_search_tooltip'),
-        // "tooltipPlacement": "top",
-        "type": "button",
-        "badge": {
-          "offset": [
-            -5,
-            1
-          ],
-          "size":8,
-          "animation": true,
-          "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
-        },
-        "align": "right",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-        "onEvent": {
-          "click": {
-            "actions": [
-              {
-                "actionType": "custom",
-                "script": onFieldsFilterToggleScript
-              }
-            ]
-          }
-        }
-      } : {},
-      {
-        "type": "reload",
-        "align": "right",
-        //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
-        // "tooltip": i18next.t('frontend_button_reload_tooltip'),
-        "tooltip":"",
-        "tooltipPlacement": "top",
-        "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
-      },
       // getExportExcelToolbarButtonSchema(),
-      mainObject?.permissions?.allowCreateListViews ? getSettingListviewToolbarButtonSchema() : {},
-      getDisplayAsButton(mainObject?.name),
-      getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName }),
       // {
       //     "type": "drag-toggler",
       //     "align": "right"
@@ -5724,12 +5574,11 @@ const getReferenceTo = async (field)=>{
     }
 };
 
-function getLookupSapceUserTreeSchema(){
-    const tree = [{
+function getLookupSapceUserTreeSchema(isMobile){
+    const treeSchema = {
         "type": "input-tree",
-        "className": "",
+        "className":"steedos-select-user-tree",
         "inputClassName": "p-0",
-        "id": "u:7fd77b7915b0",
         "source": {
           "method": "post",
           "url": "${context.rootUrl}/graphql",
@@ -5760,6 +5609,10 @@ function getLookupSapceUserTreeSchema(){
                 });
                 listView.handleFilterSubmit(Object.assign({}, filterFormValues));
               `
+              },
+              {
+                "actionType": "custom",
+                "script": " if(window.innerWidth < 768){ document.querySelector('.steedos-select-user-sidebar').classList.remove('steedos-select-user-sidebar-open'); }"
               }
             ]
           }
@@ -5784,18 +5637,56 @@ function getLookupSapceUserTreeSchema(){
           "placeholder": "查找部门"
         },
         "unfoldedLevel": 2,
-        "style": {
-          "max-height": "100%",
-          "position": "absolute",
-          "left": "-330px",
-          "width": "320px",
-          "bottom": 0,
-          "top": "0",
-          "overflow": "auto",
-          "min-height":"300px"
-        },
         "originPosition": "left-top"
-    }];
+    };
+    const tree = [];
+    if(isMobile){
+        tree.push({
+            type: "action",
+            body:[
+                {
+                    type: "action",
+                    body:[
+                        treeSchema
+                    ],
+                    className:"h-full w-[240px]"
+                }
+            ],
+            className: "absolute inset-0 steedos-select-user-sidebar",
+            "onEvent": {
+                "click": {
+                  "actions": [
+                    {
+                      "actionType": "custom",
+                      "script": "document.querySelector('.steedos-select-user-sidebar').classList.remove('steedos-select-user-sidebar-open')"
+                    }
+                  ]
+                }
+            },
+            id: "steedos_crud_toolbar_select_user_tree"
+        });
+        tree.push({
+            "type": "button",
+            "label": "组织",
+            "icon": "fa fa-sitemap",
+            "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+            "align": "left",
+            "onEvent": {
+              "click": {
+                "actions": [
+                  {
+                    "actionType": "custom",
+                    "script": "document.querySelector('.steedos-select-user-sidebar').classList.toggle('steedos-select-user-sidebar-open')"
+                  }
+                ]
+              }
+            },
+            "id": "steedos_crud_toolbar_organization_button"
+        });
+    }else {
+        tree.push(treeSchema);
+    }
+    
     return tree;
 }
 
@@ -6059,13 +5950,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
         pickerSchema.affixHeader = false;
 
         var headerToolbarItems = [];
-        if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && !isMobile){
-             headerToolbarItems = getLookupSapceUserTreeSchema();
-             pickerSchema["style"] = {
-                "margin-left":"330px",
-                "min-height": "300px"
-             };
-             pickerSchema.className = pickerSchema.className || "" + " steedos-select-user";
+        if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
+            headerToolbarItems = getLookupSapceUserTreeSchema(isMobile);
+            pickerSchema.className = pickerSchema.className || "" + " steedos-select-user";
         }
 
         pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { headerToolbarItems, isLookup: true, keywordsSearchBoxName });
@@ -6161,6 +6048,18 @@ async function lookupToAmisPicker(field, readonly, ctx){
         pickerSchema = Object.assign({}, pickerSchema, field.pickerSchema);
     }
 
+    if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && isMobile){
+        //手机端选人控件只保留部分toolbar
+        pickerSchema.headerToolbar = pickerSchema.headerToolbar && pickerSchema.headerToolbar.filter(function(item){
+            if(["steedos_crud_toolbar_quick_search","steedos_crud_toolbar_filter","steedos_crud_toolbar_select_user_tree","steedos_crud_toolbar_organization_button"].indexOf(item.id) > -1){
+                return true;
+            }else {
+                return false;
+            }
+        });
+        pickerSchema.footerToolbar = ["pagination"];
+    }
+
     const data = {
         type: getAmisStaticFieldType('picker', readonly),
         modalTitle:  i18next__default["default"].t('frontend_form_please_select') + " " + refObjectConfig.label,
@@ -6640,6 +6539,12 @@ const getHtmlFieldSchema = (field, readonly, ctx)=>{
           "receiver": "${context.rootUrl}/s3/images",
           "name": field.name,
           "options": {
+            "menu": {
+              "insert": {
+                "title": "Insert",
+                "items": "image link media addcomment pageembed codesample inserttable | charmap emoticons hr | pagebreak nonbreaking anchor tableofcontents | insertdatetime"
+              }
+            },
             "plugins": [
               "autoresize"
             ],
@@ -6654,6 +6559,14 @@ const getHtmlFieldSchema = (field, readonly, ctx)=>{
         return {
             "type": "input-rich-text",
             "receiver": "${context.rootUrl}/s3/images",
+            "options":{
+              "menu": {
+                "insert": {
+                  "title": "Insert",
+                  "items": "image link media addcomment pageembed codesample inserttable | charmap emoticons hr | pagebreak nonbreaking anchor tableofcontents | insertdatetime"
+                }
+              }
+            },
             "name": field.name
         }
         // return {
@@ -7427,7 +7340,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             convertData.className = 'm-1';
         }
         if(readonly){
-            convertData.className = `${convertData.className} md:border-b`;
+            convertData.className = `${convertData.className} border-b`;
         }
         if(readonly){
             convertData.quickEdit = false;
@@ -7897,7 +7810,10 @@ function getFieldWidth(width){
 }
 
 async function getTableColumns(fields, options){
-    const columns = [{name: '_index',type: 'text', width: 32, placeholder: ""}];
+    const columns = [];
+    if(!options.isLookup){
+        columns.push({name: '_index',type: 'text', width: 32, placeholder: ""});
+    }
     const allowEdit = options.permissions?.allowEdit && !options.isLookup && options.enable_inline_edit != false;
     
     for (const field of fields) {