amis 1.9.1-beta.21 → 1.10.0

package/src/components/ResultBox.tsx

@@ -215,6 +215,8 @@ export class ResultBox extends React.Component<ResultBoxProps> {
     } = this.props;
     const isFocused = this.state.isFocused;
     const mobileUI = useMobileUI && isMobile();
+    /** 不需要透传给Input的属性 */
+    const omitPropsList = ['maxTagCount', 'overflowTagPopover'];
 
     return (
       <div
@@ -248,7 +250,7 @@ export class ResultBox extends React.Component<ResultBoxProps> {
 
         {allowInput && !disabled ? (
           <Input
-            {...rest}
+            {...omit(rest, omitPropsList)}
             onKeyPress={onKeyPress}
             ref={this.inputRef}
             value={value || ''}

package/src/components/Select.tsx

@@ -1076,7 +1076,12 @@ export class Select extends React.Component<SelectProps, SelectState> {
               {item.tip}
             </Checkbox>
           ) : (
-            <span>
+            <span
+              className={cx('Select-option-content')}
+              title={
+                typeof item[labelField] === 'string' ? item[labelField] : ''
+              }
+            >
               {item.disabled
                 ? item[labelField]
                 : highlight(

package/src/components/formula/Editor.tsx

@@ -167,7 +167,8 @@ export class FormulaEditor extends React.Component<
       let from = 0;
       let idx = -1;
       while (~(idx = content.indexOf(v, from))) {
-        html = html.replace(v, `<span class="c-field">${varMap[v]}</span>`);
+        const curNameEg = new RegExp(`\\b${v}\\b`, 'g'); // 避免变量识别冲突，比如：name、me 被识别成 na「me」
+        html = html.replace(curNameEg, `<span class="c-field">${varMap[v]}</span>`);
         from = idx + v.length;
       }
     });
@@ -229,7 +230,7 @@ export class FormulaEditor extends React.Component<
   handleVariableSelect(item: VariableItem) {
     const {evalMode, selfVariableName} = this.props;
 
-    if (item && item.label && selfVariableName === item.label) {
+    if (item && item.value && selfVariableName === item.value) {
       toast.warning('不能使用当前变量[self]，避免循环引用。');
       return;
     }

package/src/components/formula/Picker.tsx

@@ -268,13 +268,13 @@ export class FormulaPicker extends React.Component<
       classnames: cx,
       translate: __,
       disabled,
-      allowInput,
+      allowInput = true,
       className,
       onChange,
       size,
       borderMode,
       placeholder,
-      mode,
+      mode = 'input-button',
       btnLabel,
       level,
       btnSize,

package/src/components/formula/VariableList.tsx

@@ -48,7 +48,7 @@ function VariableList(props: VariableListProps) {
           return (
             <span className={cx(`${classPrefix}-item`, itemClassName)}>
               {
-                  option.label && option.label === selfVariableName && (
+                  option.label && option.value === selfVariableName && (
                     <Badge
                       classnames={cx}
                       badge={{
@@ -67,7 +67,7 @@ function VariableList(props: VariableListProps) {
                   )
                 }
                 {
-                  option.label && option.label !== selfVariableName && (
+                  option.label && option.value !== selfVariableName && (
                     <label>
                         {option.label}
                       </label>

package/src/renderers/Form/ConditionBuilder.tsx

@@ -11,6 +11,10 @@ import {
 } from '../../components/WithRemoteConfig';
 import {Schema} from '../../types';
 import {autobind} from '../../utils/helper';
+import {
+  isPureVariable,
+  resolveVariableAndFilter
+} from '../../utils/tpl-builtin';
 
 /**
  * 条件组合控件
@@ -72,11 +76,23 @@ export default class ConditionBuilderControl extends React.PureComponent<Conditi
   render() {
     const {className, classnames: cx, ...rest} = this.props;
 
+    // 处理一下formula类型值的变量列表
+    let formula = this.props.formula ? {...this.props.formula} : undefined;
+    if (formula && formula.variables && isPureVariable(formula.variables)) {
+      // 如果 variables 是 ${xxx} 这种形式，将其处理成实际的值
+      formula.variables = resolveVariableAndFilter(
+        formula.variables,
+        this.props.data,
+        '| raw'
+      );
+    }
+
     return (
       <div className={cx(`ConditionBuilderControl`, className)}>
         <ConditionBuilderWithRemoteOptions
           renderEtrValue={this.renderEtrValue}
           {...rest}
+          formula={formula}
         />
       </div>
     );

package/src/renderers/Form/InputTag.tsx

@@ -41,7 +41,7 @@ export interface TagControlSchema extends FormOptionsControl {
   /**
    * 收纳标签的Popover配置
    */
-  overflowTagPopover: object;
+  overflowTagPopover?: object;
 }
 
 // declare function matchSorter(items:Array<any>, input:any, options:any): Array<any>;

package/src/renderers/Form/Select.tsx

@@ -19,6 +19,7 @@ import {BaseTransferRenderer, TransferControlSchema} from './Transfer';
 import TransferDropDown from '../../components/TransferDropDown';
 
 import type {TooltipObject} from '../../components/TooltipWrapper';
+import type {SchemaClassName} from '../../Schema';
 
 /**
  * Select 下拉选择框。
@@ -121,7 +122,12 @@ export interface SelectControlSchema extends FormOptionsControl {
   /**
    * 收纳标签的Popover配置
    */
-  overflowTagPopover: object;
+  overflowTagPopover?: object;
+
+  /**
+   * 选项的自定义CSS类名
+   */
+  optionClassName?: SchemaClassName;
 }
 
 export interface SelectProps extends OptionsControlProps {
@@ -349,9 +355,11 @@ export default class SelectControl extends React.Component<SelectProps, any> {
 
   @autobind
   renderMenu(option: Option, state: any) {
-    const {menuTpl, render, data} = this.props;
+    const {menuTpl, render, data, optionClassName} = this.props;
 
     return render(`menu/${state.index}`, menuTpl, {
+      showNativeTitle: true,
+      className: cx('Select-option-content', optionClassName),
       data: createObject(createObject(data, state), option)
     });
   }

package/src/renderers/Table/index.tsx

@@ -2797,6 +2797,26 @@ export default class Table extends React.Component<TableProps, object> {
   storeType: TableStore.name,
   name: 'table'
 })
-export class TableRenderer extends Table {}
+export class TableRenderer extends Table {
+  receive(values: any, subPath?: string) {
+    const scoped = this.context as IScopedContext;
+    const parents = scoped?.parent?.getComponents();
+
+    /**
+     * 因为Table在scope上注册，导致getComponentByName查询组件时会优先找到Table，和CRUD联动的动作都会失效
+     * 这里先做兼容处理，把动作交给上层的CRUD处理
+     */
+    if (Array.isArray(parents) && parents.length) {
+      // CRUD的name会透传给Table，这样可以保证找到CRUD
+      const crud = parents.find(cmpt => cmpt?.props?.name === this.props?.name);
+
+      return crud?.receive?.(values, subPath);
+    }
+
+    if (subPath) {
+      return scoped.send(subPath, values);
+    }
+  }
+}
 
 export {TableCell};

package/src/renderers/Tpl.tsx

@@ -40,6 +40,11 @@ export interface TplSchema extends BaseSchema {
    * 角标
    */
   badge?: BadgeSchema;
+
+  /**
+   * 是否设置外层DOM节点的title属性为文本内容
+   */
+  showNativeTitle?: boolean;
 }
 
 export interface TplProps extends RendererProps, TplSchema {
@@ -117,17 +122,22 @@ export class Tpl extends React.Component<TplProps, object> {
       inline,
       classnames: cx,
       style,
+      showNativeTitle,
       data
     } = this.props;
     const Component = wrapperComponent || (inline ? 'span' : 'div');
+    const content = this.getContent();
 
     return (
       <Component
         ref={this.htmlRef}
         className={cx('TplField', className)}
         style={buildStyle(style, data)}
+        {...(showNativeTitle
+          ? {title: typeof content === 'string' ? content : ''}
+          : {})}
       >
-        <span>{this.getContent()}</span>
+        <span>{content}</span>
       </Component>
     );
   }