neo-cmp-cli 1.1.7 → 1.1.9

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

@@ -0,0 +1,295 @@
+import * as React from 'react';
+// @ts-ignore
+import { EntityGrid, EntityGridStore } from 'neo-ui-component-web';
+// @ts-ignore
+import axios from 'axios';
+import './style.scss'; // 组件内容样式
+
+interface NeoEntityGridProps {
+  title: string;
+  objectApiKey?: string;
+  tableType?: string;
+  selectionMode?: string;
+  data?: any;
+  env?: any;
+  showFooter?: boolean; // 是否显示 footer
+  showHeader?: boolean; // 是否显示 header
+}
+
+export default class NeoEntityGrid extends React.PureComponent<NeoEntityGridProps> {
+  private entityGridStore: any;
+
+  constructor(props: NeoEntityGridProps) {
+    super(props);
+    this.onSelectedCall = this.onSelectedCall.bind(this);
+    this.initStore();
+  }
+
+  initStore() {
+    const {
+      objectApiKey = 'account',
+      tableType = 'lookup',
+      selectionMode = 'multiple',
+      env,
+      showFooter = false,
+      showHeader = true,
+    } = this.props;
+    // 创建基于 axios 的 fetcher 函数
+    const axiosFetcher = async (options: any) => {
+      const url = options?.url || '';
+
+      try {
+        // 配置 axios 请求
+        const config = {
+          url: url.startsWith('http') ? url : `/api${url}`,
+          method: options?.method || 'GET',
+          data: options?.data || {},
+          headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+          },
+          timeout: options?.timeout || 10000,
+          ...options,
+        };
+
+        if (config?.method === 'GET') {
+          config.params = options?.data || {};
+        }
+
+        const response = await axios(config);
+        return response;
+      } catch (error) {
+        console.error('Axios fetcher error:', error);
+        throw error;
+      }
+    };
+
+    try {
+      // 生成唯一的实例ID
+      const instanceId = `entityGrid_${objectApiKey}_${Date.now()}_${Math.random()
+        .toString(36)
+        .substr(2, 9)}`;
+
+      // 创建真正的 EntityGridStore 实例
+      this.entityGridStore = EntityGridStore.create({
+        id: instanceId,
+        objectApiKey,
+        pattern: 'pickView',
+        tableType,
+        selectionMode,
+        skipExt: true,
+        funPermission: true,
+        height: '100%',
+        className: 'neo-entity-view',
+        entity: {
+          objectId: 1,
+          apiKey: objectApiKey,
+          custom: false,
+        },
+        items: [
+          { apiKey: 'name', label: '名称', type: 'text' },
+          { apiKey: 'code', label: '编码', type: 'text' },
+          { apiKey: 'status', label: '状态', type: 'select' },
+        ],
+        currentPage: 1,
+        pageSize: 20,
+        totalSize: 0,
+        rowData: [],
+        selectedData: [],
+        selectedIds: [],
+        filterModel: [],
+        sortModel: [],
+        displayMode: 'list',
+        loading: false,
+        error: null,
+        hasPermission: true,
+        gridFooterVisible: false, // 控制 footer 显示
+        headerBottomVisible: showHeader, // 控制 header 显示
+        gridAmisJson: {
+          type: 'neoGrid',
+          name: 'list',
+          height: '100%',
+        },
+        fetcher: axiosFetcher,
+        env: env || {},
+        uniqueName: instanceId,
+        apiKey: objectApiKey,
+        // 添加其他必要的配置
+        requestConfig: {
+          url: '/api/entity/list',
+          method: 'POST',
+          data: {},
+        },
+        // 添加必要的方法
+        getFooterAmis: (options: any) => ({
+          type: 'container',
+          body: '分页信息',
+          ...options
+        }),
+        getSelectedData: () => this.entityGridStore?.selectedData || [],
+        setSelectedRowsId: (ids: any) => {
+          this.entityGridStore.selectedIds = ids;
+        },
+        getGridStatus: () => ({ loading: false, error: null }),
+        deselectAll: () => {
+          this.entityGridStore.selectedData = [];
+          this.entityGridStore.selectedIds = [];
+        },
+      });
+
+      console.log('EntityGridStore 创建成功:', this.entityGridStore);
+    } catch (error) {
+      console.error('EntityGridStore 创建失败:', error);
+      // 创建一个简单的 fallback store
+      this.entityGridStore = EntityGridStore.create({
+        id: 'fallback_store',
+        objectApiKey,
+        pattern: 'pickView',
+        tableType: 'lookup',
+        selectionMode: 'multiple',
+        skipExt: true,
+        funPermission: true,
+        height: '100%',
+        className: 'neo-entity-view',
+        entity: {
+          objectId: 1,
+          apiKey: objectApiKey,
+          custom: false,
+        },
+        items: [],
+        currentPage: 1,
+        pageSize: 20,
+        totalSize: 0,
+        rowData: [],
+        selectedData: [],
+        selectedIds: [],
+        filterModel: [],
+        sortModel: [],
+        displayMode: 'list',
+        loading: false,
+        error: error.message,
+        hasPermission: true,
+        gridFooterVisible: false,
+        headerBottomVisible: showHeader, // 控制 header 显示
+        gridAmisJson: {
+          type: 'neoGrid',
+          name: 'list',
+          height: '100%',
+        },
+        fetcher: axiosFetcher,
+        env: {},
+        uniqueName: 'fallback_store',
+        apiKey: this.props.objectApiKey || 'account',
+        requestConfig: {
+          url: '/api/entity/list',
+          method: 'POST',
+          data: {},
+        },
+        // 添加必要的方法
+        getFooterAmis: (options: any) => ({
+          type: 'container',
+          body: '分页信息',
+          ...options
+        }),
+        getSelectedData: () => this.entityGridStore?.selectedData || [],
+        setSelectedRowsId: (ids: any) => {
+          this.entityGridStore.selectedIds = ids;
+        },
+        getGridStatus: () => ({ loading: false, error: null }),
+        deselectAll: () => {
+          this.entityGridStore.selectedData = [];
+          this.entityGridStore.selectedIds = [];
+        },
+      });
+    }
+  }
+
+  onSelectedCall(item: any) {
+    console.log('onSelectedCall:', item);
+  }
+
+  componentWillUnmount() {
+    // 清理 store 实例
+    if (this.entityGridStore) {
+      this.entityGridStore = null;
+    }
+  }
+
+  render() {
+    const {
+      title,
+      objectApiKey = 'account',
+      tableType = 'lookup',
+      selectionMode = 'multiple',
+      showFooter = false,
+      showHeader = true,
+      ...restProps
+    } = this.props;
+    console.log('当前自定义组件：', this.props, this, this.entityGridStore);
+    const curAmisData = this.props.data || {};
+
+    const userInfo = curAmisData.__NeoCurrentUser;
+    const systemInfo = curAmisData.__NeoSystemInfo || {};
+
+    // 如果 store 创建失败，显示错误信息
+    if (this.entityGridStore?.error) {
+      return (
+        <div className="neo-entity-grid-container">
+          <div className="news-title">
+            {title ||
+              '营销服全场景智能CRM，帮助企业搭建数字化客户经营平台，实现业绩高质量增长。'}
+            {systemInfo.tenantName ? `【${systemInfo.tenantName}】` : ''}
+          </div>
+          <div className="entity-grid-wrapper">
+            <div
+              style={{
+                padding: '20px',
+                textAlign: 'center',
+                color: '#ff4d4f',
+                backgroundColor: '#fff2f0',
+                border: '1px solid #ffccc7',
+                borderRadius: '4px',
+              }}
+            >
+              <div style={{ fontSize: '16px', marginBottom: '10px' }}>
+                ⚠️ 组件初始化失败
+              </div>
+              <div style={{ fontSize: '14px' }}>
+                错误信息: {this.entityGridStore.error}
+              </div>
+              <div
+                style={{ fontSize: '12px', marginTop: '10px', color: '#666' }}
+              >
+                请检查 neo-ui-component-web 依赖是否正确安装
+              </div>
+            </div>
+          </div>
+        </div>
+      );
+    }
+
+    return (
+      <div className="neo-entity-grid-container">
+        <div className="news-title">
+          {title ||
+            '营销服全场景智能CRM，帮助企业搭建数字化客户经营平台，实现业绩高质量增长。'}
+          {systemInfo.tenantName ? `【${systemInfo.tenantName}】` : ''}
+        </div>
+        <div className="entity-grid-wrapper">
+          <EntityGrid
+            {...restProps}
+            pattern="pickView"
+            objectApiKey={objectApiKey}
+            name={`${objectApiKey}Picker`}
+            tableType={tableType}
+            selectionMode={selectionMode}
+            skipExt={true}
+            onSelectedCall={this.onSelectedCall}
+            funPermission={true}
+            store={this.entityGridStore}
+          />
+        </div>
+      </div>
+    );
+  }
+}

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

