amis 1.9.1-beta.19 → 1.9.1-beta.23

package/src/renderers/Table/index.tsx

@@ -1081,11 +1081,11 @@ export default class Table extends React.Component<TableProps, object> {
     } = (this.heights = {});
 
     heights.header = table
-      .querySelector('thead>tr:last-child')!
-      .getBoundingClientRect().height;
-    heights.header2 = table
-      .querySelector('thead>tr:first-child')!
+      .querySelector('thead')!
       .getBoundingClientRect().height;
+    // heights.header2 = table
+    //   .querySelector('thead>tr:first-child')!
+    //   .getBoundingClientRect().height;
 
     forEach(
       table.querySelectorAll('thead>tr:last-child>th'),
@@ -1132,7 +1132,7 @@ export default class Table extends React.Component<TableProps, object> {
           table.querySelectorAll('thead>tr:first-child>th'),
           (item: HTMLElement) => {
             const width = widths2[item.getAttribute('data-index') as string];
-            item.style.cssText += `width: ${width}px; height: ${heights.header2}px`;
+            item.style.cssText += `width: ${width}px; height: ${heights.header}px`;
             totalWidth2 += width;
           }
         );
@@ -2797,6 +2797,42 @@ 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);
+    }
+  }
+
+  reload(subPath?: string, query?: any, ctx?: any) {
+    const scoped = this.context as IScopedContext;
+    const parents = scoped?.parent?.getComponents();
+
+    if (Array.isArray(parents) && parents.length) {
+      // CRUD的name会透传给Table，这样可以保证找到CRUD
+      const crud = parents.find(cmpt => cmpt?.props?.name === this.props?.name);
+
+      return crud?.reload?.(subPath, query, ctx);
+    }
+
+    if (subPath) {
+      return scoped.reload(subPath, ctx);
+    }
+  }
+}
 
 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>
     );
   }

package/src/store/form.ts

@@ -9,6 +9,7 @@ import {
   Instance
 } from 'mobx-state-tree';
 import debounce from 'lodash/debounce';
+import find from 'lodash/find';
 import {ServiceStore} from './service';
 import {FormItemStore, IFormItemStore, SFormItemStore} from './formItem';
 import {Api, ApiObject, fetchOptions, Payload} from '../types';
@@ -326,7 +327,6 @@ export const FormStore = ServiceStore.named('FormStore')
         }
 
         if (!json.ok) {
-
           if (json.status === 422 && json.errors) {
             setFormItemErrors(json.errors);
 
@@ -359,22 +359,23 @@ export const FormStore = ServiceStore.named('FormStore')
           );
           if (!ret?.dispatcher?.prevented) {
             self.msg &&
-            getEnv(self).notify(
-              'success',
-              self.msg,
-              json.msgTimeout !== undefined
-                ? {
-                    closeButton: true,
-                    timeout: json.msgTimeout
-                  }
-                : undefined
-            );
+              getEnv(self).notify(
+                'success',
+                self.msg,
+                json.msgTimeout !== undefined
+                  ? {
+                      closeButton: true,
+                      timeout: json.msgTimeout
+                    }
+                  : undefined
+              );
           }
           return json.data;
         }
       } catch (e) {
         self.markSaving(false);
-        let ret = options && options.onFailed && options.onFailed(e.response || {});
+        let ret =
+          options && options.onFailed && options.onFailed(e.response || {});
         if (ret?.then) {
           ret = yield ret;
         }
@@ -486,7 +487,7 @@ export const FormStore = ServiceStore.named('FormStore')
           if (dispatcher?.then) {
             dispatcher = yield dispatcher;
           }
-          if (!dispatcher?.prevented){
+          if (!dispatcher?.prevented) {
             msg && env.notify('error', msg);
           }
           throw new Error(msg);
@@ -548,20 +549,26 @@ export const FormStore = ServiceStore.named('FormStore')
       return self.valid;
     });
 
