@steedos-widgets/amis-object 1.3.0-beta.11 → 1.3.0-beta.12

package/dist/amis-object.cjs.css

@@ -1066,11 +1066,6 @@ fieldset.antd-Collapse > legend{
         box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
     }
 }
-@media (min-width: 768px) {
-    .md\:border-b {
-        border-bottom-width: 1px
-    }
-}
 @media (min-width: 1024px) {
     .lg\:z-50 {
         z-index: 50
@@ -1249,6 +1244,21 @@ fieldset.antd-Collapse > legend{
   /* 显示的行数 */
   -webkit-box-orient: vertical;
 }
+/* 魔方定义的按钮，统一把 .antd-Button--size-default 的右侧margin值 var(--button-size-default-marginRight) 去除 */
+.steedos-object-button .antd-Button {
+  margin-right: 0px;
+}
+.steedos-object-button.antd-Button {
+  margin-right: 0px;
+}
+/* 魔方定义的按钮，连续的按钮左侧加间隔分开，第一个按钮不会识别此样式 */
+.steedos-object-button + .steedos-object-button {
+  margin-left: 4px;
+}
+/* 魔方定义的按钮，如果是显示在下拉菜单作为菜单按钮则不能加间隔 */
+.antd-ButtonGroup--vertical .steedos-object-button + .steedos-object-button {
+  margin-left: 0px;
+}
 
 
 .steedos-dropdown-button-overlay .ant-dropdown-menu-item {
@@ -1369,9 +1379,25 @@ fieldset.antd-Collapse > legend{
 
 @media (max-width: 767px) {
   .steedos-amis-form.antd-Form {
-    /* start ======== 移动端给部分input加边框，并使输入框上下居中*/
+    /* start ======== 移动端参照电脑端样式*/
     /* =========end */
   }
+  .steedos-amis-form.antd-Form .antd-Picker-valueWrap {
+    display: flex;
+  }
+  .steedos-amis-form.antd-Form .antd-Form-item > .antd-Form-label {
+    max-width: var(--Form-mode-default-width);
+  }
+  .steedos-amis-form.antd-Form .antd-Select.is-mobile {
+    border-width: var(--Form-select-borderWidth);
+    border-style: var(--select-base-default-top-border-style) var(--select-base-default-right-border-style) var(--select-base-default-bottom-border-style) var(--select-base-default-left-border-style);
+    border-color: var(--Form-select-borderColor);
+    padding: var(--select-base-default-paddingTop) var(--select-base-default-paddingRight) var(--select-base-default-paddingBottom) var(--select-base-default-paddingLeft);
+    min-height: var(--Form-selectOption-height);
+  }
+  .steedos-amis-form.antd-Form .antd-Form-item::after {
+    border-bottom: unset;
+  }
   .steedos-amis-form.antd-Form .antd-Form-item .antd-Form-control > .antd-TextControl-input,
   .steedos-amis-form.antd-Form .antd-Form-item div.antd-TextareaControl {
     border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
@@ -1397,8 +1423,16 @@ fieldset.antd-Collapse > legend{
     height: 100%;
   }
   .steedos-amis-form.antd-Form .antd-Form-item {
-    margin-top: 0;
+    display: block;
+    margin-top: 0.25rem;
+    margin-bottom: 0.25rem;
     align-items: center;
+    padding: 0;
+  }
+  .steedos-amis-form.antd-Form .antd-Form-item .antd-Form-static {
+    padding-top: var(--Form-label-paddingTop);
+    padding-bottom: var(--Form-label-paddingTop);
+    min-height: var(--Form-input-height);
   }
 }
 

package/dist/amis-object.cjs.js

@@ -6273,7 +6273,7 @@ const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
             name: button.name,
             objectName: button.objectName,
             visibleOn: getButtonVisibleOn$1(button),
-            className: `button_${button.name} mr-0`
+            className: `button_${button.name}`
             }
         });
     }
@@ -8445,76 +8445,133 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
   if(isMobile){
     showDisplayAs = false;
   }
+  let toolbarCount;
+  if(!hiddenCount){
+    toolbarCount = {
+      "type": "tpl",
+      "tpl":  "${count} " + instance.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": instance.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
+            }
+          ]
+        }
+      }
+    };
+  }
+  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} " + instance.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": instance.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 || []),
@@ -8523,56 +8580,12 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
         "type": "columns-toggler",
         "className": "hidden"
       },
+      ...toolbars,
       // {
       //     "type": "columns-toggler",
       //     "className": "mr-2"
       // },
-      hiddenCount ? {} : {
-        "type": "tpl",
-        "tpl":  "${count} " + instance.t('frontend_record_sum')
-      },
-      filterVisible ? {
-        "label": instance.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"
@@ -10569,7 +10582,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;
@@ -17573,7 +17586,7 @@ var AmisObjectButton = function (props) {
             delete schema.body[0]['visibleOn'];
         }
         if (schema && className) {
-            schema.className = schema.className + ' ' + className;
+            schema.className = schema.className + ' steedos-object-button ' + className;
         }
         var renderData = Object.assign(data, { objectName: objectName, app_id: appId, className: className });
         if (data._id) {
@@ -17594,7 +17607,7 @@ var AmisObjectButton = function (props) {
         }))) : null));
     }
     else {
-        return (React__default["default"].createElement("button", { onClick: buttonClick, className: "antd-Button antd-Button--default antd-Button--size-default ".concat(className ? className : '') }, button.label));
+        return (React__default["default"].createElement("button", { onClick: buttonClick, className: "antd-Button antd-Button--default antd-Button--size-default steedos-object-button ".concat(className ? className : '') }, button.label));
     }
 };