@@ -0,0 +1,94 @@
+/**
+ * @file 自定义组件对接编辑器的描述文件
+ */
+export class NeoEntityGridModel {
+  /**
+   * cmpType 为自定义组件名称，用于标识组件的唯一性
+   * 在构建时根据当前组件目录名称自动生成
+   */
+  // cmpType: string = 'neo-entity-grid';
+
+  // 组件名称，用于设置在编辑器左侧组件面板中展示的名称
+  label: string = 'Neo实体表格';
+
+  // 组件描述，用于设置在编辑器左侧组件面板中展示的描述
+  description: string = 'Neo 实体表格组件';
+
+  // 分类标签，用于设置在编辑器左侧组件面板哪个分类中展示（可设置多个分类标签）
+  tags: string[] = ['自定义组件'];
+
+  // 组件图标，用于设置在编辑器左侧组件面板中展示的图标
+  iconSrc: string = 'https://custom-widgets.bj.bcebos.com/table.svg';
+  // iconSrc: string = 'https://neo-widgets.bj.bcebos.com/custom-widget.svg';
+  // iconSrc = 'https://neo-widgets.bj.bcebos.com/favicon.png';
+
+  // 初次插入页面的默认属性数据
+  defaultComProps = {
+    title:
+      '营销服全场景智能CRM，帮助企业搭建数字化客户经营平台，实现业绩高质量增长。',
+    label: 'Neo实体表格',
+    objectApiKey: 'account',
+    tableType: 'list',
+    selectionMode: 'multiple',
+    showHeader: true,
+  };
+
+  // 设计器端预览时展示的默认数据
+  previewComProps = {
+    label: 'Neo实体表格',
+  };
+
+  /**
+   * 组件面板配置，用于生成编辑器右侧属性配置面板内容
+   */
+  propsSchema = [
+    {
+      type: 'textarea',
+      name: 'title',
+      label: '卡片title',
+      value:
+        '营销服全场景智能CRM，帮助企业搭建数字化客户经营平台，实现业绩高质量增长。',
+    },
+    {
+      type: 'select',
+      name: 'objectApiKey',
+      label: '实体API Key',
+      value: 'account',
+      creatable: true,
+      options: [
+        { label: '客户', value: 'account' },
+        { label: '产品', value: 'product' },
+        { label: '商品', value: 'goods' },
+        { label: '联系人', value: 'contact' },
+        { label: '商机明细', value: 'opportunityProduct' },
+        { label: '合同', value: 'contract' }
+      ],
+    },
+    {
+      type: 'select',
+      name: 'selectionMode',
+      label: '选择模式',
+      value: 'multiple',
+      options: [
+        { label: 'single', value: 'single' },
+        { label: 'multiple', value: 'multiple' },
+        { label: 'none', value: 'none' },
+      ],
+    },
+    {
+      type: 'switch',
+      name: 'showHeader',
+      label: '显示头部',
+      value: true,
+    },
+  ];
+
+  // 支持 函数式写法：propsSchemaCreator，com 为组件实例。优先级比 propsSchema 高
+  /*
+  propsSchemaCreator = (com: any) => {
+    return [];
+  };
+  */
+}
+
+export default NeoEntityGridModel;

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

