amis 2.0.0 → 2.0.1

package/lib/renderers/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Card.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
-import { SchemaNode, ActionObject, PlainObject } from 'amis-core';
+import { SchemaNode, Schema, ActionObject, PlainObject } from 'amis-core';
 import { SchemaQuickEdit } from './QuickEdit';
 import { SchemaPopOver } from './PopOver';
 import { TableCell } from './Table';
@@ -158,6 +158,10 @@ export interface CardSchema extends BaseSchema {
      * 次要说明
      */
     secondary?: SchemaTpl;
+    /**
+     * 卡片内容区的表单项label是否使用Card内部的样式，默认为true
+     */
+    useCardLabel?: boolean;
 }
 export interface CardProps extends RendererProps, Omit<CardSchema, 'className'> {
     onCheck: (item: IItem) => void;
@@ -195,6 +199,7 @@ export declare class CardRenderer extends React.Component<CardProps> {
         checkable: boolean;
         selected: boolean;
         hideCheckToggler: boolean;
+        useCardLabel: boolean;
     };
     static propsList: Array<string>;
     constructor(props: CardProps);
@@ -208,7 +213,7 @@ export declare class CardRenderer extends React.Component<CardProps> {
     renderActions(): JSX.Element[] | undefined;
     renderChild(node: SchemaNode, region?: string, key?: any): React.ReactNode;
     itemRender(field: any, index: number, props: any): JSX.Element | undefined;
-    renderFeild(region: string, field: any, key: any, props: any): JSX.Element | undefined;
+    renderFeild(region: string, field: Schema, key: any, props: any): JSX.Element | undefined;
     renderBody(): React.ReactNode;
     rederTitle(): JSX.Element | undefined;
     renderSubTitle(): JSX.Element | undefined;

package/lib/renderers/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 
@@ -9,13 +9,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
+var omit = require('lodash/omit');
+var merge = require('lodash/merge');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 var QuickEdit = require('./QuickEdit.js');
 var PopOver = require('./PopOver.js');
 require('./Table/index.js');
 var Copyable = require('./Copyable.js');
-var omit = require('lodash/omit');
 var ReactDOM = require('react-dom');
 var TableCell = require('./Table/TableCell.js');
 
@@ -23,6 +24,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
+var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
 
 var CardRenderer = /** @class */ (function (_super) {
     tslib.__extends(CardRenderer, _super);
@@ -138,15 +140,17 @@ var CardRenderer = /** @class */ (function (_super) {
         return this.renderFeild("column/".concat(index), field, index, props);
     };
     CardRenderer.prototype.renderFeild = function (region, field, key, props) {
-        var render = props.render, cx = props.classnames, itemIndex = props.itemIndex;
+        var render = props.render, cx = props.classnames, itemIndex = props.itemIndex, useCardLabel = props.useCardLabel;
         var data = this.props.data;
-        if (!amisCore.isVisible(field, data)) {
+        if (!field || !amisCore.isVisible(field, data)) {
             return;
         }
         var $$id = field.$$id ? "".concat(field.$$id, "-field") : '';
         return (React__default["default"].createElement("div", { className: cx('Card-field'), key: key },
-            field && field.label ? (React__default["default"].createElement("label", { className: cx('Card-fieldLabel', field.labelClassName) }, field.label)) : null,
-            render(region, tslib.__assign(tslib.__assign({}, field), { field: field, $$id: $$id, type: 'card-item-field' }), {
+            useCardLabel && field.label ? (React__default["default"].createElement("label", { className: cx('Card-fieldLabel', field.labelClassName) }, field.label)) : null,
+            render(region, merge__default["default"](tslib.__assign(tslib.__assign({}, field), { field: field, $$id: $$id, type: 'card-item-field' }), useCardLabel
+                ? { label: false, field: tslib.__assign(tslib.__assign({}, field), { label: false }) }
+                : {}), {
                 className: cx('Card-fieldValue', field.className),
                 rowIndex: itemIndex,
                 colIndex: key,
@@ -315,7 +319,8 @@ var CardRenderer = /** @class */ (function (_super) {
         selectable: false,
         checkable: true,
         selected: false,
-        hideCheckToggler: false
+        hideCheckToggler: false,
+        useCardLabel: true
     };
     CardRenderer.propsList = [
         'avatarClassName',

package/lib/renderers/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Carousel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Chart.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Code.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Collapse.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/CollapseGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Color.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Container.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Copyable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Custom.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Date.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */