neo-cmp-cli 1.13.21 → 1.13.22

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

@@ -51,8 +51,16 @@ export class EntityFormModel {
     showResetButton: true,
     columnCount: 2,
     xObjectDataApi: {
-      xObjectApiKey: 'customContact__c',
-      fields: ['name', 'entityType', 'phone__c'],
+      xObjectApiKey: 'contact',
+      fields: [
+        'entityType',
+        'contactName',
+        'accountId',
+        'depart',
+        'mobile',
+        'email',
+        'comment',
+      ],
     },
   };
 

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

@@ -17,7 +17,7 @@
       margin: 0;
       font-size: 14px;
       font-weight: 500;
-      color: #262626;
+      color: #434343;
       line-height: 1.2;
     }
   }

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

@@ -15,7 +15,6 @@ import {
   Popconfirm,
   Spin,
   Empty,
-  Card,
   DatePicker,
   InputNumber,
   Checkbox,
@@ -775,14 +774,16 @@ export default class EntityTable extends BaseCmp<
 
     return (
       <div className={`entityTable__c ${className}`}>
-        <Card>
-          <div className="table-header">
-            <div className="header-content">
-              <h3 className="header-title">
+        <div className="table-wrapper">
+          <div className="panel-header">
+            <div className="panel-header-text">
+              <h3>
+                {systemInfo.tenantName ? `${systemInfo.tenantName} / ` : ''}
                 {title || '数据表格'}
-                {systemInfo.tenantName ? `【${systemInfo.tenantName}】` : ''}
               </h3>
-              <Space>
+            </div>
+            <div className="panel-header-actions">
+              <Space size={10} align="center">
                 {this.props.showAddButton && (
                   <Button
                     type="primary"
@@ -806,7 +807,7 @@ export default class EntityTable extends BaseCmp<
             </div>
           </div>
 
-          <div className="table-content">
+          <div className="table-container">
             <Spin spinning={loading} tip="加载数据中...">
               {error ? (
                 <Empty
@@ -846,9 +847,10 @@ export default class EntityTable extends BaseCmp<
               )}
             </Spin>
           </div>
-        </Card>
+        </div>
 
         <Modal
+          wrapClassName="entityTable__c-modal-wrap"
           title={isEditMode ? `编辑${title}` : `新增${title}`}
           visible={isModalVisible}
           onOk={this.handleModalOk}

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

@@ -50,8 +50,17 @@ export class EntityTableModel {
     showEditButton: true,
     showDeleteButton: true,
     xObjectDataApi: {
-      xObjectApiKey: 'customContact__c',
-      fields: ['name', 'phone__c'],
+      xObjectApiKey: "contact",
+      fields: [
+        "contactName",
+        "accountId",
+        "depart",
+        "post",
+        "phone",
+        "email",
+        "wxPosition",
+        "comment"
+    ],
     },
   };
 

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

@@ -1,41 +1,117 @@
 .entityTable__c {
-  .table-header {
-    margin-bottom: 16px;
+  background: #fff;
+  border-radius: 8px;
+
+  .table-wrapper {
+    padding: 16px 20px;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+  }
+
+  .panel-header {
+    padding: 12px 0 8px 0;
+    background: #fff;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+
+    .panel-header-text {
+      flex: 1;
+      min-width: 0;
+    }
 
-    .header-content {
+    h3 {
+      margin: 0;
+      font-size: 16px;
+      font-weight: 600;
+      color: #434343;
+    }
+
+    .panel-header-actions {
+      flex-shrink: 0;
+      margin-left: 12px;
+      padding-top: 2px;
       display: flex;
-      justify-content: space-between;
       align-items: center;
-      flex-wrap: wrap;
-      gap: 12px;
 
-      .header-title {
-        margin: 0;
-        font-size: 18px;
-        font-weight: 600;
-        color: #262626;
-        flex: 1;
-        min-width: 200px;
-      }
+      // 与 entityForm__c .form-actions 中按钮视觉一致
+      .ant-btn {
+        height: 32px;
+        padding: 0 14px;
+        font-size: 14px;
+        border-radius: 16px;
+        font-weight: 400;
+        min-width: auto;
+        transition: all 0.3s;
+
+        &.ant-btn-primary {
+          background: #1890ff;
+          border-color: #1890ff;
+
+          &: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);
+          }
+
+          &: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(-1px);
+            box-shadow: 0 4px 12px rgba(0, 0, 0, 0.06);
+          }
 
-      .ant-space {
-        flex-shrink: 0;
+          &:active {
+            color: #096dd9;
+            border-color: #096dd9;
+            transform: translateY(0);
+          }
+        }
       }
     }
   }
 
-  .table-content {
+  .table-container {
+    flex: 1;
+    overflow-y: auto;
+
     .ant-table {
       .ant-table-thead > tr > th {
-        background-color: #fafafa;
+        background-color: #f9f9f9;
         font-weight: 600;
         color: #262626;
-        border-bottom: 1px solid #f0f0f0;
+        border-bottom: 1px solid #eee;
+        padding: 10px;
+        text-align: left;
+        font-size: 13px;
+        position: sticky;
+        top: 0;
+        z-index: 1;
       }
 
       .ant-table-tbody > tr > td {
-        border-bottom: 1px solid #f0f0f0;
-        padding: 12px 16px;
+        border-bottom: 1px solid #eee;
+        padding: 10px;
+        text-align: left;
+        font-size: 13px;
       }
 
       .ant-table-tbody > tr:hover > td {
@@ -43,7 +119,7 @@
       }
 
       .ant-table-pagination {
-        margin-top: 16px;
+        margin-top: 12px;
         text-align: right;
       }
     }
@@ -79,44 +155,14 @@
     }
   }
 
-  .ant-modal {
-    .ant-form {
-      .ant-form-item {
-        margin-bottom: 16px;
-
-        .ant-form-item-label {
-          padding-bottom: 4px;
-
-          label {
-            font-weight: 500;
-            color: #262626;
-          }
-        }
-
-        .ant-input,
-        .ant-select-selector,
-        .ant-input-number {
-          border-radius: 4px;
-          border: 1px solid #d9d9d9;
-          transition: all 0.3s;
-
-          &:hover {
-            border-color: #40a9ff;
-          }
-
-          &:focus,
-          &.ant-input-focused,
-          &.ant-select-focused .ant-select-selector {
-            border-color: #40a9ff;
-            box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
-          }
-        }
+  .ant-spin {
+    .ant-spin-dot {
+      font-size: 20px;
+    }
 
-        .ant-input-textarea {
-          resize: vertical;
-          min-height: 80px;
-        }
-      }
+    .ant-spin-text {
+      color: #8c8c8c;
+      font-size: 14px;
     }
   }
 
@@ -179,56 +225,35 @@
     }
   }
 
-  .ant-spin {
-    .ant-spin-dot {
-      font-size: 20px;
-    }
-
-    .ant-spin-text {
-      color: #8c8c8c;
-      font-size: 14px;
-    }
-  }
-
-  // 响应式设计
   @media (max-width: 768px) {
-    .table-header {
-      .header-content {
-        flex-direction: column;
-        align-items: flex-start;
+    .panel-header {
+      flex-wrap: wrap;
+      gap: 8px;
+    }
 
-        .header-title {
-          margin-bottom: 8px;
-        }
+    .panel-header-actions {
+      margin-left: 0;
+      width: 100%;
+      justify-content: flex-end;
 
-        .ant-space {
-          width: 100%;
-          justify-content: flex-end;
-        }
+      .ant-btn {
+        font-size: 13px;
       }
     }
 
-    .table-content {
+    .table-container {
       .ant-table {
         .ant-table-thead > tr > th,
         .ant-table-tbody > tr > td {
           padding: 8px 12px;
-          font-size: 13px;
+          font-size: 12px;
         }
       }
     }
   }
 
   @media (max-width: 576px) {
-    .table-header {
-      .header-content {
-        .header-title {
-          font-size: 16px;
-        }
-      }
-    }
-
-    .table-content {
+    .table-container {
       .ant-table {
         .ant-table-thead > tr > th,
         .ant-table-tbody > tr > td {
@@ -246,17 +271,47 @@
   }
 }
 
-// 全局样式覆盖
-.ant-card {
-  border-radius: 6px;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+/** Modal 挂载在 body，通过 wrapClassName 限定样式作用域 */
+.entityTable__c-modal-wrap {
+  .ant-form {
+    .ant-form-item {
+      margin-bottom: 16px;
+
+      .ant-form-item-label {
+        padding-bottom: 4px;
 
-  .ant-card-body {
-    padding: 20px;
+        label {
+          font-weight: 500;
+          color: #262626;
+        }
+      }
+
+      .ant-input,
+      .ant-select-selector,
+      .ant-input-number {
+        border-radius: 4px;
+        border: 1px solid #d9d9d9;
+        transition: all 0.3s;
+
+        &:hover {
+          border-color: #40a9ff;
+        }
+
+        &:focus,
+        &.ant-input-focused,
+        &.ant-select-focused .ant-select-selector {
+          border-color: #40a9ff;
+          box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+        }
+      }
+
+      .ant-input-textarea {
+        resize: vertical;
+        min-height: 80px;
+      }
+    }
   }
-}
 
-.ant-modal {
   .ant-modal-header {
     border-bottom: 1px solid #f0f0f0;
     padding: 16px 24px;
@@ -264,7 +319,7 @@
     .ant-modal-title {
       font-size: 16px;
       font-weight: 600;
-      color: #262626;
+      color: #434343;
     }
   }
 
@@ -285,20 +340,20 @@
       }
     }
   }
-}
 
-.ant-modal-content {
-  display: flex;
-  flex-direction: column;
+  .ant-modal-content {
+    display: flex;
+    flex-direction: column;
 
-  .ant-modal-header,
-  .ant-modal-footer {
-    flex: 0;
-  }
+    .ant-modal-header,
+    .ant-modal-footer {
+      flex: 0;
+    }
 
-  .ant-modal-body {
-    flex: 1;
-    max-height: 500px;
-    overflow-y: auto;
+    .ant-modal-body {
+      flex: 1;
+      max-height: 500px;
+      overflow-y: auto;
+    }
   }
 }

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

@@ -35,7 +35,7 @@ export default class CustomCmp extends BaseCmp<
     console.log('当前自定义组件：', this.props);
 
     return (
-      <div className={`simpleCmp__c ${className}`}>
+      <div className={['simpleCmp__c', className].filter(Boolean).join(' ')}>
         <div className="news-title">
           {languageCode === 'zh-CN' ? '你好，销售易！' : 'Hello NeoCRM!'}
         </div>

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

@@ -1,21 +1,102 @@
-:root {
-  --padding-bottom: 12px;
-}
-
 .simpleCmp__c {
   position: relative;
   box-sizing: border-box;
-
-  /* border-bottom: 1px solid #ececec; */
+  height: auto;
+  display: flex;
+  flex-direction: column;
   margin: 6px 12px;
-  padding: 6px var(--padding-bottom);
-  background-color: #fff;
+  padding: 16px;
+  background-color: var(--color);
+  border-radius: 8px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 3px;
+    background: linear-gradient(90deg, #1890ff 0%, #40a9ff 100%);
+    border-radius: 8px 8px 0 0;
+  }
 
   .news-title {
-    padding: 6px 0;
-    font-family: PingFangSC-Regular;
-    font-size: 16px;
-    line-height: 22px;
-    color: #5f5e5e;
+    flex-shrink: 0;
+    padding: 8px 0 12px 0;
+    margin-bottom: 12px;
+    border-bottom: 1px solid #f0f0f0;
+    font-family: PingFangSC-Medium, -apple-system, BlinkMacSystemFont,
+      'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+    font-size: 18px;
+    font-weight: 500;
+    line-height: 1.4;
+    color: #434343;
+    letter-spacing: 0.02em;
+  }
+
+  p {
+    flex: 1;
+    margin: 0;
+    padding: 4px 0;
+    font-family: PingFangSC-Regular, -apple-system, BlinkMacSystemFont,
+      'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+    font-size: 14px;
+    line-height: 1.8;
+    color: #595959;
+    word-break: break-word;
+    white-space: pre-wrap;
+
+    &:empty::before {
+      content: '暂无描述';
+      color: #8c8c8c;
+      font-style: italic;
+    }
+  }
+
+  a {
+    color: #1890ff;
+    text-decoration: none;
+    transition: color 0.3s;
+
+    &:hover {
+      color: #40a9ff;
+      text-decoration: underline;
+    }
+
+    &:active {
+      color: #096dd9;
+    }
+  }
+
+  @media (max-width: 768px) {
+    margin: 4px 8px;
+    padding: 12px;
+
+    .news-title {
+      font-size: 16px;
+      padding: 6px 0 10px 0;
+      margin-bottom: 10px;
+    }
+
+    p {
+      font-size: 13px;
+      line-height: 1.7;
+    }
+  }
+
+  @media (max-width: 480px) {
+    margin: 2px 4px;
+    padding: 10px;
+
+    .news-title {
+      font-size: 15px;
+      padding: 4px 0 8px 0;
+      margin-bottom: 8px;
+    }
+
+    p {
+      font-size: 13px;
+    }
   }
 }

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.21",
+    "neo-cmp-cli": "^1.13.22",
     "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.21",
+    "neo-cmp-cli": "^1.13.22",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/template/neo-pipeline-cmps/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.21",
+    "neo-cmp-cli": "^1.13.22",
     "prettier": "^2.0.5"
   },
   "overrides": {

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.21",
+    "neo-cmp-cli": "^1.13.22",
     "prettier": "^2.0.5"
   },
   "overrides": {

package/template/neo-web-entity-grid/src/components/entityGrid2__c/model.ts

@@ -42,7 +42,7 @@ export class NeoEntityGridModel {
 
   // 初次插入页面的默认属性数据
   defaultComProps = {
-    objectApiKey: 'customContact__c',
+    objectApiKey: 'account',
     funPermission: true, // 设计器添加时绕过职能权限检查，确保能正常渲染列表
     hiddenHeader: false,
     showView: true,

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

@@ -1,13 +1,9 @@
-:root {
-  --padding-bottom: 12px;
-}
-
 .entityGrid2__c {
   position: relative;
   box-sizing: border-box;
 
   /* border-bottom: 1px solid #ececec; */
   // margin: 6px 12px;
-  padding: 6px var(--padding-bottom);
+  padding: 6px 12px;
   background-color: #fff;
 }

package/template/neo-web-entity-grid/src/components/entityGrid3__c/model.ts

@@ -15,6 +15,8 @@ export class NeoEntityGridModel {
   description: string =
     '自定义Picker列表: Picker 模式的数据选择列表，支持在其他自定义组件中使用。支持单选和多选。';
 
+  exposedToDesigner: boolean = false; // 不在设计器中显示，仅作为子组件使用
+
   // 分类标签，用于设置在编辑器左侧组件面板哪个分类中展示
   // tags: string[] = ['自定义组件'];
 

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

@@ -1,14 +1,9 @@
-:root {
-  --padding-bottom: 12px;
-}
-
 .entityGrid3__c {
   position: relative;
   box-sizing: border-box;
 
   /* border-bottom: 1px solid #ececec; */
-  // margin: 6px 12px;
-  padding: 6px var(--padding-bottom);
+  margin: 6px 12px;
   background-color: #fff;
 }