@@ -0,0 +1,127 @@
+:root {
+  --padding-bottom: 12px;
+}
+
+.neo-entity-grid-container {
+  position: relative;
+  box-sizing: border-box;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  /* border-bottom: 1px solid #ececec; */
+  margin: 6px 12px;
+  padding: 6px var(--padding-bottom);
+  background-color: #fff;
+
+  .news-title {
+    padding: 6px 0;
+    font-family: PingFangSC-Regular;
+    font-size: 16px;
+    line-height: 22px;
+    color: #5f5e5e;
+    flex-shrink: 0;
+  }
+
+  // EntityGrid 容器样式
+  .entity-grid-wrapper {
+    flex: 1;
+    min-height: 400px;
+    overflow: hidden;
+    
+    // 确保表格能正确显示
+    .neo-entity-view {
+      height: 100%;
+      
+      .entity-grid {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+      }
+    }
+  }
+
+  .item-imgbox {
+    position: relative;
+    height: 395px;
+    background: #f0f0f0;
+    cursor: pointer;
+    box-sizing: border-box;
+    text-align: center;
+    overflow: hidden;
+
+    .news-img {
+      width: 100%;
+      height: 100%;
+      box-sizing: border-box;
+      background-size: contain;
+    }
+
+    .img-count {
+      position: absolute;
+      top: 0;
+      right: 0;
+      padding: 6px 8px;
+      color: #fff;
+      min-width: 60px;
+      text-align: center;
+      line-height: 1.2;
+      background: rgb(0 0 0 / 40%);
+      font-size: 25px;
+      box-sizing: border-box;
+      overflow: hidden;
+    }
+
+    .user-info-box {
+      position: absolute;
+      top: 10px;
+      left: 10px;
+      width: 100px;
+      min-height: 100px;
+      padding: 6px 8px;
+      color: #fff;
+      min-width: 60px;
+      text-align: center;
+      line-height: 1.2;
+      background: rgb(0 0 0 / 40%);
+      font-size: 25px;
+      box-sizing: border-box;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+
+      .user-icon {
+        width: 64px;
+        height: 64px;
+        border-radius: 50%;
+      }
+
+      .user-name {
+        font-size: 16px;
+        font-weight: 600;
+        margin-top: 10px;
+      }
+    }
+  }
+
+  .news-info {
+    font-family: PingFangSC-Light;
+    height: 28px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .media-mark,
+  .cmt-num {
+    display: inline-block;
+    height: 28px;
+    line-height: 28px;
+    font-family: PingFangSC-Light;
+    font-size: 18px;
+    color: #828282;
+  }
+}

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

@@ -0,0 +1,68 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    /* Basic Options */
+    "target": "esnext",
+    /* 指定编译之后的版本: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
+    "module": "esnext" /* 指定要使用的模板标准: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
+    // "lib": [],                             /* Specify library files to be included in the compilation. */
+    "allowJs": false /* 指定是否允许编译JS文件，默认false,即不编译JS文件. */,
+    // "checkJs": true,                       /* 指定是否检查和报告JS文件中的错误，默认false */
+    "jsx": "react" /* 指定jsx代码用于的开发环境:'preserve','react-native', or 'react'. */,
+    "declaration": false /* 指定是否在编译的时候生成相的d.ts声明文件 */,
+    // "declarationMap": true,                /* 指定编译时是否生成.map文件 */
+    // "sourceMap": true,                     /* 指定编译时是否生成.map文件 */
+    // "outFile": "./",                       /* 指定输出文件合并为一个文件 */
+    // "outDir": "dist", /* 指定输出文件夹，值为一个文件夹路径字符串，输出的文件都将放置在这个文件夹*/
+    // "rootDir": "src", /* 指定编译文件的根目录，编译器会在根目录查找入口文件 */
+    // "composite": true,                     /* 是否编译构建引用项目 */
+    // "removeComments": true,                /* 指定是否将编译后的文件注释删掉，设为true的话即删除注释，默认为false */
+    "noEmit": false /* 不生成编译文件 */,
+    "importHelpers": true /* 指定是否引入tslib里的复制工具函数，默认为false */,
+    // "downlevelIteration": true,            /* 当target为"ES5"或"ES3"时，为"for-of" "spread"和"destructuring"中的迭代器提供完全支持 */
+    "isolatedModules": false /* 指定是否将每个文件作为单独的模块，默认为true */,
+
+    /* Strict Type-Checking Options */
+    "strict": false /* 指定是否启动所有类型检查 */,
+    "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,
+    "strictNullChecks": true /* Enable strict null checks. */,
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+    "noImplicitThis": true /* Raise error on 'this' expressions with an implied 'any' type. */,
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    "noUnusedLocals": false /* Report errors on unused locals. */,
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    "noImplicitReturns": true /* Report error when not all code paths in function return a value. */,
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
+    "baseUrl": "./" /* Base directory to resolve non-absolute module names. */,
+    "paths": {
+      "@": ["./src"]
+    } /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */,
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    /* 指定声明文件或文件夹的路径列表，如果指定了此项，则只有在这里列出的声明文件才会被加载 */
+    "typeRoots": ["./@types", "./node_modules/@types"],
+    // "types": [],                           /* 指定需要包含的模块，只有在这里列出的模块的声明文件才会被加载 */
+    "allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
+    "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+
+    /* Source Map Options */
+    // "sourceRoot": "./",                    /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "./",                       /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+    "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+    // "suppressImplicitAnyIndexErrors": true /* Suppress --noImplicitAny errors for indexing objects lacking index signatures. See issue #1232 for more details. */
+  },
+  "include": ["src", "test"],
+  "exclude": ["node_modules"]
+}

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

