neo-cmp-cli 1.12.10 → 1.12.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neo-cmp-cli",
-  "version": "1.12.10",
+  "version": "1.12.11",
   "description": "Neo 自定义组件开发工具，支持react 和 vue2.0技术栈。",
   "keywords": [
     "neo-cli",
@@ -19,6 +19,7 @@
   "files": [
     "bin/*",
     "dist/*",
+    "docs/*",
     "template/*"
   ],
   "husky": {

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

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

package/template/asset-manage-template/package.json

@@ -42,7 +42,6 @@
     "antd": "4.9.4",
     "lodash": "^4.17.21",
     "neo-open-api": "^1.2.3",
-    "@wibetter/json-editor": "^6.0.5",
     "tslib": "2.3.0",
     "echarts": "^5.5.1",
     "moment": "^2.30.1"
@@ -53,7 +52,7 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
     "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.12.10",
+    "neo-cmp-cli": "^1.12.11",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5",

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

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

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

@@ -41,7 +41,7 @@
     "@commitlint/config-conventional": "^18.0.0",
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
-    "neo-cmp-cli": "^1.12.10",
+    "neo-cmp-cli": "^1.12.11",
     "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.12.10",
+    "neo-cmp-cli": "^1.12.11",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

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

@@ -40,7 +40,6 @@
     "antd-mobile": "^2.3.3",
     "lodash": "^4.17.23",
     "neo-open-api": "^1.2.3",
-    "@wibetter/json-editor": "^6.0.5",
     "tslib": "2.3.0"
   },
   "devDependencies": {
@@ -50,7 +49,7 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
     "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.12.10",
+    "neo-cmp-cli": "^1.12.11",
     "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.12.10",
+    "neo-cmp-cli": "^1.12.11",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

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

@@ -1,11 +1,11 @@
 {
   "name": "neo-web-cmps",
   "version": "1.1.0",
-  "description": "Neo Web 核心业务组件使用示例（react&ts技术栈）",
+  "description": "Neo Web 列表组件使用示例（react&ts技术栈）",
   "framework": "react-ts",
   "keywords": [
     "react&ts技术栈",
-    "neoweb 核心业务组件"
+    "neoweb 列表组件"
   ],
   "author": "wibetter",
   "license": "MIT",
@@ -33,26 +33,26 @@
     ]
   },
   "dependencies": {
-    "neo-register": "^1.2.0",
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0",
-    "axios": "^1.7.0",
+    "@ant-design/icons": "^4.8.3",
     "antd": "^4.9.4",
+    "axios": "^1.7.0",
     "lodash": "^4.17.23",
     "neo-open-api": "^1.2.3",
-    "@wibetter/json-editor": "^6.0.5",
+    "neo-register": "^1.2.0",
+    "react": "^16.9.0",
+    "react-dom": "^16.9.0",
     "tslib": "2.3.0"
   },
   "devDependencies": {
     "@babel/runtime": "^7.26.0",
     "@commitlint/cli": "^18.0.0",
     "@commitlint/config-conventional": "^18.0.0",
+    "@types/axios": "^0.14.0",
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
-    "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.12.10",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
+    "neo-cmp-cli": "^1.12.11",
     "prettier": "^2.0.5"
   },
   "overrides": {

package/template/neo-web-cmps/src/components/entityGrid2__c/index.tsx

@@ -1,7 +1,9 @@
 import * as React from 'react';
+import { Tooltip } from 'antd';
+import { CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons';
 import './style.scss'; // 组件内容样式
 // @ts-ignore
-import { NeoEntityGrid } from 'neo-ui-component-web'
+import { NeoEntityGrid } from 'neo-ui-component-web';
 
 interface NeoEntityGridProps {
   objectApiKey: string;
@@ -17,15 +19,38 @@ export default class NeoEntityGridCmp extends React.PureComponent<NeoEntityGridP
   }
 
   render() {
-    const { className, objectApiKey, pattern, hiddenHeader, showView, enableChangeView, defaultViewId, disableSearch, canCreate, canImport, editable, withOrder, withCheck, enableToolbar, disableExport, disablePagination, paginationPageSize, autoHeight, height, additionalConditions, onRecordChange, ...restProps } = this.props;
-    console.log('entityGrid__c: ', this.props, this);
+    const {
+      className,
+      objectApiKey,
+      pattern,
+      hiddenHeader,
+      showView,
+      enableChangeView,
+      defaultViewId,
+      disableSearch,
+      canCreate,
+      canImport,
+      editable,
+      withOrder,
+      withCheck,
+      enableToolbar,
+      disableExport,
+      disablePagination,
+      paginationPageSize,
+      autoHeight,
+      height,
+      additionalConditions,
+      onRecordChange,
+      ...restProps
+    } = this.props;
+    console.log('entityGrid2__c: ', this.props, this);
 
     return (
-      <div className={`entityGrid__c ${className}`}>
+      <div className={`entityGrid2__c ${className}`}>
         <NeoEntityGrid
           render={this.props.render}
           objectApiKey={objectApiKey || 'account'}
-          pattern={pattern || 'entityView'}
+          pattern={'entityView'}
           // defaultViewId="default_view" // 默认展示的列表视图
           hiddenHeader={hiddenHeader ?? false}
           showView={showView ?? true}
@@ -43,7 +68,7 @@ export default class NeoEntityGridCmp extends React.PureComponent<NeoEntityGridP
           paginationPageSize={paginationPageSize ?? 20}
           autoHeight={autoHeight ?? false}
           height={height ?? '500px'}
-          additionalConditions={[]}
+          customEmptyMsg="暂无数据，请点击「新建」按钮创建"
           customToolbarButtons={{
             header: [
               {
@@ -53,17 +78,39 @@ export default class NeoEntityGridCmp extends React.PureComponent<NeoEntityGridP
                 tooltip: '对选中记录批量审批',
                 onClick: () => {
                   console.log('批量审批');
-                }
-              }
+                },
+              },
             ],
             footer: [
               {
                 id: 'export-pdf-btn',
                 label: '导出 PDF',
                 icon: 'FilePdf',
-                onClick: () => console.log('导出 PDF')
-              }
-            ]
+                onClick: () => console.log('导出 PDF'),
+              },
+              {
+                id: 'status-indicator',
+                label: '同步状态',
+                customRender: (button: any = { syncStatus: 'ok' }) => {
+                  const ok = button.syncStatus === 'ok';
+                  const tip = ok ? '已同步' : '同步失败';
+                  const Icon = ok ? CheckCircleOutlined : CloseCircleOutlined;
+                  return (
+                    <li key={button.id} className="entityGrid2__c-status-indicator">
+                      <Tooltip title={tip} placement="top" mouseEnterDelay={0.1}>
+                        <button
+                          type="button"
+                          className={`entityGrid2__c-status-indicator__btn entityGrid2__c-status-indicator__btn--${ok ? 'ok' : 'error'}`}
+                          aria-label={`同步状态：${tip}`}
+                        >
+                          <Icon className="entityGrid2__c-status-indicator__icon" aria-hidden />
+                        </button>
+                      </Tooltip>
+                    </li>
+                  );
+                },
+              },
+            ],
           }}
         />
       </div>

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

@@ -9,10 +9,10 @@ export class NeoEntityGridModel {
   // cmpType: string = 'entityList__c';
 
   // 组件名称，用于设置在编辑器左侧组件面板中展示的名称
-  label: string = '数据列表示例2';
+  label: string = '大列表/自定义工具栏';
 
   // 组件描述，用于设置在编辑器左侧组件面板中展示的描述
-  description: string = '数据列表示例2';
+  description: string = '数据列表示例: 自定义工具栏';
 
   // 分类标签，用于设置在编辑器左侧组件面板哪个分类中展示
   // tags: string[] = ['自定义组件'];
@@ -44,7 +44,6 @@ export class NeoEntityGridModel {
   defaultComProps = {
     objectApiKey: 'account',
     funPermission: true, // 设计器添加时绕过职能权限检查，确保能正常渲染列表
-    pattern: 'entityView',
     hiddenHeader: false,
     showView: true,
     enableChangeView: true,
@@ -77,20 +76,6 @@ export class NeoEntityGridModel {
       xObjectApiKey: 'objectApiKey',
       label: '列表视图',
     },
-    /*
-    // 选择器模式下，需要额外配置 referData
-    {
-      type: 'panelSelect',
-      name: 'pattern',
-      label: '列表模式',
-      value: 'entityView',
-      options: [
-        { label: '标准实体列表', value: 'entityView' },
-        { label: '简单列表模式', value: 'simpleListView' },
-        { label: '选择器模式', value: 'pickView' },
-      ],
-    },
-    */
     {
       type: 'panelSwitch',
       name: 'hiddenHeader',

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

@@ -2,7 +2,7 @@
   --padding-bottom: 12px;
 }
 
-.entityGrid__c {
+.entityGrid2__c {
   position: relative;
   box-sizing: border-box;
 
@@ -11,3 +11,59 @@
   padding: 6px var(--padding-bottom);
   background-color: #fff;
 }
+
+/* 底部工具栏「同步状态」：antd Tooltip + Icon，文案在悬浮时由 Tooltip 展示 */
+.entityGrid2__c .entityGrid2__c-status-indicator {
+  display: inline-flex;
+  align-items: center;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  vertical-align: middle;
+}
+
+.entityGrid2__c .entityGrid2__c-status-indicator__btn {
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 32px;
+  height: 32px;
+  margin: 0;
+  padding: 0;
+  border: 1px solid #e5e7eb;
+  border-radius: 8px;
+  background: #fff;
+  box-shadow: 0 1px 2px rgba(15, 23, 42, 0.05);
+  cursor: default;
+  outline: none;
+  transition:
+    background 0.15s ease,
+    border-color 0.15s ease,
+    box-shadow 0.15s ease;
+}
+
+.entityGrid2__c .entityGrid2__c-status-indicator__btn--ok {
+  color: #16a34a;
+}
+
+.entityGrid2__c .entityGrid2__c-status-indicator__btn--error {
+  color: #dc2626;
+}
+
+.entityGrid2__c .entityGrid2__c-status-indicator__btn:hover,
+.entityGrid2__c .entityGrid2__c-status-indicator__btn:focus-visible {
+  background: #f9fafb;
+  border-color: #d1d5db;
+  box-shadow: 0 2px 6px rgba(15, 23, 42, 0.08);
+}
+
+.entityGrid2__c .entityGrid2__c-status-indicator__btn:focus-visible {
+  box-shadow: 0 0 0 2px #fff, 0 0 0 4px rgba(59, 130, 246, 0.45);
+}
+
+.entityGrid2__c .entityGrid2__c-status-indicator__icon {
+  display: block;
+  flex-shrink: 0;
+  font-size: 18px;
+}

package/template/neo-web-cmps/src/components/entityGrid3__c/index.tsx

@@ -0,0 +1,79 @@
+import * as React from 'react';
+import './style.scss'; // 组件内容样式
+// @ts-ignore
+import { NeoEntityGrid } from 'neo-ui-component-web';
+
+interface NeoEntityGridProps {
+  objectApiKey: string;
+  disableSearch?: boolean;
+  className?: string;
+  render: (name: string, schema: any) => React.ReactNode;
+  [key: string]: any;
+}
+
+export default class NeoEntityGridCmp extends React.PureComponent<NeoEntityGridProps> {
+  constructor(props: NeoEntityGridProps) {
+    super(props);
+  }
+
+  render() {
+    const {
+      className,
+      objectApiKey,
+      pattern,
+      hiddenHeader,
+      showView,
+      enableChangeView,
+      defaultViewId,
+      disableSearch,
+      canCreate,
+      canImport,
+      editable,
+      withOrder,
+      withCheck,
+      enableToolbar,
+      disableExport,
+      disablePagination,
+      paginationPageSize,
+      autoHeight,
+      height,
+      additionalConditions,
+      onRecordChange,
+      ...restProps
+    } = this.props;
+    console.log('entityGrid3__c: ', this.props, this);
+
+    return (
+      <div className={`entityGrid3__c ${className}`}>
+        <NeoEntityGrid
+          render={this.props.render}
+          objectApiKey={objectApiKey || 'account'}
+          pattern={'pickView'} // Picker 列表（选择器）
+          referData={{
+            referObjectApiKey: 'opportunity', // 关联表
+            referItemApiKey: 'accountId' // 关联表对应的外键字段
+          }}
+          selectionMode="multiple" // 多选模式
+          shouldCloseDialog={true}
+          onRowSelected={(data: any, event: any) => {
+            const selectedIds = data.map(({ data }: any) => data.id);
+            const selectedNames = data.map(({ data }: any) => data.name);
+            console.log('已选中条数：', data.length);
+            console.log('已选中 ID：', selectedIds);
+            console.log('已选中名称：', selectedNames);
+          }}
+          // defaultViewId="default_view" // 默认展示的列表视图
+          hiddenHeader={hiddenHeader ?? false}
+          disableSearch={disableSearch ?? false}
+          canCreate={canCreate ?? true}
+          withOrder={withOrder ?? true}
+          withCheck={withCheck ?? true}
+          disablePagination={disablePagination ?? false}
+          paginationPageSize={paginationPageSize ?? 20}
+          autoHeight={autoHeight ?? false}
+          height={height ?? '500px'}
+        />
+      </div>
+    );
+  }
+}

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

@@ -0,0 +1,121 @@
+/**
+ * @file 自定义组件对接编辑器的描述文件
+ */
+export class NeoEntityGridModel {
+  /**
+   * cmpType 为自定义组件名称，用于标识组件的唯一性
+   * 在构建时根据当前组件目录名称自动生成
+   */
+  // cmpType: string = 'entityList__c';
+
+  // 组件名称，用于设置在编辑器左侧组件面板中展示的名称
+  label: string = 'Picker 列表';
+
+  // 组件描述，用于设置在编辑器左侧组件面板中展示的描述
+  description: string = '数据列表示例: Picker 列表';
+
+  // 分类标签，用于设置在编辑器左侧组件面板哪个分类中展示
+  // tags: string[] = ['自定义组件'];
+
+  /**
+   * 用于设置组件支持的页面类型
+   *
+   * 当前 NeoCRM 平台存在的页面类型：
+   * all:	1	全页面
+   * entityFormPage:	4	实体表单页
+   * customPage:	6	自定义页面
+   */
+  // targetPage: string[] = ['all'];
+
+  /**
+   * 用于设置组件支持的终端类型
+   *
+   * 当前 NeoCRM 平台存在的终端类型：
+   * web:	网页端
+   * mobile: 移动端
+   */
+  targetDevice: string = 'web';
+
+  // 组件图标，用于设置在编辑器左侧组件面板中展示的图标
+  iconUrl: string = 'https://custom-widgets.bj.bcebos.com/table.svg';
+  // iconUrl = 'https://neo-widgets.bj.bcebos.com/favicon.png';
+
+  // 初次插入页面的默认属性数据
+  defaultComProps = {
+    objectApiKey: 'account',
+    funPermission: true, // 设计器添加时绕过职能权限检查，确保能正常渲染列表
+    hiddenHeader: true,
+    canCreate: true,
+    withOrder: true,
+    withCheck: true,
+    disableSearch: false,
+    disablePagination: false,
+    paginationPageSize: 20,
+    autoHeight: false,
+    height: '500px',
+  };
+
+  /**
+   * 组件面板配置，用于生成编辑器右侧属性配置面板内容
+   */
+  propsSchema = [
+    {
+      type: 'xObjectEntityList',
+      name: 'objectApiKey',
+      label: '实体对象',
+    },
+    {
+      type: 'panelSwitch',
+      name: 'hiddenHeader',
+      label: '隐藏头部',
+      defaultChecked: false,
+    },
+    {
+      type: 'panelSwitch',
+      name: 'disableSearch',
+      label: '禁用搜索',
+      defaultChecked: false,
+      hiddenOn: 'hiddenHeader',
+    },
+    {
+      type: 'panelSwitch',
+      name: 'canCreate',
+      label: '支持新建',
+      defaultChecked: true,
+      hiddenOn: 'hiddenHeader',
+    },
+    {
+      type: 'panelSwitch',
+      name: 'withOrder',
+      label: '显示序号列',
+      defaultChecked: true,
+    },
+    {
+      type: 'panelSwitch',
+      name: 'withCheck',
+      label: '显示多选列',
+      defaultChecked: true,
+    },
+    {
+      type: 'panelNumber',
+      name: 'paginationPageSize',
+      label: '每页展示条数',
+      visibleOn: '!disablePagination',
+      value: 20,
+    },
+    {
+      type: 'panelSwitch',
+      name: 'autoHeight',
+      label: '高度自适应（根据父容器高度自动适配）',
+      defaultChecked: false,
+    },
+    {
+      type: 'panelInput',
+      name: 'height',
+      label: '高度',
+      visibleOn: '!autoHeight',
+    },
+  ];
+}
+
+export default NeoEntityGridModel;

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

@@ -0,0 +1,60 @@
+: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);
+  background-color: #fff;
+}
+
+/* 底部工具栏「同步状态」指示器（customToolbarButtons.footer customRender） */
+.entityGrid3__c .entityGrid3__c-status-indicator {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  margin: 0;
+  padding: 6px 12px;
+  list-style: none;
+  font-size: 12px;
+  line-height: 1.25;
+  font-weight: 500;
+  letter-spacing: 0.02em;
+  color: #1f2937;
+  background: linear-gradient(180deg, #f9fafb 0%, #f3f4f6 100%);
+  border: 1px solid #e5e7eb;
+  border-radius: 999px;
+  box-shadow: 0 1px 2px rgba(15, 23, 42, 0.06);
+  user-select: none;
+  vertical-align: middle;
+}
+
+.entityGrid3__c .entityGrid3__c-status-indicator__dot {
+  flex-shrink: 0;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.9);
+}
+
+.entityGrid3__c .entityGrid3__c-status-indicator__dot--ok {
+  background: #22c55e;
+  box-shadow:
+    0 0 0 2px rgba(255, 255, 255, 0.9),
+    0 0 0 3px rgba(34, 197, 94, 0.25);
+}
+
+.entityGrid3__c .entityGrid3__c-status-indicator__dot--error {
+  background: #ef4444;
+  box-shadow:
+    0 0 0 2px rgba(255, 255, 255, 0.9),
+    0 0 0 3px rgba(239, 68, 68, 0.28);
+}
+
+.entityGrid3__c .entityGrid3__c-status-indicator__label {
+  color: #374151;
+}