neo-cmp-cli 1.13.21 → 1.13.23

package/template/neo-order-cmps/src/components/entityInfoCard__c/style.scss

@@ -1,16 +1,18 @@
 .entityInfoCard__c {
   position: relative;
   box-sizing: border-box;
-  padding: 15px;
-  background: #f5f5f5;
+  padding: 12px;
+  background: #fff;
   border-bottom: 1px solid #ddd;
   border-radius: 4px;
 
   .info-title {
     font-size: 16px;
-    font-weight: 600;
-    margin-bottom: 15px;
+    font-weight: 500;
     color: #333;
+    padding: 8px 0;
+    margin-bottom: 12px;
+    border-bottom: 1px solid #f0f0f0;
   }
 
   .info-content {
@@ -187,4 +189,3 @@
     max-height: none;
   }
 }
-

package/template/neo-order-cmps/src/components/simpleTable__c/index.tsx

@@ -3,11 +3,7 @@
  * @description 基于 Neo 平台的 XObject 实体对象数据表格组件，仅支持数据展示
  */
 import * as React from 'react';
-import {
-  Table,
-  Spin,
-  Empty,
-} from 'antd';
+import { Table, Spin, Empty, Button } from 'antd';
 // @ts-ignore
 import { xObject } from 'neo-open-api'; // Neo Open API
 // @ts-ignore
@@ -32,6 +28,8 @@ interface SimpleTableProps {
     xObjectApiKey: string;
     fields: string[];
     fieldDescList?: any[];
+    pageSize?: number;
+    page?: number;
     autoFetchData?: boolean;
   };
   /** Neo 平台传递的数据，包含系统信息等 */
