neo-cmp-cli 1.13.11 → 1.13.13

package/template/neo-web-entity-grid/src/components/createForm__c/style.scss

@@ -1,14 +1,24 @@
 .createForm__c {
+  padding: 12px 24px;
+  box-sizing: border-box;
+  background: #fff;
+
   .form-header {
-    margin-bottom: 24px;
-    padding-bottom: 16px;
-    border-bottom: 1px solid #f0f0f0;
+    display: flex;
+    align-items: center;
+    height: 38px;
+    padding: 0 12px;
+    margin-bottom: 20px;
+    box-sizing: border-box;
+    background: #f5f5f5;
+    border-radius: 8px;
 
     .form-title {
       margin: 0;
-      font-size: 18px;
-      font-weight: 600;
+      font-size: 14px;
+      font-weight: 500;
       color: #262626;
+      line-height: 1.2;
     }
   }
 
@@ -21,7 +31,7 @@
           padding-bottom: 6px;
 
           label {
-            font-weight: 500;
+            font-weight: 400;
             color: #262626;
             font-size: 14px;
 
@@ -113,59 +123,66 @@
     }
 
     .form-actions {
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      flex-wrap: wrap;
       margin-top: 32px;
-      padding-top: 24px;
-      border-top: 1px solid #f0f0f0;
-      text-align: center;
+      padding-top: 16px;
+      border-top: 1px solid rgba(0, 0, 0, 0.06);
 
-      .ant-space {
-        .ant-btn {
-          min-width: 100px;
-          height: 40px;
-          font-size: 15px;
-          border-radius: 4px;
-          font-weight: 500;
-          transition: all 0.3s;
+      .ant-btn {
+        height: 32px;
+        padding: 0 14px;
+        font-size: 14px;
+        border-radius: 16px;
+        font-weight: 400;
+        min-width: auto;
+        margin-left: 10px;
+        transition: all 0.3s;
+
+        &:first-child {
+          margin-left: 0;
+        }
 
-          &.ant-btn-primary {
-            background: #1890ff;
-            border-color: #1890ff;
+        &.ant-btn-primary {
+          background: #1890ff;
+          border-color: #1890ff;
 
-            &:hover {
-              background: #40a9ff;
-              border-color: #40a9ff;
-              transform: translateY(-2px);
-              box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3);
-            }
+          &:hover {
+            background: #40a9ff;
+            border-color: #40a9ff;
+            transform: translateY(-1px);
+            box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3);
+          }
 
-            &:active {
-              background: #096dd9;
-              border-color: #096dd9;
-              transform: translateY(0);
-            }
+          &:active {
+            background: #096dd9;
+            border-color: #096dd9;
+            transform: translateY(0);
+          }
 
-            &:disabled {
-              background: #f5f5f5;
-              border-color: #d9d9d9;
-              color: rgba(0, 0, 0, 0.25);
-              transform: none;
-              box-shadow: none;
-            }
+          &:disabled {
+            background: #f5f5f5;
+            border-color: #d9d9d9;
+            color: rgba(0, 0, 0, 0.25);
+            transform: none;
+            box-shadow: none;
           }
+        }
 
-          &:not(.ant-btn-primary) {
-            &:hover {
-              color: #40a9ff;
-              border-color: #40a9ff;
-              transform: translateY(-2px);
-              box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
-            }
+        &:not(.ant-btn-primary) {
+          &:hover {
+            color: #40a9ff;
+            border-color: #40a9ff;
+            transform: translateY(-1px);
+            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.06);
+          }
 
-            &:active {
-              color: #096dd9;
-              border-color: #096dd9;
-              transform: translateY(0);
-            }
+          &:active {
+            color: #096dd9;
+            border-color: #096dd9;
+            transform: translateY(0);
           }
         }
       }
@@ -197,10 +214,9 @@
   @media (max-width: 768px) {
     .form-header {
       margin-bottom: 16px;
-      padding-bottom: 12px;
 
       .form-title {
-        font-size: 16px;
+        font-size: 13px;
       }
     }
 
@@ -228,12 +244,9 @@
         margin-top: 24px;
         padding-top: 16px;
 
-        .ant-space {
-          .ant-btn {
-            min-width: 80px;
-            height: 36px;
-            font-size: 14px;
-          }
+        .ant-btn {
+          height: 32px;
+          font-size: 13px;
         }
       }
     }
@@ -242,7 +255,7 @@
   @media (max-width: 576px) {
     .form-header {
       .form-title {
-        font-size: 15px;
+        font-size: 13px;
       }
     }
 
@@ -268,103 +281,19 @@
       }
 
       .form-actions {
-        .ant-space {
-          width: 100%;
+        flex-direction: column;
+        align-items: stretch;
 
-          .ant-space-item {
-            flex: 1;
-          }
+        .ant-btn {
+          width: 100%;
+          margin-left: 0;
+          margin-top: 10px;
 
-          .ant-btn {
-            width: 100%;
-            min-width: auto;
+          &:first-child {
+            margin-top: 0;
           }
         }
       }
     }
   }
-}
-
-// 全局样式覆盖
-.ant-card {
-  border-radius: 6px;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-
-  .ant-card-body {
-    padding: 24px;
-  }
-}
-
-// Spin 加载样式
-.ant-spin {
-  .ant-spin-dot {
-    font-size: 20px;
-  }
-
-  .ant-spin-text {
-    color: #8c8c8c;
-    font-size: 14px;
-  }
-}
-
-// Select 下拉样式优化
-.ant-select-dropdown {
-  border-radius: 4px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
-
-  .ant-select-item {
-    padding: 8px 12px;
-
-    &:hover {
-      background-color: #f5f5f5;
-    }
-
-    &.ant-select-item-option-selected {
-      background-color: #e6f7ff;
-      color: #1890ff;
-      font-weight: 500;
-    }
-  }
-}
-
-// DatePicker 日期选择器样式优化
-.ant-picker-dropdown {
-  .ant-picker-panel-container {
-    border-radius: 4px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
-  }
-
-  .ant-picker-cell-selected {
-    .ant-picker-cell-inner {
-      background-color: #1890ff;
-    }
-  }
-
-  .ant-picker-cell:hover:not(.ant-picker-cell-selected) {
-    .ant-picker-cell-inner {
-      background-color: #f5f5f5;
-    }
-  }
-}
-
-// InputNumber 数字输入框样式优化
-.ant-input-number {
-  .ant-input-number-handler-wrap {
-    opacity: 0;
-    transition: opacity 0.3s;
-  }
-
-  &:hover {
-    .ant-input-number-handler-wrap {
-      opacity: 1;
-    }
-  }
-
-  .ant-input-number-handler {
-    border-left: 1px solid #d9d9d9;
-
-    &:hover {
-      background-color: #f5f5f5;
-    }
-  }
-}
+}

package/template/neo-web-entity-grid/src/components/searchForm__c/index.tsx

@@ -9,10 +9,8 @@ import {
   Select,
   Button,
   message,
-  Card,
   DatePicker,
   InputNumber,
-  Space,
   Spin,
   Empty,
   Row,
@@ -26,6 +24,7 @@ import isEqual from 'lodash/isEqual';
 // 引入 neo-ui-common / NeoEvent
 // @ts-ignore
 import { NeoEvent } from 'neo-ui-common';
+
 import './style.scss';
 
 const { Option } = Select;
@@ -604,59 +603,55 @@ export default class SearchForm extends React.PureComponent<
 
     return (
       <div className={`searchForm__c ${className || ''}`.trim()}>
-        <Card bordered={false} className="searchForm__c-card">
-          <div className="form-header">
-            <div className="form-header-text">
-              <h3 className="form-title">{displayTitle}</h3>
-            </div>
+        <div className="form-header">
+          <div className="form-header-text">
+            <h3 className="form-title">{displayTitle}</h3>
           </div>
-
-          <div className="form-content">
-            <Spin spinning={loading} tip="加载字段信息...">
-              {error ? (
-                <Empty
-                  image={Empty.PRESENTED_IMAGE_SIMPLE}
-                  description={
-                    <div>
-                      <div style={{ color: '#ff4d4f', marginBottom: 8 }}>
-                        {error}
-                      </div>
-                      <Button type="primary" onClick={this.loadFieldList}>
-                        重新加载
-                      </Button>
+        </div>
+
+        <div className="form-content">
+          <Spin spinning={loading} tip="加载字段信息...">
+            {error ? (
+              <Empty
+                image={Empty.PRESENTED_IMAGE_SIMPLE}
+                description={
+                  <div>
+                    <div style={{ color: '#ff4d4f', marginBottom: 8 }}>
+                      {error}
                     </div>
-                  }
-                />
-              ) : (
-                <>
-                  {this.renderForm()}
-                  <div className="form-actions">
-                    <Space size="middle">
-                      {showResetButton && (
-                        <Button
-                          icon={<ReloadOutlined />}
-                          onClick={this.handleReset}
-                          disabled={submitting}
-                        >
-                          重置
-                        </Button>
-                      )}
-                      <Button
-                        type="primary"
-                        icon={<SearchOutlined />}
-                        onClick={this.handleSubmit}
-                        loading={submitting}
-                        disabled={!xObjectApiKey}
-                      >
-                        {submitting ? '查询中...' : '查询'}
-                      </Button>
-                    </Space>
+                    <Button type="primary" onClick={this.loadFieldList}>
+                      重新加载
+                    </Button>
                   </div>
-                </>
-              )}
-            </Spin>
-          </div>
-        </Card>
+                }
+              />
+            ) : (
+              <>
+                {this.renderForm()}
+                <div className="form-actions">
+                  {showResetButton && (
+                    <Button
+                      icon={<ReloadOutlined />}
+                      onClick={this.handleReset}
+                      disabled={submitting}
+                    >
+                      重置
+                    </Button>
+                  )}
+                  <Button
+                    type="primary"
+                    icon={<SearchOutlined />}
+                    onClick={this.handleSubmit}
+                    loading={submitting}
+                    disabled={!xObjectApiKey}
+                  >
+                    {submitting ? '查询中...' : '查询'}
+                  </Button>
+                </div>
+              </>
+            )}
+          </Spin>
+        </div>
       </div>
     );
   }

package/template/neo-web-entity-grid/src/components/searchForm__c/style.scss

@@ -1,4 +1,3 @@
-/* 查询表单：仅作用于 .searchForm__c，避免污染全局 Ant 组件 */
 .searchForm__c {
   --sf-accent: #1890ff;
   --sf-accent-soft: rgba(24, 144, 255, 0.12);
@@ -6,60 +5,36 @@
   --sf-text-secondary: #595959;
   --sf-text-muted: #8c8c8c;
   --sf-border: rgba(0, 0, 0, 0.08);
-  --sf-radius: 10px;
   --sf-radius-sm: 8px;
-  --sf-shadow: 0 1px 2px rgba(0, 0, 0, 0.04), 0 8px 24px rgba(0, 0, 0, 0.06);
 
   color: var(--sf-text);
-
-  .searchForm__c-card {
-    border-radius: var(--sf-radius);
-    border: 1px solid var(--sf-border);
-    box-shadow: var(--sf-shadow);
-    background: #fff;
-    overflow: hidden;
-    transition: box-shadow 0.25s ease, border-color 0.25s ease;
-
-    &:hover {
-      border-color: rgba(24, 144, 255, 0.18);
-      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04), 0 12px 32px rgba(0, 0, 0, 0.08);
-    }
-
-    .ant-card-body {
-      padding: 20px 24px 22px;
-    }
-  }
+  padding: 12px 24px;
+  box-sizing: border-box;
+  background: #fff;
 
   .form-header {
     display: flex;
-    align-items: flex-start;
-    gap: 14px;
+    align-items: center;
+    height: 38px;
+    padding: 0 12px;
     margin: 0 0 20px;
-    padding-bottom: 16px;
-    border-bottom: 1px solid var(--sf-border);
-
-    &::before {
-      content: '';
-      flex-shrink: 0;
-      width: 4px;
-      min-height: 22px;
-      margin-top: 3px;
-      border-radius: 2px;
-      background: linear-gradient(180deg, var(--sf-accent) 0%, #69c0ff 100%);
-    }
+    box-sizing: border-box;
+    background: #f5f5f5;
+    border-radius: 8px;
 
     .form-header-text {
       flex: 1;
       min-width: 0;
+      display: flex;
+      align-items: center;
     }
 
     .form-title {
       margin: 0;
-      font-size: 17px;
-      font-weight: 600;
+      font-size: 14px;
+      font-weight: 500;
       color: var(--sf-text);
-      letter-spacing: -0.02em;
-      line-height: 1.35;
+      line-height: 1.2;
     }
 
     .form-tenant {
@@ -88,18 +63,35 @@
     }
 
     .ant-form {
+      // 横向布局：标签列与控件列垂直居中（Form.Item 外层为 flex 行）
+      &.ant-form-horizontal .ant-form-item {
+        align-items: center;
+      }
+
+      // 多行文本控件较高，标签与控件顶部对齐更自然
+      &.ant-form-horizontal .ant-form-item:has(.ant-input-textarea) {
+        align-items: flex-start;
+
+        .ant-form-item-label > label {
+          margin-top: 4px;
+        }
+      }
+
       .ant-form-item {
         margin-bottom: 18px;
 
         .ant-form-item-label {
-          padding-bottom: 4px;
+          // 横向布局下 label 在左侧，不应保留「纵向表单」的底部留白
+          padding-bottom: 0;
 
           > label {
-            font-weight: 500;
+            font-weight: 400;
             color: var(--sf-text-secondary);
             font-size: 14px;
-            height: auto;
-            line-height: 1.5;
+            display: inline-flex;
+            align-items: center;
+            min-height: 32px;
+            line-height: 1.4;
           }
         }
 
@@ -183,25 +175,26 @@
     .form-actions {
       display: flex;
       justify-content: flex-end;
+      align-items: center;
       flex-wrap: wrap;
-      gap: 12px;
       margin-top: 8px;
-      padding-top: 20px;
-      border-top: 1px solid var(--sf-border);
-
-      .ant-space {
-        flex-wrap: wrap;
-      }
+      padding-top: 16px;
+      border-top: 1px solid rgba(0, 0, 0, 0.06);
 
       .ant-btn {
-        min-width: 96px;
-        height: 38px;
-        padding: 0 18px;
+        height: 32px;
+        padding: 0 14px;
         font-size: 14px;
-        border-radius: var(--sf-radius-sm);
-        font-weight: 500;
+        border-radius: 16px;
+        font-weight: 400;
+        min-width: auto;
+        margin-left: 10px;
         transition: border-color 0.2s ease, background 0.2s ease, box-shadow 0.2s ease;
 
+        &:first-child {
+          margin-left: 0;
+        }
+
         &.ant-btn-primary {
           background: var(--sf-accent);
           border-color: var(--sf-accent);
@@ -279,17 +272,13 @@
   }
 
   @media (max-width: 768px) {
-    .searchForm__c-card .ant-card-body {
-      padding: 16px 16px 18px;
-    }
+    padding: 16px 16px 18px;
 
     .form-header {
       margin-bottom: 16px;
-      padding-bottom: 12px;
-      gap: 10px;
 
       .form-title {
-        font-size: 16px;
+        font-size: 13px;
       }
 
       .form-tenant {
@@ -307,8 +296,7 @@
       }
 
       .form-actions .ant-btn {
-        min-width: 88px;
-        height: 36px;
+        height: 32px;
         font-size: 13px;
       }
     }
@@ -316,7 +304,7 @@
 
   @media (max-width: 576px) {
     .form-header .form-title {
-      font-size: 15px;
+      font-size: 13px;
     }
 
     .form-content {
@@ -326,19 +314,17 @@
       }
 
       .form-actions {
-        justify-content: stretch;
-
-        .ant-space {
-          width: 100%;
-        }
-
-        .ant-space-item {
-          flex: 1;
-        }
+        flex-direction: column;
+        align-items: stretch;
 
         .ant-btn {
           width: 100%;
-          min-width: 0;
+          margin-left: 0;
+          margin-top: 10px;
+
+          &:first-child {
+            margin-top: 0;
+          }
         }
       }
     }

package/template/neo-web-form/package.json

@@ -53,7 +53,7 @@
     "@types/react-dom": "^16.9.15",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
-    "neo-cmp-cli": "^1.13.11",
+    "neo-cmp-cli": "^1.13.13",
     "prettier": "^2.0.5"
   },
   "overrides": {