-    const validateFields: (fields: Array<string>) => Promise<boolean> = flow(
-      function* validateFields(fields: Array<string>) {
-        const items = self.items.concat();
-        let result: Array<boolean> = [];
-        for (let i = 0, len = items.length; i < len; i++) {
-          let item = items[i] as IFormItemStore;
+    const validateFields: (
+      fields: Array<string | {name: string; rules: {[propName: string]: any}}>
+    ) => Promise<boolean> = flow(function* validateFields(
+      fields: Array<string | {name: string; rules: {[propName: string]: any}}>
+    ) {
+      const items = self.items.concat();
+      const normalizedfields = fields.map(field =>
+        typeof field === 'string' ? {name: field, rules: {}} : field
+      );
+      let result: Array<boolean> = [];
+      for (let i = 0, len = items.length; i < len; i++) {
+        let item = items[i] as IFormItemStore;
+        const field = find(normalizedfields, field => field.name === item.name);
 
-          if (~fields.indexOf(item.name)) {
-            result.push(yield item.validate(self.data));
-          }
+        if (field) {
+          result.push(yield item.validate(self.data, undefined, field.rules));
         }
-        return result.every(item => item);
       }
-    );
+      return result.every(item => item);
+    });
 
     function clearErrors() {
       const items = self.items.concat();

package/src/store/formItem.ts

@@ -326,70 +326,83 @@ export const FormItemStore = StoreNode.named('FormItemStore')
     }
 
     let validateCancel: Function | null = null;
-    const validate: (data: Object, hook?: any) => Promise<boolean> = flow(
-      function* validate(data: Object, hook?: any) {
-        if (self.validating && !isEffectiveApi(self.validateApi, data)) {
-          return self.valid;
-        }
-
-        self.validating = true;
-        clearError();
-        if (hook) {
-          yield hook();
-        }
+    const validate: (
+      data: Object,
+      hook?: any,
+      /**
+       * customRules主要是为了支持action.require的验证方式
+       * 这样可以基于不同的action实现不同的校验规则
+       */
+      customRules?: {[propName: string]: any}
+    ) => Promise<boolean> = flow(function* validate(
+      data: Object,
+      hook?: any,
+      customRules?: {[propName: string]: any}
+    ) {
+      if (self.validating && !isEffectiveApi(self.validateApi, data)) {
+        return self.valid;
+      }
 
-        addError(
-          doValidate(self.tmpValue, data, self.rules, self.messages, self.__)
-        );
+      self.validating = true;
+      clearError();
+      if (hook) {
+        yield hook();
+      }
 
-        if (!self.errors.length && isEffectiveApi(self.validateApi, data)) {
-          if (validateCancel) {
-            validateCancel();
-            validateCancel = null;
-          }
+      addError(
+        doValidate(
+          self.tmpValue,
+          data,
+          customRules ? str2rules(customRules) : self.rules,
+          self.messages,
+          self.__
+        )
+      );
 
-          const json: Payload = yield getEnv(self).fetcher(
-            self.validateApi,
-            /** 如果配置validateApi，需要将用户最新输入同步到数据域内 */
-            createObject(data, {[self.name]: self.tmpValue}),
-            {
-              cancelExecutor: (executor: Function) =>
-                (validateCancel = executor)
-            }
-          );
+      if (!self.errors.length && isEffectiveApi(self.validateApi, data)) {
+        if (validateCancel) {
+          validateCancel();
           validateCancel = null;
+        }
 
-          if (!json.ok && json.status === 422 && json.errors) {
-            addError(
-              String(
-                json.errors || json.msg || `表单项「${self.name}」校验失败`
-              )
-            );
+        const json: Payload = yield getEnv(self).fetcher(
+          self.validateApi,
+          /** 如果配置validateApi，需要将用户最新输入同步到数据域内 */
+          createObject(data, {[self.name]: self.tmpValue}),
+          {
+            cancelExecutor: (executor: Function) => (validateCancel = executor)
           }
+        );
+        validateCancel = null;
+
+        if (!json.ok && json.status === 422 && json.errors) {
+          addError(
+            String(json.errors || json.msg || `表单项「${self.name}」校验失败`)
+          );
         }
+      }
 
-        self.validated = true;
+      self.validated = true;
 
-        if (self.unique && self.form?.parentStore?.storeType === 'ComboStore') {
-          const combo = self.form.parentStore as IComboStore;
-          const group = combo.uniques.get(self.name) as IUniqueGroup;
+      if (self.unique && self.form?.parentStore?.storeType === 'ComboStore') {
+        const combo = self.form.parentStore as IComboStore;
+        const group = combo.uniques.get(self.name) as IUniqueGroup;
 
-          if (
-            group.items.some(
-              item =>
-                item !== self &&
-                self.tmpValue !== undefined &&
-                item.value === self.tmpValue
-            )
-          ) {
-            addError(self.__('Form.unique'));
-          }
+        if (
+          group.items.some(
+            item =>
+              item !== self &&
+              self.tmpValue !== undefined &&
+              item.value === self.tmpValue
+          )
+        ) {
+          addError(self.__('Form.unique'));
         }
-
-        self.validating = false;
-        return self.valid;
       }
-    );
+
+      self.validating = false;
+      return self.valid;
+    });
 
     function setError(msg: string | Array<string>, tag: string = 'builtin') {
       clearError();

package/src/utils/helper.ts

@@ -20,7 +20,7 @@ import {
   keyToPath,
   isPureVariable,
   resolveVariable,
-  resolveVariableAndFilter,
+  resolveVariableAndFilter
 } from 'amis-formula';
 import {isObservable} from 'mobx';
 
@@ -937,6 +937,9 @@ export function everyTree<T extends TreeItem>(
   paths: Array<T> = [],
   indexes: Array<number> = []
 ): boolean {
+  if (!Array.isArray(tree)) {
+    return false;
+  }
   return tree.every((item, index) => {
     const value: any = iterator(item, index, level, paths, indexes);
 
@@ -1618,3 +1621,10 @@ export function repeatCount(count: number, iterator: (index: number) => any) {
 
   return result;
 }
+
+export function isNumeric(value: any): boolean {
+  if (typeof value === 'number') {
+    return true;
+  }
+  return /^[-+]?(?:\d*[.])?\d+$/.test(value);
+}