@@ -80,6 +78,12 @@ interface SimpleTableState {
   loading: boolean;
   /** 错误信息 */
   error: string | null;
+  /** 分页信息 */
+  pagination: {
+    current: number;
+    pageSize: number;
+    total: number;
+  };
 }
 
 /**
@@ -92,6 +96,7 @@ export default class SimpleTable extends BaseCmp<
 > {
   constructor(props: SimpleTableProps) {
     super(props);
+    const { page, pageSize } = this.props.xObjectDataApi || {};
 
     // 初始化组件状态
     this.state = {
@@ -99,20 +104,26 @@ export default class SimpleTable extends BaseCmp<
       dataSource: [],
       loading: false,
       error: null,
+      pagination: {
+        current: page || 1,
+        pageSize: pageSize || 10,
+        total: 0,
+      },
     };
 
     // 绑定方法上下文
     this.loadData = this.loadData.bind(this);
+    this.handleTableChange = this.handleTableChange.bind(this);
   }
 
   componentDidMount() {
     const { xObjectDataApi } = this.props;
-    const { xObjectApiKey } = xObjectDataApi || {};
+    const { xObjectApiKey, page, pageSize } = xObjectDataApi || {};
 
     if (xObjectApiKey) {
       // 初始化字段列表、加载数据
       this.loadFieldList();
-      this.loadData();
+      this.loadData(page, pageSize);
     }
   }
 
@@ -121,20 +132,24 @@ export default class SimpleTable extends BaseCmp<
    * 当 xObjectApiKey 发生变化时重新加载数据
    */
   async componentDidUpdate(prevProps: SimpleTableProps) {
-    const { xObjectApiKey, fields } =
+    const { xObjectApiKey, fields, page, pageSize } =
       this.props.xObjectDataApi || {};
     const {
       xObjectApiKey: prevXObjectApiKey,
       fields: prevFields,
+      page: prevPage,
+      pageSize: prevPageSize,
     } = prevProps.xObjectDataApi || {};
     if (
       xObjectApiKey !== prevXObjectApiKey ||
-      !isEqual(fields, prevFields)
+      !isEqual(fields, prevFields) ||
+      page !== prevPage ||
+      pageSize !== prevPageSize
     ) {
       if (xObjectApiKey) {
         // 先加载字段列表，等待完成后再加载数据，确保字段信息已更新
         await this.loadFieldList();
-        this.loadData();
+        this.loadData(page, pageSize);
       } else {
         this.setState({
           dataSource: [],
@@ -201,23 +216,37 @@ export default class SimpleTable extends BaseCmp<
 
   /**
    * 加载表格数据
+   * @param page 页码，默认为 1
+   * @param pageSize 每页条数，默认为 10
    */
   @NeoEvent.function
-  async loadData() {
+  async loadData(page = 1, pageSize = 10) {
     const { xObjectApiKey } = this.props.xObjectDataApi || {};
     if (!xObjectApiKey) return;
 
+    const curPage = page ?? 1;
+    const curPageSize = pageSize ?? 10;
+
     this.setState({ loading: true, error: null });
 
     try {
-      // 获取所有字段的 API Key
-      const result = await xObject.query(this.props.xObjectDataApi);
+      const result = await xObject.query({
+        ...this.props.xObjectDataApi,
+        page: curPage,
+        pageSize: curPageSize,
+      });
 
       if (result && result.status) {
         const records = result.data || [];
+        const totalSize = result.totalSize || 0;
 
         this.setState({
           dataSource: records,
+          pagination: {
+            current: curPage,
+            pageSize: curPageSize,
+            total: totalSize,
+          },
           loading: false,
         });
       } else {
@@ -234,6 +263,13 @@ export default class SimpleTable extends BaseCmp<
     }
   }
 
+  /**
+   * 处理表格分页变化
+   */
+  handleTableChange(pagination: any) {
+    this.loadData(pagination.current, pagination.pageSize);
+  }
+
   /**
    * 渲染组件
    * @returns 组件 JSX 元素
@@ -244,21 +280,22 @@ export default class SimpleTable extends BaseCmp<
       dataSource,
       loading,
       error,
+      pagination,
     } = this.state;
-    const { className, title: propsTitle } = this.props;
+    const { className, title: propsTitle, data: amisData } = this.props;
     const { xObjectApiKey } = this.props.xObjectDataApi || {};
     const columns = this.generateColumns();
-    
+    // const curAmisData = amisData || {};
+    // const systemInfo = curAmisData.__NeoSystemInfo || {};
+
     // 优先使用 props.title，其次使用 state.title，最后使用默认值
     const displayTitle = propsTitle || stateTitle || '数据表格';
 
-    console.log('this.props:', this.props);
-
     return (
       <div className={`simpleTable__c ${className}`}>
         <div className="table-wrapper">
           <div className="panel-header">
-            <h3>{displayTitle}</h3>
+            <div className="panel-header-text">{displayTitle}</div>
           </div>
           <div className="table-container">
             <Spin spinning={loading} tip="加载数据中...">
@@ -270,6 +307,14 @@ export default class SimpleTable extends BaseCmp<
                       <div style={{ color: '#ff4d4f', marginBottom: 8 }}>
                         {error}
                       </div>
+                      <Button
+                        type="primary"
+                        onClick={() =>
+                          this.loadData(pagination.current, pagination.pageSize)
+                        }
+                      >
+                        重新加载
+                      </Button>
                     </div>
                   }
                 />
@@ -279,7 +324,14 @@ export default class SimpleTable extends BaseCmp<
                   columns={columns}
                   dataSource={dataSource}
                   rowKey="id"
-                  pagination={false}
+                  pagination={{
+                    ...pagination,
+                    showSizeChanger: true,
+                    showQuickJumper: true,
+                    showTotal: (total, range) =>
+                      `第 ${range[0]}-${range[1]} 条/共 ${total} 条`,
+                  }}
+                  onChange={this.handleTableChange}
                   scroll={{ x: 'max-content' }}
                 />
               )}
@@ -290,4 +342,3 @@ export default class SimpleTable extends BaseCmp<
     );
   }
 }
-

package/template/neo-order-cmps/src/components/simpleTable__c/model.ts

@@ -16,7 +16,8 @@ export class SimpleTableModel {
   label: string = '实体数据表格（简化版）';
 
   /** 组件描述，用于设置在编辑器左侧组件面板中展示的描述 */
-  description: string = '基于 XObject 的数据表格组件，仅支持数据展示，不支持增删改查操作';
+  description: string =
+    '基于 XObject 实现的数据表格组件，仅支持数据展示，不支持增删改查操作';
 
   /** 分类标签，用于设置在编辑器左侧组件面板哪个分类中展示  */
   // tags: string[] = ['自定义组件'];
@@ -34,9 +35,9 @@ export class SimpleTableModel {
    */
   targetPage: string[] = ['all'];
 
-  /** 
+  /**
    * 用于设置组件支持的终端类型
-   * 
+   *
    * 当前 NeoCRM 平台存在的终端类型：
    * web:	网页端
    * mobile: 移动端
@@ -45,10 +46,18 @@ export class SimpleTableModel {
 
   /** 初次插入页面的默认属性数据 */
   defaultComProps = {
-    title: '合同数据',
+    title: '联系人列表',
     xObjectDataApi: {
-      xObjectApiKey: 'customContact__c',
-      fields: ['name', 'phone__c'],
+      xObjectApiKey: 'contact',
+      fields: [
+        'entityType',
+        'accountId',
+        'post',
+        'mobile',
+        'email',
+        'address',
+        'wxUserType',
+      ],
     },
   };
 
@@ -77,10 +86,6 @@ export class SimpleTableModel {
       type: 'xObjectDataApi', // 用于获取实体业务数据列表的配置项
       name: 'xObjectDataApi',
       label: '实体数据源',
-      value: {
-        xObjectApiKey: 'customContact__c',
-        fields: ['name', 'phone__c'],
-      },
       placeholder: '请选择实体数据源',
       custom: true,
     },
@@ -88,4 +93,3 @@ export class SimpleTableModel {
 }
 
 export default SimpleTableModel;
-

package/template/neo-order-cmps/src/components/simpleTable__c/style.scss

@@ -1,26 +1,27 @@
 .simpleTable__c {
+  background: #fff;
+  border-radius: 8px;
+
   .table-wrapper {
-    border: 1px solid #ddd;
-    border-radius: 4px;
+    padding: 8px 12px;
     display: flex;
     flex-direction: column;
     overflow: hidden;
   }
 
   .panel-header {
-    padding: 15px;
-    background: #f5f5f5;
-    border-bottom: 1px solid #ddd;
+    background: #fff;
     display: flex;
     justify-content: space-between;
-    align-items: center;
-
-    h3 {
-      margin: 0;
-      font-size: 16px;
-      font-weight: 600;
-      color: #262626;
-    }
+    align-items: flex-start;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+      'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif;
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 1.4;
+    letter-spacing: 0.08em;
+    color: #1f1f1f;
+    padding: 8px 0;
   }
 
   .table-container {
@@ -30,7 +31,7 @@
     .ant-table {
       .ant-table-thead > tr > th {
         background-color: #f9f9f9;
-        font-weight: 600;
+        font-weight: 500;
         color: #262626;
         border-bottom: 1px solid #eee;
         padding: 10px;
@@ -38,6 +39,7 @@
         font-size: 13px;
         position: sticky;
         top: 0;
+        z-index: 1;
       }
 
       .ant-table-tbody > tr > td {
@@ -73,15 +75,32 @@
     }
   }
 
-  // 响应式设计
-  @media (max-width: 768px) {
-    .panel-header {
-      padding: 12px;
+  .ant-btn {
+    border-radius: 4px;
+    font-weight: 500;
+    transition: all 0.3s;
 
-      h3 {
-        font-size: 14px;
+    &.ant-btn-primary {
+      background: #1890ff;
+      border-color: #1890ff;
+
+      &:hover {
+        background: #40a9ff;
+        border-color: #40a9ff;
+      }
+
+      &:focus {
+        background: #40a9ff;
+        border-color: #40a9ff;
       }
     }
+  }
+
+  @media (max-width: 768px) {
+    .panel-header {
+      flex-wrap: wrap;
+      gap: 8px;
+    }
 
     .table-container {
       .ant-table {
@@ -95,14 +114,6 @@
   }
 
   @media (max-width: 576px) {
-    .panel-header {
-      padding: 10px;
-
-      h3 {
-        font-size: 13px;
-      }
-    }
-
     .table-container {
       .ant-table {
         .ant-table-thead > tr > th,
@@ -114,4 +125,3 @@
     }
   }
 }
-

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.23",
     "prettier": "^2.0.5"
   },
   "overrides": {

package/template/neo-pipeline-cmps/public/demo.html

@@ -26,7 +26,7 @@
 
     h1 {
       font-size: 20px;
-      font-weight: 600;
+      font-weight: 500;
       margin-bottom: 4px;
     }
 
@@ -47,7 +47,7 @@
     .tab-btn {
       padding: 10px 24px;
       font-size: 14px;
-      font-weight: 600;
+      font-weight: 500;
       cursor: pointer;
       border: none;
       background: none;
@@ -124,7 +124,7 @@
 
     .stage-tab.active .stage-name {
       color: #6366f1;
-      font-weight: 600;
+      font-weight: 500;
     }
 
     .stage-tab .stage-amount {
@@ -251,7 +251,7 @@
 
     .bi-chart h3 {
       font-size: 14px;
-      font-weight: 600;
+      font-weight: 500;
       margin-bottom: 16px;
     }
 
@@ -275,7 +275,7 @@
       justify-content: center;
       color: #fff;
       font-size: 11px;
-      font-weight: 600;
+      font-weight: 500;
       cursor: default;
       transition: opacity 0.2s;
     }
@@ -374,7 +374,7 @@
       align-items: center;
       margin-bottom: 12px;
       font-size: 13px;
-      font-weight: 600;
+      font-weight: 500;
     }
 
     .calendar-nav span {
@@ -397,7 +397,7 @@
 
     .calendar-grid .day-header {
       color: #999;
-      font-weight: 600;
+      font-weight: 500;
       padding: 6px 0;
     }
 
@@ -444,7 +444,7 @@
       color: #fff;
       cursor: pointer;
       font-size: 13px;
-      font-weight: 600;
+      font-weight: 500;
     }
 
     .date-picker-footer button:hover {
@@ -520,7 +520,7 @@
       padding: 6px 14px;
       font-size: 11px;
       color: #999;
-      font-weight: 600;
+      font-weight: 500;
       text-transform: uppercase;
       letter-spacing: 0.5px;
     }
@@ -542,7 +542,7 @@
     .owner-item.selected {
       background: #f0f0ff;
       color: #6366f1;
-      font-weight: 600;
+      font-weight: 500;
     }
 
     .owner-icon {

package/template/neo-pipeline-cmps/src/components/pipelineFunnel__c/style.scss

@@ -14,7 +14,7 @@
 
   .funnel-title {
     font-size: 14px;
-    font-weight: 600;
+    font-weight: 500;
     margin: 0;
   }
 

package/template/neo-pipeline-cmps/src/components/showHealthResult__c/style.scss

@@ -103,7 +103,7 @@
 
   &__placeholderTitle {
     font-size: 13px;
-    font-weight: 600;
+    font-weight: 500;
     line-height: 1.4;
     margin-bottom: 6px;
     color: #334155;

package/template/neo-pipeline-cmps/src/components/simpleTable__c/common.scss

@@ -87,7 +87,7 @@ $background-color: #f5f6fa;
   }
 
   &__baseline {
-    font-weight: 600;
+    font-weight: 500;
     font-size: 12px;
     color: #888;
     margin-bottom: 10px;
@@ -104,7 +104,7 @@ $background-color: #f5f6fa;
   }
 
   &__section-title {
-    font-weight: 600;
+    font-weight: 500;
     margin-bottom: 4px;
   }
 
@@ -190,6 +190,6 @@ $background-color: #f5f6fa;
 
   &__to {
     color: #ec4899;
-    font-weight: 600;
+    font-weight: 500;
   }
 }

package/template/neo-pipeline-cmps/src/components/simpleTable__c/style.scss

@@ -44,7 +44,7 @@
     h3 {
       margin: 0;
       font-size: 14px;
-      font-weight: 600;
+      font-weight: 500;
       color: #262626;
     }
 
@@ -79,7 +79,7 @@
     .ant-table {
       .ant-table-thead > tr > th {
         background-color: #f9f9f9;
-        font-weight: 600;
+        font-weight: 500;
         color: #262626;
         border-bottom: 1px solid #eee;
         padding: 10px;

package/template/neo-pipeline-cmps/src/components/stageSwitch__c/style.scss

@@ -42,7 +42,7 @@
 
       .stage-name {
         color: #6366f1;
-        font-weight: 600;
+        font-weight: 500;
       }
     }
   }

package/template/neo-pipeline-cmps/src/components/stageTimeChart__c/style.scss

@@ -16,7 +16,7 @@
 
   .chart-title {
     font-size: 14px;
-    font-weight: 600;
+    font-weight: 500;
     margin: 0;
   }
 
@@ -99,7 +99,7 @@
   }
 
   .stage-time-value {
-    font-weight: 600;
+    font-weight: 500;
   }
 
   .stage-time-bar {

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.23",
     "prettier": "^2.0.5"
   },
   "overrides": {

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

@@ -16,7 +16,7 @@ export class CreateFormModel {
   label: string = '新增数据表单';
 
   /** 组件描述，用于设置在编辑器左侧组件面板中展示的描述 */
-  description: string = '基于 XObject 的对象表单组件，用于新增数据';
+  description: string = '用于创建实体业务数据的表单组件';
 
   /** 分类标签，用于设置在编辑器左侧组件面板哪个分类中展示 */
   // tags: string[] = ['自定义组件'];

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

@@ -12,7 +12,7 @@ export class NeoEntityGridModel {
   label: string = '自定义筛选列表';
 
   // 组件描述，用于设置在编辑器左侧组件面板中展示的描述
-  description: string = '数据列表示例: 自定义表单筛选 + 大列表实时响应联动';
+  description: string = '基于平台 NeoEntityGrid 实现的数据列表示例: 支持自定义表单筛选 + 大列表实时响应联动';
 
   // 分类标签，用于设置在编辑器左侧组件面板哪个分类中展示
   // tags: string[] = ['自定义组件'];
@@ -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

@@ -13,7 +13,9 @@ export class NeoEntityGridModel {
 
   // 组件描述，用于设置在编辑器左侧组件面板中展示的描述
   description: string =
-    '自定义Picker列表: Picker 模式的数据选择列表，支持在其他自定义组件中使用。支持单选和多选。';
+    '基于平台 NeoEntityGrid 实现的自定义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;
 }