@@ -44,7 +44,7 @@
   "devDependencies": {
     "@commitlint/cli": "^8.3.5",
     "@commitlint/config-conventional": "^9.1.1",
-    "neo-cmp-cli": "^1.1.7",
+    "neo-cmp-cli": "^1.1.8",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

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

@@ -38,7 +38,6 @@
   },
   "dependencies": {
     "neo-register": "^1.0.2",
-    "antd": "4.9.4",
     "react": "^16.9.0",
     "react-dom": "^16.9.0"
   },
@@ -47,7 +46,7 @@
     "@commitlint/config-conventional": "^9.1.1",
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
-    "neo-cmp-cli": "^1.1.7",
+    "neo-cmp-cli": "^1.1.8",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/src/template/react-ts-custom-cmp-template/src/components/info-card/index.tsx

@@ -1,6 +1,4 @@
 import * as React from 'react';
-import { Avatar } from 'antd';
-import { UserOutlined } from '@ant-design/icons';
 import './style.scss'; // 组件内容样式
 
 interface InfoCardProps {
@@ -43,7 +41,6 @@ export default class InfoCard extends React.PureComponent<InfoCardProps> {
           {title ||
             '营销服全场景智能CRM，帮助企业搭建数字化客户经营平台，实现业绩高质量增长。'}
           {systemInfo.tenantName ? `【${systemInfo.tenantName}】` : ''}
-          <Avatar size={64} icon={<UserOutlined />} />
         </div>
         <div className="item-imgbox">
           {userInfo && userInfo.icon && (
@@ -59,7 +56,7 @@ export default class InfoCard extends React.PureComponent<InfoCardProps> {
           {imgCount > 0 && <div className="img-count">{imgCount}</div>}
         </div>
         <div className="news-info">
-          <div className="left media-mark">NeoCRM · 低代码平台111</div>
+          <div className="left media-mark">NeoCRM · 低代码平台</div>
           {commentCount && commentCount > 0 && (
             <div className="cmt-num right">
               {this.agreeDataFormat(commentCount)}评

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

@@ -44,7 +44,7 @@
   "devDependencies": {
     "@commitlint/cli": "^8.3.5",
     "@commitlint/config-conventional": "^9.1.1",
-    "neo-cmp-cli": "^1.1.7",
+    "neo-cmp-cli": "^1.1.8",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5",