@steedos-widgets/amis-lib 6.3.0-beta.17 → 6.3.0-beta.18

package/dist/index.esm.js

@@ -5793,21 +5793,16 @@ const getDropdown = (dropdownButtons)=>{
         "hideCaret": true,
         "className": "mr-0 steedos-mobile-header-drop-down",
         "closeOnClick": true,
-        "menuClassName": "buttons-drawer fixed inset-0 bg-none border-0 shadow-none",
+        "menuClassName": "buttons-drawer fixed bg-none border-0 shadow-none",
         "align": "right",
         "body": [
             {
                 "type": "action",
                 "style": {
-                    "position": "fixed",
-                    "top": 0,
-                    "right": 0,
-                    "bottom": 0,
-                    "left": 0,
                     "z-index": 1,
                     "background": "var(--Drawer-overlay-bg)",
-                    "height": "unset",
-                    "width": "unset",
+                    "height": "100%",
+                    "width": "100%",
                     "padding": "0",
                     "margin": "0",
                     "border-radius": "0"
@@ -6601,6 +6596,217 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   };
 }
 
+const getNewListviewButtonSchema = ()=>{
+    return {
+        "type": "button",
+        "label": i18next.t('frontend_listview_control_new_label'),
+        "className": "steedos-listview-new-button",
+        "onEvent": {
+          "click": {
+            "weight": 0,
+            "actions": [
+              {
+                "dialog": {
+                  "type": "dialog",
+                  "title": i18next.t('frontend_listview_control_new_title'),
+                  "data": {
+                    //"&":"$$",2.7、2.9、3.0在此处失效
+                    "all": "${uiSchema.list_views.all}",
+                    "list_view": "${uiSchema.list_views[listName]}",
+                    "appId": "${appId}",
+                    "global": "${global}",
+                    "targetObjectName": "${objectName}",
+                    "context": "${context}"
+                  },
+                  "body": [
+                    {
+                      "type": "steedos-object-form",
+                      "label": "对象表单",
+                      "objectApiName": "object_listviews",
+                      "recordId": "",
+                      "mode": "edit",
+                      "layout": "normal",
+                      "defaultData": {
+                        "&": "${list_view}",
+                        "name":"",
+                        "label":"",
+                        "filters":"",
+                        "shared":false,
+                        "object_name": "${targetObjectName}",
+                        "_id":"",
+                        "shared_to": null,
+                        "shared_to_organizations": null,
+                        "locked": false,
+                        "owner": null,
+                        "company_id": null,
+                        "company_ids": null,
+                        "is_system": false
+                      },
+                      "fieldsExtend": fieldsExtend$5(),
+                      "fields": fields$1(),
+                      "onEvent": {
+                        "submitSucc": {
+                          "weight": 0,
+                          "actions": [
+                            {
+                              "args": {
+                                // 直接使用recordId不能拿到数据，只能通过result里面拿数据
+                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/listview_${result.data.recordId|lowerCase}",
+                                "blank": false
+                              },
+                              "actionType": "url",
+                            }
+                          ]
+                        }
+                      },
+                      "messages": {
+                        "success": i18next.t('frontend_listview_control_new_message_success'),
+                        "failed": i18next.t('frontend_listview_control_new_message_failed')
+                      },
+                    }
+                  ],
+                  "showCloseButton": true,
+                  "showErrorMsg": true,
+                  "showLoading": true,
+                  "closeOnEsc": false,
+                  "dataMapSwitch": false,
+                  "size": "lg"
+                },
+                "actionType": "dialog"
+              }
+            ]
+          }
+        }
+    }
+};
+
+function fields$1(){
+  return [
+    "label",
+    "name",
+    "object_name",
+    "filter_scope",
+    "show_count",
+    "columns",
+    "sort",
+    "filters",
+    "mobile_columns",
+    "searchable_fields",
+    "is_system",
+    "shared",
+    "shared_to",
+    "shared_to_organizations"
+  ]
+}
+
+function fieldsExtend$5(){
+  return {
+    "group": "",
+    "label": {
+      "group": "",
+      "is_wide": true
+    },
+    "name": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "object_name": {
+      "group": "",
+      "amis": {
+        "hidden": true
+      }
+    },
+    "filter_scope": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "columns": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "mobile_columns":{
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "searchable_fields":{
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "filter_fields": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "scrolling_mode": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "sort": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "show_count": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "type": {
+      "group": "",
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "shared": {
+      "group": "",
+      "amis": {
+        "visibleOn": "${false}"
+      }
+    },
+    "shared_to": {
+      "group": "",
+      "amis":{
+        "type": "radios",
+        "inline": false
+      }
+    },
+    "shared_to_organizations": {
+      "group": ""
+    },
+    "filters": {
+      "group": "",
+      "amis": {
+        "hidden": true
+      }
+    }
+  }
+}
+
 /**
  * 列表视图顶部第一行amisSchema
  * @param {*} objectSchema 对象UISchema
@@ -6610,38 +6816,504 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
   const { icon, label } = objectSchema;
   const disabled_list_views = objectSchema.permissions.disabled_list_views;
   const listViewButtonOptions = [];
-  each(
-    objectSchema.list_views,
-    (listView, name) => {
-      if(name === "lookup" || (disabled_list_views && disabled_list_views.indexOf(listView._id)>-1)){
-        // 内置lookup为弹出选择专用视图，根据用户权限被禁用的视图，不显示在列表切换区域
-        return;
+  const initApiAdaptor = `
+    var data;
+    if (recordId) {
+      data = payload.data || { _filters_type_controller: 'conditions' };
+      //数据格式转换
+      if (data) {
+        data.sort = lodash.map(data.sort, (item) => {
+          return item.field_name + ":" + item.order;
+        });
+        data.searchable_fields = lodash.map(data.searchable_fields, 'field');
+    
+        if (data.filters && lodash.isString(data.filters)) {
+          try {
+            data.filters = JSON.parse(data.filters);
+          } catch (e) { }
+        }
+    
+        if (data.filters && lodash.isString(data.filters)) {
+          data._filters_type_controller = 'function';
+        } else {
+          data._filters_type_controller = 'conditions'
+        }
+    
+        if (data._filters_type_controller === 'conditions') {
+          data._filters_conditions = window.amisConvert.filtersToConditions(data.filters || []);
+        } else {
+          data._filters_function = data.filters;
+        }
       }
-      listViewButtonOptions.push({
-        type: "button",
-        label: listView.label,
-        actionType: "link",
-        link: `/app/\${appId}/${objectSchema.name}/grid/${name}`
+    } else {
+    const uiSchema = api.body.uiSchema;
+    const contextDefaultData = context && context.data && context.data.defaultData; const defaultData = api.body.defaultData || contextDefaultData;
+      let defaultValues = {};
+    _.each(uiSchema && uiSchema.fields, function (field) {
+        var value = SteedosUI.getFieldDefaultValue(field, api.body.global);
+        if (!_.isNil(value)) {
+          defaultValues[field.name] = value;
+        }
       });
+    if (defaultData && _.isObject(defaultData) && !_.isArray(defaultData)) {
+        data = Object.assign({}, defaultValues, defaultData); 
+      }else{data = Object.assign({}, defaultValues) } 
     }
-  );
-
-  let amisButtonsSchema = getObjectListViewButtonsSchemas(objectSchema, {formFactor: ctx.formFactor});
-  const reg = new RegExp('_', 'g');
-  const standardIcon = icon && icon.replace(reg, '-');
-  const standardNewButton = _.find(amisButtonsSchema, { name: "standard_new" });
-  const buttonSchema = [{
-    "type": "flex",
-    "items": amisButtonsSchema,
-    "visibleOn": "${display == 'split'?false:true}"
-  }];
-  if(ctx.formFactor !== 'SMALL'){
-    const restButtons = Array.isArray(amisButtonsSchema) ? amisButtonsSchema.filter(obj => obj.name !== "standard_new"):[];
-    buttonSchema.push({
-      "type": "flex",
-      "items":[
-        standardNewButton,
-        (restButtons.length > 0) && {
+    for (key in data) {
+      if (data[key] === null) {
+        delete data[key];
+      }
+    }
+    payload.data = data;
+    delete payload.extensions; if (data.is_enable != false) { data.is_enable = true; };
+    return payload;
+  `;
+  const apiRequestAdaptor = `
+    delete formData.created;
+    delete formData.created_by;
+    delete formData.modified;
+    delete formData.modified_by;
+    delete formData._display;
+    
+    //数据格式转换
+    formData.sort = lodash.map(formData.sort, (item) => {
+      const arr = item.split(':');
+      return { field_name: arr[0], order: arr[1] };
+    });
+    
+    formData.searchable_fields = lodash.map(formData.searchable_fields, (item) => {
+      return { field: item };
+    });
+    
+    if (!formData._filters_type_controller) {
+      formData._filters_type_controller = 'conditions';
+    }
+    
+    if (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {
+      formData.filters = window.amisConvert.conditionsToFilters(formData._filters_conditions);
+      // formData.filters = JSON.stringify(window.amisConvert.conditionsToFilters(formData._filters_conditions), null, 4);
+    } else {
+      formData.filters = formData._filters_function || null;
+    }
+    
+    delete formData._filters_type_controller;
+    delete formData._filters_conditions;
+    delete formData._filters_function;
+    
+    query = \`mutation{record: object_listviews__insert(doc: {__saveData}){_id}}\`;
+    if (formData.recordId) {
+      query = \`mutation{record: object_listviews__update(id: "\` + formData._id + \`", doc: {__saveData}){_id}}\`;
+    };
+    __saveData = JSON.stringify(JSON.stringify(formData));
+    
+    api.data = { query: query.replace('{__saveData}', __saveData) };
+    return api;
+  `;
+  each(
+    objectSchema.list_views,
+    (listView, name) => {
+      if(name === "lookup" || (disabled_list_views && disabled_list_views.indexOf(listView._id)>-1)){
+        // 内置lookup为弹出选择专用视图，根据用户权限被禁用的视图，不显示在列表切换区域
+        return;
+      }
+      listViewButtonOptions.push({
+        type: "button",
+        label: listView.label,
+        body: [
+          {
+            "type": "flex",
+            "alignItems": "center",
+            "justify": "space-between",
+            "items": [
+              {
+                "type": "tpl",
+                "tpl": listView.label 
+              },
+              {
+                "type": "button",
+                "className": "steedos-listview-edit-button",
+                "icon": "fa fa-edit",
+                "actionType": "dialog",
+                "hiddenOn": `!((global.user.is_space_admin || global.userId == '${listView.owner || ""}') && !!'${listView.owner || ""}')`,
+                "dialog": {
+                  "type": "dialog",
+                  "title": "编辑 列表视图",
+                  "data": {
+                    "object_name": "${objectName}",
+                    "recordId": listView._id,
+                    "listName": "${listName}",
+                    "appId": "${appId}",
+                    "context": "${context}",
+                    "global": "${global}",
+                    "_id": listView._id
+                  },
+                  "body": [
+                    {
+                      "type": "steedos-object-form",
+                      "label": "对象表单",
+                      "objectApiName": "object_listviews",
+                      "recordId": "${recordId}",
+                      "className": "sm:rounded sm:border-gray-300 bg-white",
+                      "layout": "horizontal",
+                      "form": {
+                        "id": "form_object_listviews"
+                      },
+                      "mode": "edit",
+                      "enableTabs": true,
+                      "fields": [
+                        "label",
+                        "sort_no",
+                        "crud_mode",
+                        "shared",
+                        "shared_to",
+                        'shared_to_organizations',
+                        "columns",
+                        "columns.$",
+                        "columns.$.field",
+                        "columns.$.width",
+                        "columns.$.wrap",
+                        "mobile_columns",
+                        "mobile_columns.$",
+                        "mobile_columns.$.field",
+                        "sort",
+                        "sort.$",
+                        "sort.$.field_name",
+                        "sort.$.order",
+                        "filters",
+                        "searchable_fields",
+                        "searchable_fields.$",
+                        "searchable_fields.$.field",
+                      ],
+                      "tabsMode": "line",
+                      "fieldsExtend": {
+                        "columns": {
+                          "amis": {
+                            "showIndex": true,
+                            "footerToolbar": [
+                              {
+                                "type": "button",
+                                "label": "${'object_listviews.listview_form.field_set' | t}",
+                                "actionType": "dialog",
+                                "dialog": {
+                                  "type": "dialog",
+                                  "title": "${'object_listviews.listview_form.displayed_columns' | t}",
+                                  "size": "md",
+                                  "body": [
+                                    {
+                                      "type": "transfer",
+                                      "options": [
+                                      ],
+                                      "multiple": true,
+                                      "id": "u:92c0b3cccca0",
+                                      "required": true,
+                                      "placeholder": "-",
+                                      "className": "col-span-2 m-0",
+                                      "checkAll": false,
+                                      "searchable": true,
+                                      "sortable": true,
+                                      "itemHeight": 40,
+                                      "source": {
+                                        "method": "get",
+                                        "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/fields/options",
+                                        "headers": {
+                                          "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                        },
+                                        "requestAdaptor": "",
+                                        "adaptor": ""
+                                      },
+                                      "joinValues": false,
+                                      "extractValue": true,
+                                      "name": "columns_quick_select",
+                                      "value": "${columns|pick:field|split}"
+                                    }
+                                  ],
+                                  "onEvent": {
+                                    "confirm": {
+                                      "actions": [
+                                        {
+                                          "actionType": "custom",
+                                          "script": "const columns = [];\nconst columns_quick_select = _.cloneDeep(event.data.columns_quick_select);\n_.forEach(columns_quick_select, function (field) {\n  const column_field = _.find(event.data.columns, { field });\n  if (column_field) {\n    columns.push(column_field)\n  } else {\n    columns.push({\n      field\n    })\n  }\n});\ndoAction({\n  \"componentId\": \"form_object_listviews\",\n  \"actionType\": \"setValue\",\n  \"args\": {\n    \"value\": {\n      columns\n    }\n  }\n});"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                }
+                              }
+                            ],
+                            "addable": false,
+                            "draggable": false,
+                            "columns": [
+                              {
+                                "name": "field",
+                                "inlineEditMode": false
+                              },
+                              {
+                                "name": "width",
+                                "width": 100
+                              },
+                              {
+                                "name": "wrap",
+                                "width": 50
+                              }
+                            ],
+                            "enableDialog": false
+                          }
+                        },
+                        "sort": {
+                          "label": "",
+                          "amis": {
+                            "type": "tabs-transfer",
+                            "options": [
+                            ],
+                            "id": "u:32f3e4e73115",
+                            "strictMode": true,
+                            "itemHeight": 40,
+                            "source": {
+                              "method": "get",
+                              "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/sortFields/options",
+                              "headers": {
+                                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                              },
+                              "data": null,
+                              "requestAdaptor": "",
+                              "adaptor": "",
+                              "sendOn": "!!this.object_name"
+                            },
+                            "visibleOn": "!!this.object_name",
+                            "sortable": true,
+                            "className": "col-span-2 m-0",
+                            "searchable": true,
+                            "checkAll": false,
+                            "clearValueOnHidden": false,
+                            "joinValues": false,
+                            "extractValue": true,
+                            "en-US": {
+                              "label": "Default Sort Order"
+                            },
+                            "multiple": true
+                          }
+                        },
+                        "filters": {
+                          "label": "",
+                          "amis": {
+                            "type": "group",
+                            "body": [
+                              {
+                                "type": "radios",
+                                "label": "${'object_listviews.listview_form.filter_configuration_method' | t}",
+                                "name": "_filters_type_controller",
+                                "options": [
+                                  {
+                                    "label": "${'object_listviews.listview_form.conditions_combination' | t}",
+                                    "value": "conditions"
+                                  },
+                                  {
+                                    "label": "${'object_listviews.listview_form.javascript' | t}",
+                                    "value": "function"
+                                  }
+                                ],
+                                "id": "u:318671bc196c",
+                                "joinValues": true,
+                                "className": "col-span-2 m-0",
+                                "language": "javascript",
+                                "visibleOn": "false",
+                                "en-US": {
+                                  "label": "Controller"
+                                }
+                              },
+                              {
+                                "type": "condition-builder",
+                                "label": "",
+                                "labelClassName": "none",
+                                "name": "_filters_conditions",
+                                "description": "",
+                                "id": "u:a9f2232e30d7",
+                                "source": {
+                                  "method": "get",
+                                  "url": "${context.rootUrl}/service/api/amis-metadata-listviews/getFilterFields?objectName=${object_name}",
+                                  "dataType": "json",
+                                  "headers": {
+                                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                  }
+                                },
+                                "disabled": false,
+                                "className": "col-span-2 m-0",
+                                "visibleOn": "!!this.object_name",
+                                "en-US": {
+                                  "label": "Filters Conditions"
+                                }
+                              },
+                              {
+                                "type": "editor",
+                                "label": "${'object_listviews.listview_form.javascript' | t}",
+                                "name": "_filters_function",
+                                "id": "u:84714ec9abba",
+                                "visibleOn": "!!this.object_name && !!this._filters_type_controller && _filters_type_controller== 'function'",
+                                "className": "col-span-2 m-0",
+                                "labelClassName": "hidden"
+                              }
+                            ]
+                          }
+                        },
+                        "mobile_columns": {
+                          "amis": {
+                            "showIndex": true,
+                            "footerToolbar": [
+                              {
+                                "type": "button",
+                                "label": "${'object_listviews.listview_form.field_set' | t}",
+                                "actionType": "dialog",
+                                "dialog": {
+                                  "type": "dialog",
+                                  "title": "${'object_listviews.listview_form.displayed_columns' | t}",
+                                  "size": "md",
+                                  "body": [
+                                    {
+                                      "type": "transfer",
+                                      "options": [
+                                      ],
+                                      "multiple": true,
+                                      "id": "u:92c0b3cccca0",
+                                      "required": true,
+                                      "placeholder": "-",
+                                      "className": "col-span-2 m-0",
+                                      "itemHeight": 40,
+                                      "checkAll": false,
+                                      "searchable": true,
+                                      "sortable": true,
+                                      "source": {
+                                        "method": "get",
+                                        "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/fields/options",
+                                        "headers": {
+                                          "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                        },
+                                        "requestAdaptor": "",
+                                        "adaptor": ""
+                                      },
+                                      "joinValues": false,
+                                      "extractValue": true,
+                                      "name": "columns_quick_select",
+                                      "value": "${mobile_columns|pick:field|split}"
+                                    }
+                                  ],
+                                  "onEvent": {
+                                    "confirm": {
+                                      "actions": [
+                                        {
+                                          "actionType": "custom",
+                                          "script": "const mobile_columns = [];\nconst columns_quick_select = _.cloneDeep(event.data.columns_quick_select);\n_.forEach(columns_quick_select, function (field) {\n  const column_field = _.find(event.data.mobile_columns, { field });\n  if (column_field) {\n    mobile_columns.push(column_field)\n  } else {\n    mobile_columns.push({\n      field\n    })\n  }\n});\ndoAction({\n  \"componentId\": \"form_object_listviews\",\n  \"actionType\": \"setValue\",\n  \"args\": {\n    \"value\": {\n      mobile_columns\n    }\n  }\n});"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                }
+                              }
+                            ],
+                            "columns": [
+                              {
+                                "name": "field",
+                                "inlineEditMode": false
+                              }
+                            ],
+                            "addable": false,
+                            "draggable": false,
+                            "enableDialog": false
+                          }
+                        },
+                        "searchable_fields": {
+                          "label": "",
+                          "amis": {
+                            "type": "transfer",
+                            "options": [
+                            ],
+                            "selectMode": "list",
+                            "searchable": true,
+                            "searchApi": "",
+                            "sortable": true,
+                            "mode": "normal",
+                            "searchResultMode": "list",
+                            "joinValues": false,
+                            "extractValue": true,
+                            "itemHeight": 40,
+                            "source": {
+                              "method": "get",
+                              "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${object_name}/fields/options",
+                              "headers": {
+                                "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                              },
+                              "data": null,
+                              "requestAdaptor": "",
+                              "adaptor": "",
+                              "sendOn": "!!this.object_name"
+                            },
+                            "visibleOn": "!!this.object_name",
+                            "className": "col-span-2 m-0",
+                            "multiple": true,
+                            "id": "u:adb91066539e"
+                          }
+                        },
+                        "shared_to": {
+                          "amis":{
+                            "type": "radios",
+                            "inline": false
+                          },
+                          "group": "",
+                          "is_wide": true
+                        }
+                      },
+                      initApiAdaptor,
+                      apiRequestAdaptor,
+                      "onEvent": {
+                        "submitSucc": {
+                          "weight": 0,
+                          "actions": [
+                            {
+                              "args": {
+                                "url": "${context.rootUrl}/app/${appId}/${object_name}/grid/${name}",
+                                "blank": false
+                              },
+                              "actionType": "url",
+                            },
+                          ]
+                        }
+                      },
+                      "id": "u:ce9e3fcc411a"
+                    }
+                  ],
+                  "className": "steedos-overflow-visible-dialog",
+                  "showCloseButton": true,
+                  "showErrorMsg": true,
+                  "showLoading": true,
+                  "closeOnEsc": false,
+                  "dataMapSwitch": false,
+                  "size": "lg"
+                }
+              }
+            ]
+          }
+        ],
+        actionType: "link",
+        link: `/app/\${appId}/${objectSchema.name}/grid/${name}`
+      });
+    }
+  );
+
+  let amisButtonsSchema = getObjectListViewButtonsSchemas(objectSchema, {formFactor: ctx.formFactor});
+  const reg = new RegExp('_', 'g');
+  const standardIcon = icon && icon.replace(reg, '-');
+  const standardNewButton = _.find(amisButtonsSchema, { name: "standard_new" });
+  const buttonSchema = [{
+    "type": "flex",
+    "items": amisButtonsSchema,
+    "visibleOn": "${display == 'split'?false:true}"
+  }];
+  if(ctx.formFactor !== 'SMALL'){
+    const restButtons = Array.isArray(amisButtonsSchema) ? amisButtonsSchema.filter(obj => obj.name !== "standard_new"):[];
+    buttonSchema.push({
+      "type": "flex",
+      "items":[
+        standardNewButton,
+        (restButtons.length > 0) && {
           "type": "dropdown-button",
           "buttons": restButtons,
           "className": " ml-1",
@@ -6653,6 +7325,8 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
       "visibleOn": "${display == 'split'?true:false}"
     });
   }
+  const listviewNewButton = getNewListviewButtonSchema();
+  listviewNewButton.visibleOn = "global.user.is_space_admin";
   return {
     "type": "grid",
     "columns": [
@@ -6683,14 +7357,17 @@ function getObjectListHeaderFirstLine(objectSchema, listViewName, ctx) {
                   },
                   {
                     "type": "dropdown-button",
-                    "className": "", 
+                    "className": "steedos-listview-change-button", 
                     "label": "\${listName ? uiSchema.list_views[listName].label : uiSchema.list_views[defaultListName].label}",
                     "rightIcon": "fa fa-caret-down",
                     "size": "sm",
                     "hideCaret": true,
                     "closeOnClick": true,
                     "btnClassName": "!bg-transparent !border-none !hover:border-none text-lg h-5 font-bold p-0 text-black leading-none",
-                    "buttons": listViewButtonOptions
+                    "buttons": [
+                      ...listViewButtonOptions,
+                      listviewNewButton
+                    ]
                   }
                 ],
                 "md": "",
@@ -7218,216 +7895,6 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
 async function getObjectRelatedListHeader(objectSchema, recordId, relatedObjectName) {
 }
 
-const getNewListviewButtonSchema = ()=>{
-    return {
-        "type": "button",
-        "label": i18next.t('frontend_listview_control_new_label'),
-        "onEvent": {
-          "click": {
-            "weight": 0,
-            "actions": [
-              {
-                "dialog": {
-                  "type": "dialog",
-                  "title": i18next.t('frontend_listview_control_new_title'),
-                  "data": {
-                    //"&":"$$",2.7、2.9、3.0在此处失效
-                    "all": "${uiSchema.list_views.all}",
-                    "list_view": "${uiSchema.list_views[listName]}",
-                    "appId": "${appId}",
-                    "global": "${global}",
-                    "targetObjectName": "${objectName}",
-                    "context": "${context}"
-                  },
-                  "body": [
-                    {
-                      "type": "steedos-object-form",
-                      "label": "对象表单",
-                      "objectApiName": "object_listviews",
-                      "recordId": "",
-                      "mode": "edit",
-                      "layout": "normal",
-                      "defaultData": {
-                        "&": "${list_view}",
-                        "name":"",
-                        "label":"",
-                        "filters":"",
-                        "shared":false,
-                        "object_name": "${targetObjectName}",
-                        "_id":"",
-                        "shared_to": null,
-                        "shared_to_organizations": null,
-                        "locked": false,
-                        "owner": null,
-                        "company_id": null,
-                        "company_ids": null,
-                        "is_system": false
-                      },
-                      "fieldsExtend": fieldsExtend$5(),
-                      "fields": fields$1(),
-                      "onEvent": {
-                        "submitSucc": {
-                          "weight": 0,
-                          "actions": [
-                            {
-                              "args": {
-                                // 直接使用recordId不能拿到数据，只能通过result里面拿数据
-                                "url": "${context.rootUrl}/app/${appId}/${targetObjectName}/grid/listview_${result.data.recordId|lowerCase}",
-                                "blank": false
-                              },
-                              "actionType": "url",
-                            }
-                          ]
-                        }
-                      },
-                      "messages": {
-                        "success": i18next.t('frontend_listview_control_new_message_success'),
-                        "failed": i18next.t('frontend_listview_control_new_message_failed')
-                      },
-                    }
-                  ],
-                  "showCloseButton": true,
-                  "showErrorMsg": true,
-                  "showLoading": true,
-                  "closeOnEsc": false,
-                  "dataMapSwitch": false,
-                  "size": "lg"
-                },
-                "actionType": "dialog"
-              }
-            ]
-          }
-        }
-    }
-};
-
-function fields$1(){
-  return [
-    "label",
-    "name",
-    "object_name",
-    "filter_scope",
-    "show_count",
-    "columns",
-    "sort",
-    "filters",
-    "mobile_columns",
-    "searchable_fields",
-    "is_system",
-    "shared",
-    "shared_to",
-    "shared_to_organizations"
-  ]
-}
-
-function fieldsExtend$5(){
-  return {
-    "group": "",
-    "label": {
-      "group": "",
-      "is_wide": true
-    },
-    "name": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "object_name": {
-      "group": "",
-      "amis": {
-        "hidden": true
-      }
-    },
-    "filter_scope": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "columns": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "mobile_columns":{
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "searchable_fields":{
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "filter_fields": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "scrolling_mode": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "sort": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "show_count": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "type": {
-      "group": "",
-      "amis": {
-        "hidden": true,
-        "required": false
-      }
-    },
-    "shared": {
-      "group": "",
-      "amis": {
-        "visibleOn": "${false}"
-      }
-    },
-    "shared_to": {
-      "group": "",
-      "amis":{
-        "type": "radios",
-        "inline": false
-      }
-    },
-    "shared_to_organizations": {
-      "group": ""
-    },
-    "filters": {
-      "group": "",
-      "amis": {
-        "hidden": true
-      }
-    }
-  }
-}
-
 const getCopyListviewButtonSchema = ()=>{
     return {
         "type": "button",