neo-cmp-cli 1.13.11 → 1.13.13

package/template/neo-web-form/src/components/batchAddTable__c/index.tsx

@@ -887,9 +887,9 @@ export default class BatchAddTable extends React.PureComponent<
 
     const modalFooter = showModalFooter ? (
       <div className="batch-add-modal-footer-inner">
-        <Space size="middle" wrap>
+        <Space size={10} wrap className="batch-add-modal-footer-actions">
           <Button
-            size="large"
+            className="batch-add-modal-footer-btn"
             icon={<CloseOutlined />}
             onClick={this.handleCancel}
             disabled={submitting}
@@ -919,7 +919,7 @@ export default class BatchAddTable extends React.PureComponent<
           >
             <span>
               <Button
-                size="large"
+                className="batch-add-modal-footer-btn"
                 icon={<ReloadOutlined />}
                 disabled={submitting}
               >
@@ -929,8 +929,7 @@ export default class BatchAddTable extends React.PureComponent<
           </Popconfirm>
           <Button
             type="primary"
-            size="large"
-            className="batch-add-submit-btn"
+            className="batch-add-modal-footer-btn batch-add-modal-footer-btn--submit"
             icon={<SaveOutlined />}
             loading={submitting}
             onClick={this.handleSubmit}
@@ -944,9 +943,11 @@ export default class BatchAddTable extends React.PureComponent<
     const modalBody = (
       <div className="batch-add-modal-layout">
         <div className="batch-add-modal-toolbar-wrap">
-          <Space wrap>
+          <Space wrap className="batch-add-modal-toolbar" size={10}>
             <Button
               type="primary"
+              size="small"
+              className="batch-add-modal-toolbar-btn"
               icon={<PlusOutlined />}
               onClick={this.addRow}
               disabled={!xObjectApiKey || !fields.length}
@@ -954,6 +955,8 @@ export default class BatchAddTable extends React.PureComponent<
               添加一行
             </Button>
             <Button
+              size="small"
+              className="batch-add-modal-toolbar-btn"
               icon={<DownloadOutlined />}
               onClick={this.handleDownloadTemplate}
               disabled={!fields.length}
@@ -966,6 +969,8 @@ export default class BatchAddTable extends React.PureComponent<
               beforeUpload={this.handleImportBeforeUpload}
             >
               <Button
+                size="small"
+                className="batch-add-modal-toolbar-btn"
                 icon={<UploadOutlined />}
                 disabled={!xObjectApiKey || !fields.length}
               >
@@ -1024,7 +1029,11 @@ export default class BatchAddTable extends React.PureComponent<
         <div
           className={`batch-add-entry-toolbar batch-add-entry-toolbar--${batchImportButtonAlign}`}
         >
-          <Button type="primary" onClick={this.openModal}>
+          <Button
+            type="primary"
+            className="batch-add-import-btn"
+            onClick={this.openModal}
+          >
             {batchImportButtonTitle}
           </Button>
         </div>

package/template/neo-web-form/src/components/batchAddTable__c/style.scss

@@ -18,4 +18,18 @@
       justify-content: flex-end;
     }
   }
+
+  /** 批量导入入口按钮：32px 高、16px 圆角、水平外边距 10px */
+  .batch-add-import-btn {
+    height: 32px !important;
+    padding: 0 14px !important;
+    border-radius: 16px !important;
+    margin-left: 10px;
+    margin-right: 10px;
+    font-size: 13px;
+    line-height: 1;
+    display: inline-flex !important;
+    align-items: center;
+    justify-content: center;
+  }
 }

package/template/neo-web-form/src/components/batchAddTable__c/tableModal.scss

@@ -32,23 +32,39 @@
     min-height: 0;
   }
 
