amis 1.9.1-beta.21 → 1.10.0

package/lib/renderers/Tpl.d.ts

@@ -30,6 +30,10 @@ export interface TplSchema extends BaseSchema {
      * 角标
      */
     badge?: BadgeSchema;
+    /**
+     * 是否设置外层DOM节点的title属性为文本内容
+     */
+    showNativeTitle?: boolean;
 }
 export interface TplProps extends RendererProps, TplSchema {
     className?: string;

package/lib/renderers/Tpl.js

@@ -55,10 +55,13 @@ var Tpl = /** @class */ (function (_super) {
         this.dom.firstChild.innerHTML = this.props.env.filterHtml(this.getContent());
     };
     Tpl.prototype.render = function () {
-        var _a = this.props, className = _a.className, wrapperComponent = _a.wrapperComponent, inline = _a.inline, cx = _a.classnames, style = _a.style, data = _a.data;
+        var _a = this.props, className = _a.className, wrapperComponent = _a.wrapperComponent, inline = _a.inline, cx = _a.classnames, style = _a.style, showNativeTitle = _a.showNativeTitle, data = _a.data;
         var Component = wrapperComponent || (inline ? 'span' : 'div');
-        return (react_1.default.createElement(Component, { ref: this.htmlRef, className: cx('TplField', className), style: (0, style_1.buildStyle)(style, data) },
-            react_1.default.createElement("span", null, this.getContent())));
+        var content = this.getContent();
+        return (react_1.default.createElement(Component, (0, tslib_1.__assign)({ ref: this.htmlRef, className: cx('TplField', className), style: (0, style_1.buildStyle)(style, data) }, (showNativeTitle
+            ? { title: typeof content === 'string' ? content : '' }
+            : {})),
+            react_1.default.createElement("span", null, content)));
     };
     Tpl.defaultProps = {
         inline: true,

package/lib/renderers/Tpl.js.map

@@ -6,8 +6,8 @@
         "/src/renderers/Tpl.tsx"
     ],
     "names": [],
-    "mappings": "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",
+    "mappings": "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",
     "sourcesContent": [
-        "import React from 'react';\nimport {Renderer, RendererProps} from '../factory';\nimport {filter} from '../utils/tpl';\nimport cx from 'classnames';\nimport {anyChanged, getPropValue} from '../utils/helper';\nimport {escapeHtml} from '../utils/tpl-builtin';\nimport {BaseSchema, SchemaTpl} from '../Schema';\nimport {BadgeSchema, withBadge} from '../components/Badge';\nimport {buildStyle} from '../utils/style';\n\n/**\n * tpl 渲染器\n */\nexport interface TplSchema extends BaseSchema {\n  /**\n   * 指定为模板渲染器。\n   *\n   * 文档：https://baidu.gitee.io/amis/docs/concepts/template\n   */\n  type: 'tpl' | 'html';\n\n  tpl?: SchemaTpl;\n  html?: SchemaTpl;\n  text?: SchemaTpl;\n  raw?: string;\n\n  /**\n   * 是否内联显示？\n   */\n  inline?: boolean;\n\n  /**\n   * 自定义样式\n   */\n  style?: {\n    [propName: string]: any;\n  };\n\n  /**\n   * 角标\n   */\n  badge?: BadgeSchema;\n}\n\nexport interface TplProps extends RendererProps, TplSchema {\n  className?: string;\n  value?: string;\n  wrapperComponent?: any;\n  inline?: boolean;\n}\n\nexport class Tpl extends React.Component<TplProps, object> {\n  static defaultProps: Partial<TplProps> = {\n    inline: true,\n    placeholder: ''\n  };\n\n  dom: any;\n\n  constructor(props: TplProps) {\n    super(props);\n    this.htmlRef = this.htmlRef.bind(this);\n  }\n\n  componentDidUpdate(prevProps: TplProps) {\n    if (\n      anyChanged(\n        ['data', 'tpl', 'html', 'text', 'raw', 'value'],\n        this.props,\n        prevProps\n      )\n    ) {\n      this._render();\n    }\n  }\n\n  htmlRef(dom: any) {\n    this.dom = dom;\n    this._render();\n  }\n\n  getContent() {\n    const {tpl, html, text, raw, data, placeholder} = this.props;\n    const value = getPropValue(this.props);\n\n    if (raw) {\n      return raw;\n    } else if (html) {\n      return filter(html, data);\n    } else if (tpl) {\n      return filter(tpl, data);\n    } else if (text) {\n      return escapeHtml(filter(text, data));\n    } else {\n      return value == null || value === ''\n        ? `<span class=\"text-muted\">${placeholder}</span>`\n        : typeof value === 'string'\n        ? value\n        : JSON.stringify(value);\n    }\n  }\n\n  _render() {\n    if (!this.dom) {\n      return;\n    }\n\n    this.dom.firstChild.innerHTML = this.props.env.filterHtml(\n      this.getContent()\n    );\n  }\n\n  render() {\n    const {\n      className,\n      wrapperComponent,\n      inline,\n      classnames: cx,\n      style,\n      data\n    } = this.props;\n    const Component = wrapperComponent || (inline ? 'span' : 'div');\n\n    return (\n      <Component\n        ref={this.htmlRef}\n        className={cx('TplField', className)}\n        style={buildStyle(style, data)}\n      >\n        <span>{this.getContent()}</span>\n      </Component>\n    );\n  }\n}\n\n@Renderer({\n  test: /(^|\\/)(?:tpl|html)$/,\n  name: 'tpl'\n})\n// @ts-ignore 类型没搞定\n@withBadge\nexport class TplRenderer extends Tpl {}\n"
+        "import React from 'react';\nimport {Renderer, RendererProps} from '../factory';\nimport {filter} from '../utils/tpl';\nimport cx from 'classnames';\nimport {anyChanged, getPropValue} from '../utils/helper';\nimport {escapeHtml} from '../utils/tpl-builtin';\nimport {BaseSchema, SchemaTpl} from '../Schema';\nimport {BadgeSchema, withBadge} from '../components/Badge';\nimport {buildStyle} from '../utils/style';\n\n/**\n * tpl 渲染器\n */\nexport interface TplSchema extends BaseSchema {\n  /**\n   * 指定为模板渲染器。\n   *\n   * 文档：https://baidu.gitee.io/amis/docs/concepts/template\n   */\n  type: 'tpl' | 'html';\n\n  tpl?: SchemaTpl;\n  html?: SchemaTpl;\n  text?: SchemaTpl;\n  raw?: string;\n\n  /**\n   * 是否内联显示？\n   */\n  inline?: boolean;\n\n  /**\n   * 自定义样式\n   */\n  style?: {\n    [propName: string]: any;\n  };\n\n  /**\n   * 角标\n   */\n  badge?: BadgeSchema;\n\n  /**\n   * 是否设置外层DOM节点的title属性为文本内容\n   */\n  showNativeTitle?: boolean;\n}\n\nexport interface TplProps extends RendererProps, TplSchema {\n  className?: string;\n  value?: string;\n  wrapperComponent?: any;\n  inline?: boolean;\n}\n\nexport class Tpl extends React.Component<TplProps, object> {\n  static defaultProps: Partial<TplProps> = {\n    inline: true,\n    placeholder: ''\n  };\n\n  dom: any;\n\n  constructor(props: TplProps) {\n    super(props);\n    this.htmlRef = this.htmlRef.bind(this);\n  }\n\n  componentDidUpdate(prevProps: TplProps) {\n    if (\n      anyChanged(\n        ['data', 'tpl', 'html', 'text', 'raw', 'value'],\n        this.props,\n        prevProps\n      )\n    ) {\n      this._render();\n    }\n  }\n\n  htmlRef(dom: any) {\n    this.dom = dom;\n    this._render();\n  }\n\n  getContent() {\n    const {tpl, html, text, raw, data, placeholder} = this.props;\n    const value = getPropValue(this.props);\n\n    if (raw) {\n      return raw;\n    } else if (html) {\n      return filter(html, data);\n    } else if (tpl) {\n      return filter(tpl, data);\n    } else if (text) {\n      return escapeHtml(filter(text, data));\n    } else {\n      return value == null || value === ''\n        ? `<span class=\"text-muted\">${placeholder}</span>`\n        : typeof value === 'string'\n        ? value\n        : JSON.stringify(value);\n    }\n  }\n\n  _render() {\n    if (!this.dom) {\n      return;\n    }\n\n    this.dom.firstChild.innerHTML = this.props.env.filterHtml(\n      this.getContent()\n    );\n  }\n\n  render() {\n    const {\n      className,\n      wrapperComponent,\n      inline,\n      classnames: cx,\n      style,\n      showNativeTitle,\n      data\n    } = this.props;\n    const Component = wrapperComponent || (inline ? 'span' : 'div');\n    const content = this.getContent();\n\n    return (\n      <Component\n        ref={this.htmlRef}\n        className={cx('TplField', className)}\n        style={buildStyle(style, data)}\n        {...(showNativeTitle\n          ? {title: typeof content === 'string' ? content : ''}\n          : {})}\n      >\n        <span>{content}</span>\n      </Component>\n    );\n  }\n}\n\n@Renderer({\n  test: /(^|\\/)(?:tpl|html)$/,\n  name: 'tpl'\n})\n// @ts-ignore 类型没搞定\n@withBadge\nexport class TplRenderer extends Tpl {}\n"
     ]
 }

package/lib/themes/ang-ie11.css

@@ -25927,6 +25927,15 @@ input.a-TextControl-input-password {
 .a-Select-option.is-highlight > a {
   display: block;
 }
+.a-Select-option .a-Select-option-content,
+.a-Select-option .a-Select-option-content > span > div {
+  flex: auto;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  display: inline-block;
+  max-width: 100%;
+}
 .a-Select-noResult {
   color: #99a6ad;
   line-height: 1.4285714286;
@@ -31780,10 +31789,13 @@ td.rdtQuarter.rdtDisabled:hover {
       ) / 2
   ) 0.5rem;
   border-radius: 0.142rem;
+  background-color: #fff;
+  height: 1.875rem;
 }
 .a-FormulaPicker.is-input-group .a-FormulaPicker-input {
   display: inline-block;
   width: 100%;
+  height: 100%;
   background: none;
   padding: 0;
   border: 0;
@@ -31795,7 +31807,7 @@ td.rdtQuarter.rdtDisabled:hover {
   box-sizing: none;
 }
 .a-FormulaPicker.is-input-group .a-FormulaPicker-toggler .icon-function {
-  transform: scale(1.6);
+  transform: scale(1.8);
 }
 .a-FormulaPicker.is-input-group .a-FormulaPicker-toggler .icon-ellipsis-v {
   transform: rotate(90deg);

package/lib/themes/ang.css

@@ -27268,6 +27268,15 @@ input.a-TextControl-input-password {
 .a-Select-option.is-highlight > a {
   display: block;
 }
+.a-Select-option .a-Select-option-content,
+.a-Select-option .a-Select-option-content > span > div {
+  flex: auto;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  display: inline-block;
+  max-width: 100%;
+}
 .a-Select-noResult {
   color: var(--Form-select-placeholderColor);
   line-height: var(--Form-input-lineHeight);
@@ -32956,10 +32965,13 @@ td.rdtQuarter.rdtDisabled:hover {
   border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
   padding: var(--Form-input-paddingY) var(--Form-input-paddingX);
   border-radius: var(--borderRadius);
+  background-color: #fff;
+  height: var(--Form-input-height);
 }
 .a-FormulaPicker.is-input-group .a-FormulaPicker-input {
   display: inline-block;
   width: 100%;
+  height: 100%;
   background: none;
   padding: 0;
   border: 0;
@@ -32971,7 +32983,7 @@ td.rdtQuarter.rdtDisabled:hover {
   box-sizing: none;
 }
 .a-FormulaPicker.is-input-group .a-FormulaPicker-toggler .icon-function {
-  transform: scale(1.6);
+  transform: scale(1.8);
 }
 .a-FormulaPicker.is-input-group .a-FormulaPicker-toggler .icon-ellipsis-v {
   transform: rotate(90deg);