neo-cmp-cli 1.13.16 → 1.13.17

package/template/neo-bi-cmps/src/components/filterBar__c/model.ts

@@ -1,72 +1,50 @@
 export class FilterBarModel {
   label: string = '筛选栏';
   description: string = '支持日期范围、负责人、业务类型等多维度筛选';
-  iconUrl: string = 'https://custom-widgets.bj.bcebos.com/filterBar.svg';
+  iconUrl: string = 'https://custom-widgets.bj.bcebos.com/filter.svg';
   targetPage: string[] = ['all'];
   targetDevice: string = 'all';
 
   defaultComProps = {
-    filters: [
-      {
-        name: 'closeDate',
-        label: 'Close Date',
-        type: 'select',
-        options: [
-          { value: 'This Week', label: 'This Week' },
-          { value: 'This Month', label: 'This Month' },
-          { value: 'This Quarter', label: 'This Quarter' },
-          { value: 'Custom', label: 'Custom' },
-        ],
-      },
-      {
-        name: 'owner',
-        label: 'Opportunity Owner',
-        type: 'owner',
-      },
-      {
-        name: 'businessType',
-        label: 'Business Type',
-        type: 'select',
-        options: [
-          { value: 'New Business', label: 'New Business' },
-          { value: 'Renewal', label: 'Renewal' },
-          { value: 'Expansion', label: 'Expansion' },
-        ],
-      },
-      {
-        name: 'changesSince',
-        label: 'Changes Since',
-        type: 'select',
-        options: [
-          { value: 'Start of the Period', label: 'Start of the Period' },
-          { value: 'Custom', label: 'Custom' },
-        ],
-      },
+    closeDateOptions: [
+      { value: 201, label: 'This Week' },
+      { value: 301, label: 'This Month' },
+      { value: 401, label: 'This Quarter' },
+      { value: 'custom', label: 'Custom' },
     ],
-    values: {},
+    /** 与商机业务类型接口返回项的 apiKey 一致时，作为 Business Type 默认选中项 */
+    defaultBusiType: 'defaultBusiType_1', // New Business
   };
 
+  /**
+   * 声明当前组件会触发的所有事件（与组件内 @NeoEvent.dispatch 方法名一致）
+   */
+  events = [
+    {
+      apiKey: 'onFiltersChange',
+      label: '筛选条件变化后',
+      helpText:
+        '任一筛选项或自定义时间区间变更时触发；事件参数含 closeDate、closeDateCustomRange（非 custom 时为当前相对周期起止 Unix 毫秒时间戳；custom 时为 RangePicker 起止）、opportunityOwner（负责人多选 id 数组）、businessType、businessTypeLabel（业务类型展示名）、changesSince、changesSinceCustomTime（Changes Since 为 Custom 时为所选日期当日 0 点；否则在 Close Date 非 custom 时为周期起点当日 0 点）',
+      eventParams:
+        '[{"apiKey":"eventParam","children":[{"apiKey":"data","label":"当前筛选数据","type":"Object"}],"label":"事件入参","type":"Object"}]',
+    },
+  ];
+
   functions = [
     {
       apiKey: 'resetFilters',
       label: '重置筛选条件',
-      helpTextKey: '重置所有筛选条件为默认值',
+      helpTextKey: '重置所有筛选条件为默认值并触发「筛选条件变化后」事件',
     },
     {
       apiKey: 'getFilters',
       label: '获取筛选条件',
-      helpTextKey: '获取当前筛选条件',
+      helpTextKey:
+        '返回当前筛选快照对象；closeDate 非 custom 时 closeDateCustomRange 为相对周期起止时间戳；custom 时为自定义区间；businessTypeLabel 为业务类型展示名；changesSinceCustomTime 在 Changes Since 为 Custom 时为所选日 0 点，否则在 Close Date 非 custom 时为周期起点 0 点',
     },
   ];
 
-  propsSchema = [
-    {
-      type: 'object',
-      name: 'filters',
-      label: '筛选配置',
-      schema: [],
-    },
-  ];
+  propsSchema = [];
 }
 
 export default FilterBarModel;

package/template/neo-bi-cmps/src/components/filterBar__c/style.scss

@@ -1,39 +1,59 @@
-.filter-bar__c {
+.filterBar__c {
   background: #fff;
   border-radius: 8px;
   padding: 16px 20px;
   display: flex;
-  gap: 24px;
-  align-items: center;
-  margin-bottom: 20px;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  gap: 10px 12px;
+  align-items: flex-start;
+  align-content: flex-start;
+  margin-bottom: 12px;
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
 
-  .filter-group {
+  .filter-block {
     display: flex;
+    flex-wrap: nowrap;
     align-items: center;
-    gap: 8px;
-    position: relative;
+    gap: 6px 8px;
+    flex: 0 1 auto;
+    min-width: 0;
+    max-width: 100%;
+  }
+
+  .filter-field {
+    display: flex;
+    flex-wrap: nowrap;
+    align-items: center;
+    gap: 6px;
+    min-width: 0;
 
     label {
       font-size: 13px;
       color: #666;
       white-space: nowrap;
+      display: inline-flex;
+      align-items: center;
+      gap: 4px;
     }
 
-    select,
-    input {
-      padding: 6px 12px;
-      border: 1px solid #ddd;
-      border-radius: 6px;
-      font-size: 13px;
-      background: #fff;
-      cursor: pointer;
+    &.filter-field-range {
+      flex: 0 0 auto;
     }
+  }
 
-    select:focus {
-      border-color: #6366f1;
-      outline: none;
-    }
+  .filter-select {
+    min-width: 160px;
+    max-width: 100%;
+  }
+
+  .filter-select-wide {
+    min-width: 220px;
+  }
+
+  .filter-select-spin-wrap {
+    min-width: 220px;
+    min-height: 32px;
   }
 
   .filter-btn {
@@ -51,133 +71,20 @@
     }
   }
 
-  /* Owner选人选部门组件 */
-  .owner-picker-wrap {
-    position: relative;
-  }
-
-  .owner-picker-trigger {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    padding: 6px 12px;
-    border: 1px solid #ddd;
-    border-radius: 6px;
-    font-size: 13px;
-    cursor: pointer;
-    background: #fff;
-    min-width: 140px;
-
-    &:hover {
-      border-color: #6366f1;
-    }
-  }
-
-  .owner-selected-text {
-    flex: 1;
-  }
-
-  .owner-arrow {
-    font-size: 10px;
-    color: #999;
-  }
-
-  .owner-picker-dropdown {
-    display: none;
-    position: absolute;
-    top: 100%;
-    left: 0;
-    margin-top: 4px;
-    width: 260px;
-    background: #fff;
-    border-radius: 8px;
-    box-shadow: 0 8px 30px rgba(0, 0, 0, 0.15);
-    z-index: 250;
-    padding: 8px 0;
-    max-height: 340px;
-    overflow-y: auto;
-
-    &.open {
-      display: block;
-    }
-  }
-
-  .owner-search {
-    width: calc(100% - 16px);
-    margin: 0 8px 8px;
-    padding: 8px 10px;
-    border: 1px solid #eee;
-    border-radius: 6px;
-    font-size: 12px;
-    outline: none;
-
-    &:focus {
-      border-color: #6366f1;
-    }
-  }
-
-  .owner-section-label {
-    padding: 6px 14px;
-    font-size: 11px;
-    color: #999;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
-  }
-
-  .owner-item {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    padding: 8px 14px;
-    font-size: 13px;
-    cursor: pointer;
-    transition: background 0.15s;
-
-    &:hover {
-      background: #f5f5ff;
-    }
-
-    &.selected {
-      background: #f0f0ff;
-      color: #6366f1;
-      font-weight: 600;
-    }
-  }
-
-  .owner-icon {
-    font-size: 14px;
-    width: 20px;
-    text-align: center;
-  }
-
-  .owner-check {
-    width: 16px;
-    height: 16px;
-    border: 1.5px solid #ccc;
-    border-radius: 3px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 11px;
-    color: transparent;
-    flex-shrink: 0;
-  }
-
-  .owner-item.selected .owner-check {
-    background: #6366f1;
-    border-color: #6366f1;
-    color: #fff;
-  }
-
   /* Changes Since 问号提示 */
   .help-tip {
     position: relative;
-    display: inline-block;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
     cursor: help;
     color: #999;
     font-size: 12px;
     margin-left: 2px;
+    width: 16px;
+    height: 16px;
+    border-radius: 50%;
+    border: 1px solid #ddd;
 
     .help-tip-text {
       display: none;

package/template/neo-bi-cmps/src/components/targetNumber__c/customStyleConfig/index.tsx

@@ -41,13 +41,14 @@ export default class CustomStyleConfigRenderer extends React.Component<
     this.handleModalOk = this.handleModalOk.bind(this);
     this.handleModalCancel = this.handleModalCancel.bind(this);
     this.handleEditorChange = this.handleEditorChange.bind(this);
+    this.getDisplayValue = this.getDisplayValue.bind(this);
   }
 
-  handleEditorChange = (value: any) => {
+  handleEditorChange(value: any) {
     this.setState({ editorValue: value });
-  };
+  }
 
-  handleModalOk = () => {
+  handleModalOk() {
     const { editorValue } = this.state;
     const { onChange } = this.props;
 
@@ -57,26 +58,26 @@ export default class CustomStyleConfigRenderer extends React.Component<
     } catch (error) {
       message.error('保存配置失败');
     }
-  };
+  }
 
-  handleModalCancel = () => {
+  handleModalCancel() {
     // 取消时恢复原始值
     const value = this.props.value || {};
     this.setState({
       isModalVisible: false,
       editorValue: value,
     });
-  };
+  }
 
-  showModal = () => {
+  showModal() {
     const value = this.props.value || {};
     this.setState({
       isModalVisible: true,
       editorValue: value,
     });
-  };
+  }
 
-  getDisplayValue = () => {
+  getDisplayValue() {
     const { value } = this.props;
 
     if (!value || Object.keys(value).length === 0) {
@@ -84,7 +85,7 @@ export default class CustomStyleConfigRenderer extends React.Component<
     }
 
     return '已配置自定义样式';
-  };
+  }
 
   render() {
     const { disabled, viewStyle, wideScreen, value } = this.props;

package/template/neo-bi-cmps/src/components/targetNumber__c/index.tsx

@@ -8,7 +8,9 @@ import { xObject } from 'neo-open-api'; // Neo Open API
 
 // 引入 neo-ui-common / NeoEvent
 // @ts-ignore
-import { BaseCmp, StatusHoc, NeoEvent } from 'neo-ui-common';
+import { BaseCmp, NeoEvent } from 'neo-ui-common';
+
+import { formatCssSpacing } from '../../utils/targetNumber';
 
 import './style.scss';
 
@@ -123,8 +125,10 @@ class TargetNumber extends BaseCmp<TargetNumberProps, TargetNumberState> {
       error: null,
     };
 
-    // 绑定方法上下文
     this.loadData = this.loadData.bind(this);
+    this.hasValidFieldDesc = this.hasValidFieldDesc.bind(this);
+    this.getTargetNumbers = this.getTargetNumbers.bind(this);
+    this.formatValue = this.formatValue.bind(this);
   }
 
   componentDidMount() {
@@ -314,20 +318,10 @@ class TargetNumber extends BaseCmp<TargetNumberProps, TargetNumberState> {
     const padding = paddingMargin.padding || '0';
     const quantity = paddingMargin.quantity || 'px';
 
-    // 应用单位到 margin 和 padding
-    const formatSpacing = (value: string, unit: string) => {
-      if (!value || value === '0') return '0';
-      // 如果值已经包含单位，直接返回；否则添加单位
-      if (/\d+(px|rem|em|%)$/.test(value.trim())) {
-        return value;
-      }
-      return `${value}${unit}`;
-    };
-
-    baseStyleObj.margin = formatSpacing(margin, quantity);
+    baseStyleObj.margin = formatCssSpacing(margin, quantity);
     // 如果 padding 为 0，使用默认的 16px（保持原有样式）
     const finalPadding =
-      padding === '0' ? '16px' : formatSpacing(padding, quantity);
+      padding === '0' ? '16px' : formatCssSpacing(padding, quantity);
     baseStyleObj.padding = finalPadding;
 
     // 数值样式
@@ -436,5 +430,4 @@ class TargetNumber extends BaseCmp<TargetNumberProps, TargetNumberState> {
   }
 }
 
-// 使用 StatusHoc 包裹组件，用于支持组件显示隐藏控制
-export default StatusHoc(TargetNumber);
+export default TargetNumber;

package/template/neo-bi-cmps/src/utils/common.ts

@@ -0,0 +1,231 @@
+/**
+ * 多组件共用的纯工具方法（筛选 where、阶段名、金额展示、NeoBI 请求体等）
+ */
+
+export interface PropsContext {
+  data?: {
+    __NeoCurrentUser?: {
+      id?: number;
+      name?: string | null;
+    };
+  };
+}
+/** 筛选项转有限数字，无效返回 null（与 filter2chartFilter 等一致） */
+export function toFiniteNumber(v: unknown): number | null {
+  if (v == null || v === '') return null;
+  if (typeof v === 'number' && Number.isFinite(v)) return v;
+  const n = Number(v);
+  return Number.isFinite(n) ? n : null;
+}
+
+/** 时间区间起止：均为有效数字时返回闭区间 [start, end]（毫秒时间戳，与 FilterBar 一致） */
+export function closeRangeFromFilter(
+  range: unknown,
+): { start: number; end: number } | null {
+  if (!range || typeof range !== 'object') return null;
+  const r = range as { start?: unknown; end?: unknown };
+  const start = toFiniteNumber(r.start);
+  const end = toFiniteNumber(r.end);
+  if (start == null || end == null) return null;
+  return { start, end };
+}
+
+/** opportunityOwner → 用于 where 的用户 id 列表（字符串避免大整数精度丢失） */
+export function normalizeOwnerIdsForWhere(owner: unknown): string[] {
+  if (owner == null || owner === '') return [];
+  const raw = Array.isArray(owner) ? owner : [owner];
+  const out: string[] = [];
+  for (const item of raw) {
+    if (item == null || item === '') continue;
+    const s = String(item).trim().replace(/,/g, '');
+    if (s === '' || !/^-?\d+$/.test(s)) continue;
+    out.push(s);
+  }
+  return out;
+}
+
+export function entityTypeIdForWhere(businessType: unknown): string | null {
+  if (businessType == null || businessType === '') return null;
+  const s = String(businessType).trim();
+  if (s === '' || !/^-?\d+$/.test(s.replace(/,/g, ''))) return null;
+  return s.replace(/,/g, '');
+}
+
+/** 从阶段展示名取「第一个 . 之后」的片段，用于匹配 customItem1__c 等 */
+export function extractStageKeyFromStageName(stageName: string): string {
+  const s = String(stageName ?? '').trim();
+  const i = s.indexOf('.');
+  if (i < 0) return s;
+  return s.slice(i + 1).trim();
+}
+
+/** 商机行等：空或无法解析时为 0 */
+export function parseNumberOrZero(raw: unknown): number {
+  if (raw === null || raw === undefined || raw === '') return 0;
+  const n =
+    typeof raw === 'number'
+      ? raw
+      : parseFloat(String(raw).replace(/,/g, '').trim());
+  return Number.isFinite(n) ? n : 0;
+}
+
+/** 阈值配置等：空或无法解析时为 NaN */
+export function parseNumberOrNaN(raw: unknown): number {
+  if (raw === null || raw === undefined || raw === '') return NaN;
+  const n =
+    typeof raw === 'number'
+      ? raw
+      : parseFloat(String(raw).replace(/,/g, '').trim());
+  return Number.isFinite(n) ? n : NaN;
+}
+
+/** 展示用金额：$ 前缀；≥1e3 时使用 K / M / B / T 缩写 */
+export function formatAmountDisplay(n: number): string {
+  if (!Number.isFinite(n)) return '-';
+  const sign = n < 0 ? '-' : '';
+  const abs = Math.abs(n);
+  if (abs === 0) return '$0';
+
+  if (abs < 1000) {
+    const part = Number.isInteger(abs)
+      ? abs.toLocaleString('en-US')
+      : abs.toLocaleString('en-US', {
+          minimumFractionDigits: 0,
+          maximumFractionDigits: 2,
+        });
+    return `${sign}$${part}`;
+  }
+
+  const tier = Math.min(Math.floor(Math.log10(abs) / 3), 4);
+  const suffixes = ['', 'K', 'M', 'B', 'T'] as const;
+  const suffix = suffixes[tier];
+  const divisor = 1000 ** tier;
+  const scaled = abs / divisor;
+
+  let body: string;
+  if (scaled >= 100) body = String(Math.round(scaled));
+  else if (scaled >= 10) body = scaled.toFixed(1).replace(/\.0$/, '');
+  else body = scaled.toFixed(2).replace(/\.?0+$/, '');
+
+  return `${sign}$${body}${suffix}`;
+}
+
+/** queryDataTask：x-www-form-urlencoded 表单体（filter 以 JSON 字符串传递） */
+export function buildQueryDataTaskFormBody(params: {
+  viewId: string;
+  userId: string | number;
+  type: string;
+  filter: Record<string, unknown>;
+}): string {
+  const form = new URLSearchParams();
+  form.set('viewId', String(params.viewId));
+  form.set('userId', String(params.userId));
+  form.set('type', params.type);
+  form.set('filter', JSON.stringify(params.filter));
+  return form.toString();
+}
+
+/** 负责人多选默认值：当前登录用户 id（与 __NeoCurrentUser 一致） */
+export function getDefaultOpportunityOwnerIds(
+  props: PropsContext,
+): (number | string)[] {
+  // return [1246045]; // 默认用户改成 （Alice）
+  const curUser = props.data?.__NeoCurrentUser;
+  if (curUser?.id == null || curUser.name == null || String(curUser.name).trim() === '') {
+    return [];
+  }
+  return [curUser.id];
+}
+
+/** 负责人多选默认值：当前登录用户 id（与 __NeoCurrentUser 一致） */
+export function getDefaultFilterWhereByProps(
+  props: any = {},
+): any {
+  let userId = 1246045; // 默认用户（Alice）
+  const curUser = props.data?.__NeoCurrentUser;
+  if (curUser?.id) {
+    userId = curUser.id;
+  }
+  const defaultFilter = {
+    relation: '1 and 2 and 3',
+    filter: [
+      {
+        modelKey: 'opportunity',
+        serialNo: 1,
+        fieldKey: 'closeDate',
+        type: 'date',
+        entityOnlyFilter: 0,
+        timeType: 'relative',
+        operate: 'eq',
+        value: [
+          {
+            val: 401,
+            baseType: 'system',
+          },
+        ],
+        seq: 1,
+      },
+      {
+        modelKey: 'opportunity',
+        serialNo: 1,
+        fieldKey: 'ownerId',
+        type: 'refer',
+        referKey: 'user',
+        optionType: 'user',
+        entityOnlyFilter: 0,
+        operate: 'in',
+        value: [
+          {
+            val: userId,
+            sub: false,
+            source: 'internal',
+            specialType: 0,
+          },
+        ],
+        includeNullValue: 0,
+        seq: 2,
+      },
+      {
+        modelKey: 'opportunity',
+        serialNo: 1,
+        fieldKey: 'entityType',
+        type: 'refer',
+        entityOnlyFilter: 0,
+        operate: 'in',
+        value: [
+          {
+            val: 8150459,
+          },
+        ],
+        seq: 3,
+      },
+    ],
+  };
+  return defaultFilter;
+}
+
+export function getDefaultFilterByProps(
+  props: any = {},
+): any {
+  let userId = 1246045; // 默认用户（Alice）
+  const curUser = props.data?.__NeoCurrentUser;
+  if (curUser?.id) {
+    userId = curUser.id;
+  }
+  const defaultFilter = {
+    "closeDate": 401,
+    "closeDateCustomRange": {
+        "start": 1775059200000,
+        "end": 1782835199999
+    },
+    "opportunityOwner": [
+      userId
+    ],
+    "businessType": 8150459,
+    "businessTypeLabel": "New Business",
+    "businessTypeApiKey": "defaultBusiType_1",
+    "changesSince": "Start of the Period",
+    "changesSinceCustomTime": 1775059200000
+  };
+  return defaultFilter;
+}