neo-cmp-cli 1.13.17 → 1.13.18

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

package/template/neo-h5-cmps/src/components/entityList__c/index.tsx

@@ -1,8 +1,7 @@
 import * as React from 'react';
-import './style.scss'; // 组件内容样式
 // @ts-ignore
 import { NeoEntityList } from 'neo-ui-component-h5'; // neo h5 组件库
-
+import './style.scss'; // 组件内容样式
 interface EntityListProps {
   entityApiKey: string;
   disableSearch?: boolean;

package/template/neo-h5-cmps/src/components/entityTabs__c/index.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { Tabs } from 'antd-mobile';
-import './style.scss'; // 组件内容样式
 // @ts-ignore
 import { NeoEntityList } from 'neo-ui-component-h5'; // neo h5 组件库
+import './style.scss'; // 组件内容样式
 
 interface EntityListTabsProps {
   entityApiKey?: string;

package/template/neo-h5-cmps/src/components/globalSearchInput__c/index.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import './style.scss'; // 组件内容样式
 // @ts-ignore
 import { GlobalSearchInput } from 'neo-ui-component-h5'; // neo h5 组件库
+import './style.scss'; // 组件内容样式
 
 interface GlobalSearchInputProps {
   placeholder?: string;

package/template/neo-h5-cmps/src/components/openChatPageBtn__c/index.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
-import { BaseCmp } from 'neo-ui-common';
 // @ts-ignore
-import { NeoEvent } from 'neo-ui-common';
+import { BaseCmp, NeoEvent } from 'neo-ui-common';
 import './style.scss'; // 组件内容样式
 
 interface openChatPageBtnProps {

package/template/neo-pipeline-cmps/neo.config.js

@@ -51,6 +51,17 @@ module.exports = {
     // externals: ['xxModule'], // 自定义组件中需要剔除的模块，仅支持数组写法
   },
   */
+  /*
+  // 示例2
+  neoCommonModule: {
+    // exports: ['xxModule'], // 数组写法，用于导出当前自定义组件中的第三方依赖模块
+    exports: { // 对象写法，可用于导出自定义组件中的某个内容模块（需要使用绝对路径导出）
+      'xxModule': path.resolve('./src/components/xxModule'), // 导出 xx组件 或 xx模块
+    },
+    remoteDeps: ['filterBar__c'], // 远程依赖组件，表示当前自定义组件会用到的依赖组件，需要和 externals 配合使用
+    externals: ['filterBar__c'], // 自定义组件中需要剔除的模块，仅支持数组写法
+  },
+  */
   linkDebug: {
     // 用于开启本地调试模式的相关配置信息
     /*

package/template/neo-pipeline-cmps/src/assets/css/common.scss

@@ -1,4 +1,4 @@
-/* 公共的自定义函数 */
+/* Common custom functions */
 
 @function px2vw($px, $screen-width: 750) {
   @return ($px / $screen-width) * 100vw;
@@ -17,7 +17,7 @@
   height: 100%;
 }
 
-/* 头部细线 */
+/* Top hairline border */
 @mixin borderTop {
   content: '';
   position: absolute;
@@ -30,7 +30,7 @@
   transform: scaleY(0.5);
 }
 
-/* 底部细线 */
+/* Bottom hairline border */
 @mixin borderBtm {
   content: '';
   position: absolute;
@@ -43,44 +43,44 @@
   transform: scaleY(0.5);
 }
 
-/* 统一的内边距 */
+/* Unified padding */
 @mixin unifiedPadding($value: 40) {
   padding: 0 px2rem($value) 0 px2rem($value);
 }
 
-/* 统一的左内边距 */
+/* Unified left padding */
 @mixin unifiedLeftPadding($value: 40) {
   padding-left: px2rem($value);
 }
 
-/* 统一的右内边距 */
+/* Unified right padding */
 @mixin unifiedRightPadding($value: 40) {
   padding-right: px2rem($value);
 }
 
-/* 统一的底部边框样式 */
+/* Unified bottom border style */
 @mixin unifiedBottomBorder {
   border-bottom: 1px solid #ddd;
 }
 
-/* 统一的上边框样式 */
+/* Unified top border style */
 @mixin unifiedTopBorder {
   border-top: 1px solid #ddd;
 }
 
-/* 统一的Item高度 */
+/* Unified item height */
 @mixin unifiedItemHeight {
   line-height: px2rem(120);
   height: px2rem(120);
 }
 
-/* 设置行高样式 */
+/* Set line-height style */
 @mixin setItemHeight($value: 120) {
   line-height: px2rem($value);
   height: px2rem($value);
 }
 
-/* 统一的Item样式 */
+/* Unified item style */
 @mixin unifiedItemStyle {
   font-family: PingFangSC-Regular;
   font-size: px2rem(28);
@@ -88,7 +88,7 @@
   letter-spacing: 0;
 }
 
-/* 统一的弹性盒子样式 */
+/* Unified flexbox style */
 @mixin unifiedFlexBoxStyle {
   display: flex;
   flex-wrap: nowrap;
@@ -96,14 +96,14 @@
   align-items: center;
 }
 
-/* 统一的Title样式 */
+/* Unified title style */
 @mixin unifiedTitleStyle {
   font-family: PingFangSC-Regular;
   font-size: px2rem(40);
   color: #1e1e1e;
 }
 
-/* 统一的内容样式 */
+/* Unified content style */
 @mixin unifiedContentStyle {
   font-family: PingFangSC-Regular;
   font-size: px2rem(28);
@@ -113,7 +113,7 @@
   line-height: px2rem(28);
 }
 
-/* 底部导航盒子样式 */
+/* Fixed bottom navigation box style */
 @mixin fixedBottomBox {
   position: fixed;
   left: 0;
@@ -121,7 +121,7 @@
   width: 100%;
 }
 
-// 常用的变量
+// Common variables
 $background-color: #fafafa;
 $border-color: #f7f7f7;
 $page-padding-top: px2rem(20);

package/template/neo-pipeline-cmps/src/assets/css/mixin.scss

@@ -1,7 +1,7 @@
-// 通用mixin
+// Common mixins
 $borderColor: #ddd;
 
-// type 为top 或者 bottom
+// type is top or bottom
 @mixin borderTopOrBtm($type) {
   &::after {
     content: '';
@@ -16,7 +16,7 @@ $borderColor: #ddd;
   }
 }
 
-// type为 right 或者 left
+// type is right or left
 @mixin borderRtOrLt($type) {
   &::after {
     content: '';
@@ -31,14 +31,14 @@ $borderColor: #ddd;
   }
 }
 
-//超出1行显示...
+//Ellipsis after 1 line
 @mixin ellipsis1 {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 
-// 超出多行显示...
+// Ellipsis after multiple lines
 @mixin ellipsis($num) {
   overflow: hidden;
   display: -webkit-box;

package/template/neo-pipeline-cmps/src/components/filterBar__c/README.md

@@ -1,8 +1,8 @@
-# FilterBar 组件
+# FilterBar Component
 
-筛选栏组件，支持日期范围、用户和部门、业务类型等多维度筛选。
+Filter bar component that supports multi-dimensional filtering by date range, user and department, business type, etc.
 
-## 使用方式
+## Usage
 
 ```tsx
 import FilterBar from './components/filterBar__c';
@@ -14,11 +14,11 @@ import FilterBar from './components/filterBar__c';
 
 ## Props
 
-| 属性 | 说明 | 类型 | 默认值 |
-|------|------|------|--------|
-| values | 筛选值 | Record<string, string> | {} |
-| onChange | 筛选变化回调 | (key: string, value: string) => void | - |
+| Property | Description | Type | Default |
+|----------|-------------|------|---------|
+| values | Filter values | Record<string, string> | {} |
+| onChange | Filter change callback | (key: string, value: string) => void | - |
 
 
-## 说明
-1、获取 相对时间的接口：/rest/neobi/v2.0/config/getOption。
+## Notes
+1. API for getting relative time options: /rest/neobi/v2.0/config/getOption.

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

@@ -1,12 +1,12 @@
-// css变量
+// CSS variables
 :root {
   --background-color: #f5f6fa;
 }
-// sass变量
+// SASS variables
 $background-color: #f5f6fa;
-// 自定义公共样式
+// Custom common styles
 
-// 自定义页面最外层容器背景色
+// Custom page outermost container background color
 body {
   // background-color: var(--background-color);
   background-color: $background-color;
@@ -26,4 +26,4 @@ body {
 
 .single-slot-layout .content-section {
   background-color: $background-color !important;
-}
+}

package/template/neo-pipeline-cmps/src/components/filterBar__c/index.tsx

@@ -1,6 +1,6 @@
 /**
- * @file 筛选栏组件
- * @description 支持日期范围、负责人（user 实体）、业务类型等多维度筛选
+ * @file Filter Bar Component
+ * @description Supports multi-dimensional filtering by date range, owner (user entity), business type, etc.
  */
 import * as React from 'react';
 import { DatePicker, Select, Spin } from 'antd';
@@ -33,7 +33,7 @@ const { RangePicker } = DatePicker;
 
 const BUSI_TYPE_URL = '/rest/data/v2.0/xobjects/opportunity/busiType';
 
-/** Opportunity Owner 人员列表：平台 user 实体 */
+/** Opportunity Owner personnel list: platform user entity */
 const USER_ENTITY_API_KEY = 'user';
 const USER_QUERY_FIELDS = [
   'id',
@@ -50,18 +50,18 @@ interface FilterBarEventData {
 export interface FilterBarChangePayload {
   closeDate: number | string;
   closeDateCustomRange?: TimestampRange;
-  /** Opportunity Owner 多选：人员 id 列表，空数组表示未选 */
+  /** Opportunity Owner multi-select: personnel id list, empty array means none selected */
   opportunityOwner: (number | string)[];
   businessType: string | number;
-  /** 当前选中的业务类型展示名（与 businessType 对应） */
+  /** Current business type display name (corresponding to businessType) */
   businessTypeLabel?: string;
   businessTypeApiKey?: string;
   changesSince: string | number;
-  /** Changes Since 为 Custom 时：所选日期的当日 0 点 Unix 毫秒时间戳 */
+  /** Changes Since Custom: selected date's midnight Unix millisecond timestamp */
   changesSinceCustomTime?: number;
 }
 
-/** 设计器 / 页面注入的当前登录用户（与 __NeoCurrentUser 一致） */
+/** Designer / page-injected current logged-in user (consistent with __NeoCurrentUser) */
 interface NeoCurrentUser {
   id: number;
   name: string;
@@ -74,17 +74,17 @@ interface NeoCurrentUser {
 }
 
 interface FilterBarProps {
-  /** Close Date 下拉选项（由页面 / 设计器配置传入） */
+  /** Close Date dropdown options (passed in from page / designer configuration) */
   closeDateOptions?: FilterOption[];
   /**
-   * 默认业务类型：与接口返回项的 apiKey 相等时，将该项的 id（或 value）作为 Business Type 初始选中值
+   * Default business type: when matching the apiKey of an item returned by the API, use that item's id (or value) as the initial Business Type selection
    */
   defaultBusiType?: string;
   className?: string;
   style?: React.CSSProperties;
-  /** 与 NeoEvent 并存：便于父组件直接监听 */
+  /** Coexists with NeoEvent: allows parent component to listen directly */
   onValuesChange?: (payload: FilterBarChangePayload) => void;
-  /** 页面数据：含 __NeoCurrentUser，用于负责人列表首位插入当前用户 */
+  /** Page data: contains __NeoCurrentUser, used to insert current user at the top of the owner list */
   data?: { __NeoCurrentUser?: NeoCurrentUser };
 }
 
@@ -100,18 +100,18 @@ interface FilterBarState {
   opportunityOwnerOptions: FilterOption[];
   businessTypeOptions: FilterOption[];
   values: FilterValues;
-  /** Opportunity Owner 选中的人员 id（多选） */
+  /** Opportunity Owner selected personnel ids (multi-select) */
   opportunityOwner: (number | string)[];
-  /** Close Date 为 custom 时的自定义区间时间戳 */
+  /** Custom date range timestamps when Close Date is 'custom' */
   closeDateCustomRange: TimestampRange | null;
-  /** Changes Since 为 Custom 时的单个时间点（当日 0 点，Unix 毫秒） */
+  /** Single time point when Changes Since is Custom (midnight, Unix ms) */
   changesSinceCustomTime: number | null;
   ownerLoading: boolean;
   businessTypeLoading: boolean;
 }
 
 class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
-  /** 初始化筛选 state 与 Close Date 选项 */
+  /** Initialize filter state and Close Date options */
   constructor(props: FilterBarProps) {
     super(props);
     const closeOpts = normalizeOptions(
@@ -120,7 +120,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
         : FilterBar.defaultCloseDateOptions(),
     );
     const csOpts = defaultChangesSinceOptions();
-    const initialClose = closeOpts[2]?.value ?? 401; // 默认本季度
+    const initialClose = closeOpts[2]?.value ?? 401; // Default: this quarter
     const initialRelativeRange = relativeCloseDateRangeFromCode(initialClose);
     this.state = {
       closeDateOptions: closeOpts,
@@ -139,7 +139,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
       businessTypeLoading: false,
     };
 
-    // 绑定方法到 this
+    // Bind methods to this
     this.syncDefaultBusinessTypeFromProps =
       this.syncDefaultBusinessTypeFromProps.bind(this);
     this.syncCloseDateOptionsFromProps =
@@ -167,7 +167,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     this.renderChangesSinceBlock = this.renderChangesSinceBlock.bind(this);
   }
 
-  /** Close Date 内置默认选项 */
+  /** Close Date built-in default options */
   static defaultCloseDateOptions(): FilterOption[] {
     return [
       { value: 201, label: 'This Week' },
@@ -177,14 +177,14 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     ];
   }
 
-  /** 同步 props 选项并拉取负责人、业务类型 */
+  /** Sync props options and fetch owner and business type data */
   componentDidMount() {
     this.syncCloseDateOptionsFromProps(this.props);
     this.loadOpportunityOwnerOptions();
     this.loadBusinessTypeOptions();
   }
 
-  /** props.closeDateOptions 变化时同步本地选项 */
+  /** Sync local options when props.closeDateOptions changes */
   componentWillReceiveProps(nextProps: FilterBarProps) {
     if (nextProps.closeDateOptions !== this.props.closeDateOptions) {
       this.syncCloseDateOptionsFromProps(nextProps);
@@ -206,7 +206,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     }
   }
 
-  /** defaultBusiType 配置变更时，在已加载的下拉数据中重新匹配默认业务类型 */
+  /** Re-match default business type from loaded dropdown data when defaultBusiType config changes */
   syncDefaultBusinessTypeFromProps(props: FilterBarProps) {
     const { businessTypeOptions } = this.state;
     if (!businessTypeOptions.length) return;
@@ -222,7 +222,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     );
   }
 
-  /** 用 props 更新 Close Date 选项并校正当前选中值 */
+  /** Update Close Date options from props and correct current selected value */
   syncCloseDateOptionsFromProps(props: FilterBarProps) {
     const next = normalizeOptions(
       props.closeDateOptions && props.closeDateOptions.length > 0
@@ -252,7 +252,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     });
   }
 
-  /** 由 state 组装对外事件 / 回调用的 payload */
+  /** Build payload from state for external events / callbacks */
   buildPayload(): FilterBarChangePayload {
     const {
       values,
@@ -290,7 +290,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     };
   }
 
-  /** 打日志、触发 onValuesChange 与设计器事件 */
+  /** Log, trigger onValuesChange and designer event */
   emitChange() {
     const payload = this.buildPayload();
     console.log('[FilterBar__c] filters change', payload);
@@ -303,20 +303,20 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     });
 
     /*
-    console.log('触发了一个广播事件 updateFilterData:', payload);
+    console.log('Triggered a broadcast event updateFilterData:', payload);
     NeoEvent.broadcast('updateFilterData', payload);
     */
   }
 
-  /** 设计器事件：筛选条件变化（含自定义区间） */
+  /** Designer event: filter conditions changed (including custom date range) */
   @NeoEvent.dispatch
   onFiltersChange(eventData?: FilterBarEventData) {}
 
-  /** 请求 user 实体，填充 Opportunity Owner 下拉 */
+  /** Fetch user entity to populate Opportunity Owner dropdown */
   async loadOpportunityOwnerOptions() {
     this.setState({ ownerLoading: true });
     const currentUser = Object.assign({}, this.props.data?.__NeoCurrentUser);
-    // 给当前用户增加标记
+    // Add marker to current user
     if (
       currentUser &&
       currentUser.name &&
@@ -348,7 +348,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
         ]);
       } else {
         console.warn(
-          'FilterBar xObject.query(user) 非成功:',
+          'FilterBar xObject.query(user) not successful:',
           result?.msg ?? result,
         );
         opportunityOwnerOptions =
@@ -375,7 +375,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
         },
       );
     } catch (e) {
-      console.error('FilterBar 加载负责人（user）失败:', e);
+      console.error('FilterBar failed to load owner (user):', e);
       const fallbackOptions =
         parseUserRecordsToOwnerOptions(currentUserRecords);
       const defaultOwnerIds = getDefaultOpportunityOwnerIds(this.props);
@@ -400,7 +400,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     }
   }
 
-  /** 请求商机业务类型接口，填充 Business Type 下拉 */
+  /** Fetch opportunity business type API to populate Business Type dropdown */
   async loadBusinessTypeOptions() {
     this.setState({ businessTypeLoading: true });
     try {
@@ -428,12 +428,12 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
         },
       );
     } catch (e) {
-      console.error('FilterBar 加载业务类型失败:', e);
+      console.error('FilterBar failed to load business types:', e);
       this.setState({ businessTypeLoading: false, businessTypeOptions: [] });
     }
   }
 
-  /** 合并 values 子集并通知变更 */
+  /** Merge values subset and notify change */
   patchValues(patch: Partial<FilterValues>) {
     this.setState(
       (prev) =>
@@ -444,7 +444,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     );
   }
 
-  /** Close Date 下拉变更；非 custom 时按编码写入相对周期的起止时间戳及起点到 changesSinceCustomTime */
+  /** Close Date dropdown change; for non-custom, write relative period start/end timestamps and start to changesSinceCustomTime */
   handleCloseDateChange(value: number | string) {
     if (String(value).toLowerCase() !== 'custom') {
       const relativeRange = relativeCloseDateRangeFromCode(value);
@@ -478,7 +478,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     );
   }
 
-  /** Changes Since 下拉变更；非 Custom 且 Close Date 为相对周期时同步起点时间戳 */
+  /** Changes Since dropdown change; for non-Custom with relative Close Date period, sync start timestamp */
   handleChangesSinceChange(value: string | number) {
     if (value !== 'Custom') {
       const closeDate = this.state.values.closeDate;
@@ -505,20 +505,20 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     );
   }
 
-  /** Close Date 自定义 RangePicker：写入时间戳区间 */
+  /** Close Date custom RangePicker: write timestamp range */
   handleCloseDateRangeChange(dates: any) {
     const closeDateCustomRange = momentRangeToTimestamps(dates);
     this.setState({ closeDateCustomRange }, () => this.emitChange());
   }
 
-  /** Changes Since 自定义 DatePicker：写入当日 0 点时间戳 */
+  /** Changes Since custom DatePicker: write midnight timestamp */
   handleChangesSinceTimeChange(date: Moment | null) {
     const changesSinceCustomTime =
       date != null ? moment(date).startOf('day').valueOf() : null;
     this.setState({ changesSinceCustomTime }, () => this.emitChange());
   }
 
-  /** state.closeDateCustomRange → RangePicker 受控值 */
+  /** state.closeDateCustomRange -> RangePicker controlled value */
   closeDateRangePickerValue(): [Moment | null, Moment | null] | null {
     const r = this.state.closeDateCustomRange;
     if (!r || (r.start == null && r.end == null)) return null;
@@ -528,20 +528,20 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     ];
   }
 
-  /** state.changesSinceCustomTime → DatePicker 受控值 */
+  /** state.changesSinceCustomTime -> DatePicker controlled value */
   changesSinceDatePickerValue(): Moment | null {
     const t = this.state.changesSinceCustomTime;
     if (t == null) return null;
     return moment(t);
   }
 
-  /** 动作流 / 外部调用：返回当前筛选快照 */
+  /** Action flow / external call: return current filter snapshot */
   @NeoEvent.function
   getFilters(): FilterBarChangePayload {
     return this.buildPayload();
   }
 
-  /** 动作流：恢复默认并清空自定义区间后通知 */
+  /** Action flow: reset to defaults and clear custom ranges, then notify */
   @NeoEvent.function
   resetFilters() {
     const { closeDateOptions, changesSinceOptions } = this.state;
@@ -565,7 +565,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     );
   }
 
-  /** Close Date + 自定义日期区间 */
+  /** Close Date + custom date range */
   renderCloseDateBlock() {
     const { closeDateOptions, values } = this.state;
     const showCustom = String(values.closeDate).toLowerCase() === 'custom';
@@ -666,7 +666,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     );
   }
 
-  /** Changes Since + Custom 时单个日期 */
+  /** Changes Since + single date when Custom */
   renderChangesSinceBlock() {
     const { changesSinceOptions, values } = this.state;
     const showCustom = values.changesSince === 'Custom';
@@ -679,7 +679,8 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
             <span className="help-tip">
               ?
               <span className="help-tip-text">
-                相对报表周期的变更起始时间；Custom 时可自选日期
+                Changes Since custom: start time relative to the report period;
+                select a date when Custom
               </span>
             </span>
           </label>
@@ -707,7 +708,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
     );
   }
 
-  /** 筛选栏根布局 */
+  /** Filter bar root layout */
   render() {
     const { className, style } = this.props;
     console.log('[FilterBar__c] render', this.props);
@@ -716,7 +717,7 @@ class FilterBar extends BaseCmp<FilterBarProps, FilterBarState> {
       <div
         className={`filterBar__c ${className || ''}`}
         style={style}
-        data-time="2026.4.15 01"
+        data-time="2026.4.17 01"
       >
         {this.renderCloseDateBlock()}
         {this.renderOwnerBlock()}