-  /** 弹窗内顶部操作区：固定高度、按钮靠右 */
+  /** 弹窗内顶部操作区：较小按钮、16px 圆角、水平方向左右各 10px 留白 */
   .batch-add-modal-toolbar-wrap {
     flex-shrink: 0;
     box-sizing: border-box;
-    height: 64px;
+    min-height: 44px;
+    height: auto;
+    padding: 8px 10px;
     display: flex;
     align-items: center;
     justify-content: flex-end;
-    padding-bottom: 12px;
-    margin-bottom: 12px;
-    border-bottom: 1px solid #f0f0f0;
+    margin-bottom: 5px;
+    // border-bottom: 1px solid #f0f0f0;
+  }
+
+  .batch-add-modal-toolbar {
+    justify-content: flex-end;
+
+    .batch-add-modal-toolbar-btn {
+      height: 28px !important;
+      padding: 0 10px !important;
+      font-size: 12px !important;
+      border-radius: 16px !important;
+      line-height: 1 !important;
+      display: inline-flex !important;
+      align-items: center;
+      justify-content: center;
+    }
   }
 
   /** 表格区域：最大高度 600px，超出纵向滚动 */
   .batch-add-modal-table-scroll {
     flex: 1;
-    min-height: 0;
+    min-height: 300px;
     max-height: 600px;
     overflow: auto;
 
@@ -61,20 +77,51 @@
     }
   }
 
+  /** 底部操作：圆角边框风、靠右；按钮间距 10px（左外边距） */
   .batch-add-modal-footer-inner {
     display: flex;
-    justify-content: center;
+    justify-content: flex-end;
+    align-items: center;
     width: 100%;
 
-    .ant-space {
+    .batch-add-modal-footer-actions {
+      justify-content: flex-end;
+    }
+
+    .batch-add-modal-footer-btn {
+      height: 32px !important;
+      padding: 0 14px !important;
+      border-radius: 16px !important;
+      min-width: auto !important;
+      font-size: 13px;
+      line-height: 1 !important;
+      display: inline-flex !important;
+      align-items: center;
       justify-content: center;
     }
 
-    .batch-add-submit-btn {
-      min-width: 200px;
-      padding-left: 40px;
-      padding-right: 40px;
-      height: 40px;
+    /** 提交：实心主色，显式区分默认 / hover / focus，避免与全局样式叠加导致字色与背景同色 */
+    .batch-add-modal-footer-btn--submit.ant-btn-primary {
+      color: #fff !important;
+      background: #1890ff !important;
+      border-color: #1890ff !important;
+
+      &:not(:disabled):not(.ant-btn-disabled):hover,
+      &:not(:disabled):not(.ant-btn-disabled):focus {
+        color: #fff !important;
+        background: #40a9ff !important;
+        border-color: #40a9ff !important;
+      }
+
+      &:not(:disabled):not(.ant-btn-disabled):active {
+        color: #fff !important;
+        background: #096dd9 !important;
+        border-color: #096dd9 !important;
+      }
+
+      &.ant-btn-loading {
+        color: #fff !important;
+      }
     }
   }
 

package/template/react-custom-cmp-template/package.json

@@ -45,7 +45,7 @@
   "devDependencies": {
     "@commitlint/cli": "^18.0.0",
     "@commitlint/config-conventional": "^18.0.0",
-    "neo-cmp-cli": "^1.13.11",
+    "neo-cmp-cli": "^1.13.13",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/template/react-ts-custom-cmp-template/package.json

@@ -47,7 +47,7 @@
     "@commitlint/config-conventional": "^18.0.0",
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
-    "neo-cmp-cli": "^1.13.11",
+    "neo-cmp-cli": "^1.13.13",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/template/vue2-custom-cmp-template/package.json

@@ -45,7 +45,7 @@
   "devDependencies": {
     "@commitlint/cli": "^18.0.0",
     "@commitlint/config-conventional": "^18.0.0",
-    "neo-cmp-cli": "^1.13.11",
+    "neo-cmp-cli": "^1.13.13",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5",