neo-cmp-cli 1.13.17 → 1.13.19

package/template/neo-pipeline-cmps/src/utils/stageSwitch.ts

@@ -1,5 +1,5 @@
 /**
- * 阶段切换 stageSwitch 专用（商机行字段解析）
+ * Stage switch stageSwitch specific (opportunity row field parsing)
  */
 import { parseNumberOrZero } from './common';
 

package/template/neo-pipeline-cmps/src/utils/stageTimeChart.ts

@@ -1,5 +1,5 @@
 /**
- * 阶段停留时间 stageTimeChart 专用
+ * Stage time stageTimeChart specific
  */
 import { extractStageKeyFromStageName } from './common';
 
@@ -27,7 +27,7 @@ export interface StageTimeItem {
 }
 
 /**
- * 将「16天11小时」「8天6时」等文案转为天数（浮点），如 16 + 11/24
+ * Convert duration text like "16 Days 11 Hours" or "8天6时" to days (float), e.g. 16 + 11/24
  */
 export function parseDurationToDays(text: unknown): number {
   const s = String(text ?? '').trim();
@@ -41,13 +41,13 @@ export function parseDurationToDays(text: unknown): number {
   return days + hours / 24;
 }
 
-/** 终局阶段不参与「阶段停留时间」展示 */
+/** Final/closed stages are excluded from "stage time" display */
 export function isClosedOutcomeStage(stageName: string): boolean {
   const key = extractStageKeyFromStageName(stageName).toLowerCase();
   return key === 'closed won' || key === 'closed lost';
 }
 
-/** 配色：实际天数与 customItem3（目标）/customItem4（上限）比较 */
+/** Color: compare actual days with customItem3 (target) / customItem4 (limit) */
 export function resolveActualColor(
   actualDays: number,
   target: number,
@@ -58,7 +58,7 @@ export function resolveActualColor(
   return COLOR_YELLOW;
 }
 
-/** 将解析后的行转为图表条数据（配色与条形比例） */
+/** Convert parsed rows to chart bar data (color and bar proportions) */
 export function buildStageTimeItems(rows: StageTimeRow[]): StageTimeItem[] {
   return rows.map((row) => {
     const actualPercent = row.actualTime;

package/template/neo-pipeline-cmps/src/utils/targetNumber.ts

@@ -1,8 +1,8 @@
 /**
- * 数值指标 targetNumber：样式辅助
+ * Numeric indicator targetNumber: style helpers
  */
 
-/** margin/padding 字符串：无单位时补上 quantity，已有 px/rem等则原样返回 */
+/** margin/padding string: appends unit when no unit present, returns as-is if px/rem/etc already exists */
 export function formatCssSpacing(value: string, unit: string): string {
   if (!value || value === '0') return '0';
   if (/\d+(px|rem|em|%)$/.test(value.trim())) {

package/template/neo-web-entity-grid/src/components/createForm__c/index.tsx

@@ -345,7 +345,7 @@ export default class CreateEntityForm extends React.PureComponent<
       // 触发表单提交事件
       this.onSubmit({
         xObjectApiKey,
-        data: values
+        data: values,
       });
     });
   }
@@ -438,275 +438,287 @@ export default class CreateEntityForm extends React.PureComponent<
 
     return (
       <>
-      <Form
-        ref={(form) => this.setState({ form })}
-        layout="horizontal"
-        {...formItemLayout}
-      >
-        <Row gutter={16}>
-          {curFieldList.map((field) => {
-            // 跳过 ID 字段，不需要在表单中显示
-            if (field.apiKey === 'id') return null;
-
-            let inputComponent;
-            const selectitem = field.selectitem || [];
-            const checkitem = field.checkitem || [];
-
-            // 关联字段：存在 referTo 时，渲染为点击选择弹窗的输入框
-            if (field.referTo && (field.type !== 'entityType' && field.type !== 'entitytype')) {
-              // 非业务类型字段
-              const selectedLabel = referSelectedLabels[field.apiKey] || '';
+        <Form
+          ref={(form) => this.setState({ form })}
+          layout="horizontal"
+          {...formItemLayout}
+        >
+          <Row gutter={16}>
+            {curFieldList.map((field) => {
+              // 跳过 ID 字段，不需要在表单中显示
+              if (field.apiKey === 'id') return null;
+
+              let inputComponent;
+              const selectitem = field.selectitem || [];
+              const checkitem = field.checkitem || [];
+
+              // 关联字段：存在 referTo 时，渲染为点击选择弹窗的输入框
+              if (
+                field.referTo &&
+                field.type !== 'entityType' &&
+                field.type !== 'entitytype'
+              ) {
+                // 非业务类型字段
+                const selectedLabel = referSelectedLabels[field.apiKey] || '';
+                const colSpan = columnCount === 2 ? 12 : 24;
+                return (
+                  <Col span={colSpan} key={field.apiKey}>
+                    <Form.Item
+                      label={field.label}
+                      required={field.required ?? false}
+                    >
+                      <Input.Group compact style={{ display: 'flex' }}>
+                        <Form.Item
+                          name={field.apiKey}
+                          noStyle
+                          rules={[
+                            {
+                              required: field.required,
+                              message: `请选择${field.label}`,
+                            },
+                          ]}
+                        >
+                          <Input type="hidden" />
+                        </Form.Item>
+                        <Input
+                          readOnly
+                          value={selectedLabel}
+                          placeholder={`请点击选择${field.label}`}
+                          style={{ flex: 1, cursor: 'pointer' }}
+                          onClick={() => this.openReferModal(field)}
+                        />
+                        <Button
+                          type="primary"
+                          onClick={() => this.openReferModal(field)}
+                        >
+                          选择
+                        </Button>
+                      </Input.Group>
+                    </Form.Item>
+                  </Col>
+                );
+              }
+
+              // 根据字段类型生成对应的输入组件
+              switch (field.type) {
+                case 'entityType':
+                case 'entitytype':
+                  // 业务类型选择器
+                  inputComponent = (
+                    <Select placeholder="请选择业务类型" allowClear>
+                      {entityTypeList.map((item) => (
+                        <Option
+                          key={item.apiKey}
+                          value={item.id}
+                          disabled={!item.active}
+                        >
+                          {item.label}
+                        </Option>
+                      ))}
+                    </Select>
+                  );
+                  break;
+                case 'picklist':
+                  // 单选下拉框
+                  inputComponent = (
+                    <Select placeholder={`请选择${field.label}`} allowClear>
+                      {selectitem.map((item) => (
+                        <Option key={item.apiKey} value={item.id}>
+                          {item.label}
+                        </Option>
+                      ))}
+                    </Select>
+                  );
+                  break;
+                case 'textarea':
+                  // 多行文本输入框
+                  inputComponent = (
+                    <Input.TextArea
+                      placeholder={`请输入${field.label}`}
+                      rows={3}
+                      showCount
+                      maxLength={500}
+                    />
+                  );
+                  break;
+                case 'multipicklist':
+                  // 多选下拉框
+                  inputComponent = (
+                    <Select
+                      placeholder={`请选择${field.label}`}
+                      mode="multiple"
+                      allowClear
+                    >
+                      {checkitem.map((item) => (
+                        <Option key={item.apiKey} value={item.id}>
+                          {item.label}
+                        </Option>
+                      ))}
+                    </Select>
+                  );
+                  break;
+                case 'datetime':
+                  // 日期时间选择器
+                  inputComponent = (
+                    <DatePicker
+                      placeholder={`请选择${field.label}`}
+                      format={'YYYY/MM/DD HH:mm:ss'}
+                      showTime={true}
+                      style={{ width: '100%' }}
+                    />
+                  );
+                  break;
+                case 'date':
+                  // 日期选择器
+                  inputComponent = (
+                    <DatePicker
+                      placeholder={`请选择${field.label}`}
+                      format={'YYYY/MM/DD'}
+                      style={{ width: '100%' }}
+                    />
+                  );
+                  break;
+                case 'time':
+                  // 时间选择器
+                  inputComponent = (
+                    <DatePicker
+                      placeholder={`请选择${field.label}`}
+                      format={'HH:mm:ss'}
+                      showTime={true}
+                      style={{ width: '100%' }}
+                    />
+                  );
+                  break;
+                case 'int':
+                case 'float':
+                  // 数字输入框
+                  inputComponent = (
+                    <InputNumber
+                      placeholder={`请输入${field.label}`}
+                      style={{ width: '100%' }}
+                    />
+                  );
+                  break;
+                case 'email':
+                  // 邮箱输入框
+                  inputComponent = (
+                    <Input placeholder={`请输入${field.label}`} type="email" />
+                  );
+                  break;
+                case 'url':
+                  // URL 输入框
+                  inputComponent = (
+                    <Input placeholder={`请输入${field.label}`} type="url" />
+                  );
+                  break;
+                case 'phone':
+                  // 电话号码输入框
+                  inputComponent = (
+                    <Input placeholder={`请输入${field.label}`} type="tel" />
+                  );
+                  break;
+                default:
+                  // 默认文本输入框
+                  inputComponent = (
+                    <Input
+                      placeholder={`请输入${field.label}`}
+                      maxLength={200}
+                    />
+                  );
+              }
+
               const colSpan = columnCount === 2 ? 12 : 24;
+
               return (
                 <Col span={colSpan} key={field.apiKey}>
                   <Form.Item
+                    name={field.apiKey}
                     label={field.label}
                     required={field.required ?? false}
+                    rules={[
+                      {
+                        required: field.required,
+                        message: `请${
+                          field.type === 'picklist' ||
+                          field.type === 'multipicklist' ||
+                          field.type === 'entityType' ||
+                          field.type === 'entitytype' ||
+                          field.type === 'date' ||
+                          field.type === 'datetime' ||
+                          field.type === 'time'
+                            ? '选择'
+                            : '输入'
+                        }${field.label}`,
+                      },
+                    ]}
                   >
-                    <Input.Group compact style={{ display: 'flex' }}>
-                      <Form.Item
-                        name={field.apiKey}
-                        noStyle
-                        rules={[
-                          {
-                            required: field.required,
-                            message: `请选择${field.label}`,
-                          },
-                        ]}
-                      >
-                        <Input type="hidden" />
-                      </Form.Item>
-                      <Input
-                        readOnly
-                        value={selectedLabel}
-                        placeholder={`请点击选择${field.label}`}
-                        style={{ flex: 1, cursor: 'pointer' }}
-                        onClick={() => this.openReferModal(field)}
-                      />
-                      <Button
-                        type="primary"
-                        onClick={() => this.openReferModal(field)}
-                      >
-                        选择
-                      </Button>
-                    </Input.Group>
+                    {inputComponent}
                   </Form.Item>
                 </Col>
               );
-            }
-
-            // 根据字段类型生成对应的输入组件
-            switch (field.type) {
-              case 'entityType':
-              case 'entitytype':
-                // 业务类型选择器
-                inputComponent = (
-                  <Select placeholder="请选择业务类型" allowClear>
-                    {entityTypeList.map((item) => (
-                      <Option
-                        key={item.apiKey}
-                        value={item.id}
-                        disabled={!item.active}
-                      >
-                        {item.label}
-                      </Option>
-                    ))}
-                  </Select>
-                );
-                break;
-              case 'picklist':
-                // 单选下拉框
-                inputComponent = (
-                  <Select placeholder={`请选择${field.label}`} allowClear>
-                    {selectitem.map((item) => (
-                      <Option key={item.apiKey} value={item.id}>
-                        {item.label}
-                      </Option>
-                    ))}
-                  </Select>
-                );
-                break;
-              case 'textarea':
-                // 多行文本输入框
-                inputComponent = (
-                  <Input.TextArea
-                    placeholder={`请输入${field.label}`}
-                    rows={3}
-                    showCount
-                    maxLength={500}
-                  />
-                );
-                break;
-              case 'multipicklist':
-                // 多选下拉框
-                inputComponent = (
-                  <Select
-                    placeholder={`请选择${field.label}`}
-                    mode="multiple"
-                    allowClear
-                  >
-                    {checkitem.map((item) => (
-                      <Option key={item.apiKey} value={item.id}>
-                        {item.label}
-                      </Option>
-                    ))}
-                  </Select>
-                );
-                break;
-              case 'datetime':
-                // 日期时间选择器
-                inputComponent = (
-                  <DatePicker
-                    placeholder={`请选择${field.label}`}
-                    format={'YYYY/MM/DD HH:mm:ss'}
-                    showTime={true}
-                    style={{ width: '100%' }}
-                  />
-                );
-                break;
-              case 'date':
-                // 日期选择器
-                inputComponent = (
-                  <DatePicker
-                    placeholder={`请选择${field.label}`}
-                    format={'YYYY/MM/DD'}
-                    style={{ width: '100%' }}
-                  />
-                );
-                break;
-              case 'time':
-                // 时间选择器
-                inputComponent = (
-                  <DatePicker
-                    placeholder={`请选择${field.label}`}
-                    format={'HH:mm:ss'}
-                    showTime={true}
-                    style={{ width: '100%' }}
-                  />
-                );
-                break;
-              case 'int':
-              case 'float':
-                // 数字输入框
-                inputComponent = (
-                  <InputNumber
-                    placeholder={`请输入${field.label}`}
-                    style={{ width: '100%' }}
-                  />
-                );
-                break;
-              case 'email':
-                // 邮箱输入框
-                inputComponent = (
-                  <Input placeholder={`请输入${field.label}`} type="email" />
-                );
-                break;
-              case 'url':
-                // URL 输入框
-                inputComponent = (
-                  <Input placeholder={`请输入${field.label}`} type="url" />
-                );
-                break;
-              case 'phone':
-                // 电话号码输入框
-                inputComponent = (
-                  <Input placeholder={`请输入${field.label}`} type="tel" />
-                );
-                break;
-              default:
-                // 默认文本输入框
-                inputComponent = (
-                  <Input placeholder={`请输入${field.label}`} maxLength={200} />
-                );
-            }
-
-            const colSpan = columnCount === 2 ? 12 : 24;
-
-            return (
-              <Col span={colSpan} key={field.apiKey}>
-                <Form.Item
-                  name={field.apiKey}
-                  label={field.label}
-                  required={field.required ?? false}
-                  rules={[
-                    {
-                      required: field.required,
-                      message: `请${
-                        field.type === 'picklist' ||
-                        field.type === 'multipicklist' ||
-                        field.type === 'entityType' ||
-                        field.type === 'entitytype' ||
-                        field.type === 'date' ||
-                        field.type === 'datetime' ||
-                        field.type === 'time'
-                          ? '选择'
-                          : '输入'
-                      }${field.label}`,
+            })}
+          </Row>
+
+          {submitSuccess && (
+            <div className="submit-success-message">
+              <CheckCircleOutlined /> 数据已成功提交
+            </div>
+          )}
+        </Form>
+
+        <Modal
+          open={referModalVisible}
+          onCancel={this.closeReferModal}
+          footer={null}
+          width={900}
+          title={`选择${currentReferField?.label || ''}`}
+          destroyOnClose
+        >
+          {currentReferField && currentReferField.referTo && (
+            <NeoEntityGrid
+              render={this.props.render}
+              objectApiKey={currentReferField.referTo.apiKey}
+              referData={{
+                referObjectApiKey: xObjectDataApi?.xObjectApiKey,
+                referItemApiKey: currentReferField.apiKey,
+              }}
+              selectedCount={1}
+              hiddenHeader={true}
+              onCancel={this.closeReferModal}
+              onSelectedCall={(selectedData: any) => {
+                const { currentReferField: curField, currentReferField } =
+                  this.state;
+                if (!curField) return;
+
+                const items = Array.isArray(selectedData)
+                  ? selectedData
+                  : [selectedData];
+                const firstItem = items[0];
+                const selectedId = firstItem?.id ?? firstItem;
+                const selectedName =
+                  firstItem[`${currentReferField?.referTo?.apiKey}Name`] ||
+                  firstItem?.label ||
+                  firstItem?.name ||
+                  firstItem?.id;
+
+                if (selectedId !== undefined && selectedId !== null) {
+                  this.state.form?.setFieldsValue({
+                    [curField.apiKey]: selectedId,
+                  });
+                  this.setState((prev) => ({
+                    referSelectedLabels: {
+                      ...prev.referSelectedLabels,
+                      [curField.apiKey]: selectedName,
                     },
-                  ]}
-                >
-                  {inputComponent}
-                </Form.Item>
-              </Col>
-            );
-          })}
-        </Row>
-
-        {submitSuccess && (
-          <div className="submit-success-message">
-            <CheckCircleOutlined /> 数据已成功提交
-          </div>
-        )}
-      </Form>
-
-      <Modal
-        open={referModalVisible}
-        onCancel={this.closeReferModal}
-        footer={null}
-        width={900}
-        title={`选择${currentReferField?.label || ''}`}
-        destroyOnClose
-      >
-        {currentReferField && currentReferField.referTo && (
-          <NeoEntityGrid
-            render={this.props.render}
-            objectApiKey={currentReferField.referTo.apiKey}
-            referData={{
-              referObjectApiKey: xObjectDataApi?.xObjectApiKey,
-              referItemApiKey: currentReferField.apiKey,
-            }}
-            selectedCount={1}
-            hiddenHeader={true}
-            onCancel={this.closeReferModal}
-            onSelectedCall={(selectedData: any) => {
-              const { currentReferField: curField, currentReferField } = this.state;
-              if (!curField) return;
-
-              const items = Array.isArray(selectedData)
-                ? selectedData
-                : [selectedData];
-              const firstItem = items[0];
-              const selectedId = firstItem?.id ?? firstItem;
-              const selectedName = firstItem[`${currentReferField?.referTo?.apiKey}Name`] || firstItem?.label || firstItem?.name || firstItem?.id;
-
-              if (selectedId !== undefined && selectedId !== null) {
-                this.state.form?.setFieldsValue({
-                  [curField.apiKey]: selectedId,
-                });
-                this.setState((prev) => ({
-                  referSelectedLabels: {
-                    ...prev.referSelectedLabels,
-                    [curField.apiKey]: selectedName,
-                  },
-                  referModalVisible: false,
-                  currentReferField: null,
-                }));
-              }
-              return false; // 阻止事件冒泡
-            }}
-          />
-        )}
-      </Modal>
+                    referModalVisible: false,
+                    currentReferField: null,
+                  }));
+                }
+                return false; // 阻止事件冒泡
+              }}
+            />
+          )}
+        </Modal>
       </>
     );
   }

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

@@ -52,7 +52,14 @@ export class CreateFormModel {
     columnCount: 2,
     xObjectDataApi: {
       xObjectApiKey: 'opportunity',
-      fields: ['entityType', 'ownerId', 'opportunityName', 'accountId', 'money', 'closeDate'],
+      fields: [
+        'entityType',
+        'ownerId',
+        'opportunityName',
+        'accountId',
+        'money',
+        'closeDate',
+      ],
     },
   };
 
@@ -65,8 +72,15 @@ export class CreateFormModel {
       apiKey: 'onSubmit', // 事件名称
       label: '提交表单后', // 事件
       helpText: '表单提交后触发该事件', // 信息icon hover 时的提示文本
-      eventParams: // 定义事件触发时接收到的事件数据格式
-        '[{"apiKey":"eventParam","children":[{"apiKey":"data","label":"当前表单数据","type":"Object"}],"label":"事件入参","type":"Object"}]',
+      // 定义事件触发时接收到的事件数据格式
+      eventParams: [
+        {
+          apiKey: 'eventParam',
+          children: [{ apiKey: 'data', label: '当前表单数据', type: 'Object' }],
+          label: '事件入参',
+          type: 'Object',
+        },
+      ],
     },
   ];
 

package/template/neo-web-entity-grid/src/components/createForm__c/resetAntd.scss

@@ -1,4 +1,3 @@
-
 // Spin 加载样式
 .ant-spin {
   .ant-spin-dot {

package/template/neo-web-entity-grid/src/components/createForm__c/style.scss

@@ -296,4 +296,4 @@
       }
     }
   }
-}
+}

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

@@ -55,7 +55,11 @@ export default class NeoEntityGridCmp extends BaseCmp<
    */
   @NeoEvent.function
   handleCustomSearchEvent(eventData: any) {
-    console.log('设置自定义筛选条件（handleCustomSearchEvent）: ', eventData, this.props);
+    console.log(
+      '设置自定义筛选条件（handleCustomSearchEvent）: ',
+      eventData,
+      this.props,
+    );
 
     if (!eventData) {
       this.setState({ additionalConditions: [] });