neo-cmp-cli 1.13.11 → 1.13.12

package/template/neo-bi-cmps/docs//350/264/246/345/217/267/347/233/270/345/205/263/344/277/241/346/201/257.md

@@ -0,0 +1,10 @@
+Gartner 租户管理员账号：
+tina.kung@qingmiaox.org
+Gartner0718
+
+pipeline设计稿：https://www.figma.com/design/n5orqOOhfsRNXGnOUYWSYp/%E5%95%86%E6%9C%BAPipeline%E5%92%8C%E9%A2%84%E6%B5%8B%EF%BC%88to26Gartner%EF%BC%89?node-id=14-10608&t=yFrDOnJuuaMFUACl-4
+
+figma账号：summer_han23@163.com
+密码：neocrm123456
+
+环境：https://crm.xiaoshouyi.com/bff/neoweb#/neoPage/customPage/Pipeline

package/template/neo-bi-cmps/package.json

@@ -50,7 +50,7 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
     "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.13.11",
+    "neo-cmp-cli": "^1.13.12",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

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

@@ -55,7 +55,7 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
     "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.13.11",
+    "neo-cmp-cli": "^1.13.12",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/template/neo-custom-cmp-template/src/components/entityForm__c/index.tsx

@@ -9,10 +9,8 @@ import {
   Select,
   Button,
   message,
-  Card,
   DatePicker,
   InputNumber,
-  Space,
   Spin,
   Empty,
   Row,
@@ -582,60 +580,56 @@ export default class EntityForm extends React.PureComponent<
 
     return (
       <div className={`entityForm__c ${className}`}>
-        <Card>
-          <div className="form-header">
-            <h3 className="form-title">
-              {displayTitle}
-              {systemInfo.tenantName ? `【${systemInfo.tenantName}】` : ''}
-            </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 className="form-header">
+          <h3 className="form-title">
+            {displayTitle}
+            {systemInfo.tenantName ? `【${systemInfo.tenantName}】` : ''}
+          </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>
-                  }
-                />
-              ) : (
-                <>
-                  {this.renderForm()}
-                  <div className="form-actions">
-                    <Space size="middle">
-                      <Button
-                        type="primary"
-                        icon={<SaveOutlined />}
-                        onClick={this.handleSubmit}
-                        loading={submitting}
-                        disabled={!xObjectApiKey}
-                      >
-                        {submitting ? '提交中...' : '提交'}
-                      </Button>
-                      {showResetButton && (
-                        <Button
-                          icon={<ReloadOutlined />}
-                          onClick={this.handleReset}
-                          disabled={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={<SaveOutlined />}
+                    onClick={this.handleSubmit}
+                    loading={submitting}
+                    disabled={!xObjectApiKey}
+                  >
+                    {submitting ? '提交中...' : '提交'}
+                  </Button>
+                </div>
+              </>
+            )}
+          </Spin>
+        </div>
       </div>
     );
   }

package/template/neo-custom-cmp-template/src/components/entityForm__c/model.ts

@@ -49,7 +49,7 @@ export class EntityFormModel {
   defaultComProps = {
     formTitle: '新增数据表单',
     showResetButton: true,
-    columnCount: 1,
+    columnCount: 2,
     xObjectDataApi: {
       xObjectApiKey: 'customContact__c',
       fields: ['name', 'entityType', 'phone__c'],

package/template/neo-custom-cmp-template/src/components/entityForm__c/style.scss

@@ -1,14 +1,24 @@
 .entityForm__c {
+  padding: 24px;
+  box-sizing: border-box;
+  background-color: #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,16 +281,16 @@
       }
 
       .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;
           }
         }
       }
@@ -285,16 +298,6 @@
   }
 }
 
-// 全局样式覆盖
-.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 {

package/template/neo-h5-cmps/package.json

@@ -49,7 +49,7 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
     "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.13.11",
+    "neo-cmp-cli": "^1.13.12",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/template/neo-order-cmps/package.json

@@ -47,7 +47,7 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
     "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.13.11",
+    "neo-cmp-cli": "^1.13.12",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/template/neo-web-entity-grid/package.json

@@ -52,7 +52,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.12",
     "prettier": "^2.0.5"
   },
   "overrides": {

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

@@ -9,10 +9,8 @@ import {
   Select,
   Button,
   message,
-  Card,
   DatePicker,
   InputNumber,
-  Space,
   Spin,
   Empty,
   Row,
@@ -176,7 +174,7 @@ export default class CreateEntityForm extends React.PureComponent<
    * 组件更新后执行
    * 当 xObjectApiKey 发生变化时重新加载字段列表
    */
-  async componentDidUpdate(prevProps: EntityFormProps) {
+  async componentDidUpdate(prevProps: CreateFormProps) {
     const { xObjectApiKey, fields } = this.props.xObjectDataApi || {};
     const { xObjectApiKey: prevXObjectApiKey, fields: prevFields } =
       prevProps.xObjectDataApi || {};
@@ -732,59 +730,53 @@ export default class CreateEntityForm extends React.PureComponent<
 
     return (
       <div className={`createForm__c ${className}`}>
-        <Card>
-          <div className="form-header">
-            <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 className="form-header">
+          <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>
-                  }
-                />
-              ) : (
-                <>
-                  {this.renderForm()}
-                  <div className="form-actions">
-                    <Space size="middle">
-                      <Button
-                        type="primary"
-                        icon={<SaveOutlined />}
-                        onClick={this.handleSubmit}
-                        loading={submitting}
-                        disabled={!xObjectApiKey}
-                      >
-                        {submitting ? '提交中...' : '提交'}
-                      </Button>
-                      {showResetButton && (
-                        <Button
-                          icon={<ReloadOutlined />}
-                          onClick={this.handleReset}
-                          disabled={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={<SaveOutlined />}
+                    onClick={this.handleSubmit}
+                    loading={submitting}
+                    disabled={!xObjectApiKey}
+                  >
+                    {submitting ? '提交中...' : '提交'}
+                  </Button>
+                </div>
+              </>
+            )}
+          </Spin>
+        </div>
       </div>
     );
   }

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

@@ -0,0 +1,74 @@
+
+// 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;
+    }
+  }
+}