npm - amis - Versions diffs - 3.1.0 → 3.1.1 - Mend

@@ -50,8 +50,7 @@ export declare class Tpl extends React.Component<TplProps, TplState> {
     componentDidUpdate(prevProps: Readonly<TplProps>): void;
     componentDidMount(): void;
     componentWillUnmount(): void;
-    updateContent(): void;
-    getContent(): string;
+    updateContent(): Promise<void>;
     getAsyncContent(): Promise<string>;
     /**
      * 过滤掉HTML标签, 仅提取文本内容, 用于HTML标签的title属性

package/lib/renderers/Tpl.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v3.1.0
+ * amis v3.1.1
  * Copyright 2018-2023 baidu
  */
@@ -21,7 +21,7 @@ var Tpl = /** @class */ (function (_super) {
     function Tpl(props) {
         var _this = _super.call(this, props) || this;
         _this.state = {
-            content: _this.getContent()
+            content: ''
         };
         _this.mounted = true;
         return _this;
@@ -41,50 +41,65 @@ var Tpl = /** @class */ (function (_super) {
         this.mounted = false;
     };
     Tpl.prototype.updateContent = function () {
-        var _this = this;
-        var _a = this.props, tpl = _a.tpl, html = _a.html, text = _a.text;
-        if (html || tpl || text) {
-            this.getAsyncContent().then(function (content) {
-                _this.mounted && _this.setState({ content: content });
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var content;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getAsyncContent()];
+                    case 1:
+                        content = _a.sent();
+                        this.mounted && this.setState({ content: content });
+                        return [2 /*return*/];
+                }
             });
-        }
-    };
-    Tpl.prototype.getContent = function () {
-        var _a = this.props, tpl = _a.tpl, html = _a.html, text = _a.text, raw = _a.raw, data = _a.data, placeholder = _a.placeholder;
-        var value = amisCore.getPropValue(this.props);
-        if (raw) {
-            return raw;
-        }
-        else if (html) {
-            return amisCore.filter(html, data);
-        }
-        else if (tpl) {
-            return amisCore.filter(tpl, data);
-        }
-        else if (text) {
-            return amisCore.escapeHtml(amisCore.filter(text, data));
-        }
-        else {
-            return value == null || value === ''
-                ? "<span class=\"text-muted\">".concat(placeholder, "</span>")
-                : typeof value === 'string'
-                    ? value
-                    : JSON.stringify(value);
-        }
+        });
     };
+    // @autobind
+    // getContent() {
+    //   const {tpl, html, text, raw, data, placeholder} = this.props;
+    //   const value = getPropValue(this.props);
+    //   if (raw) {
+    //     return raw;
+    //   } else if (html) {
+    //     return filter(html, data);
+    //   } else if (tpl) {
+    //     return filter(tpl, data);
+    //   } else if (text) {
+    //     return escapeHtml(filter(text, data));
+    //   } else {
+    //     return value == null || value === ''
+    //       ? `<span class="text-muted">${placeholder}</span>`
+    //       : typeof value === 'string'
+    //       ? value
+    //       : JSON.stringify(value);
+    //   }
+    // }
     Tpl.prototype.getAsyncContent = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, tpl, html, text, data, _b;
+            var _a, tpl, html, text, data, raw, placeholder, value, _b;
             return tslib.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _a = this.props, tpl = _a.tpl, html = _a.html, text = _a.text, data = _a.data;
-                        if (!(html || tpl)) return [3 /*break*/, 1];
-                        return [2 /*return*/, amisCore.asyncFilter(html || tpl, data)];
+                        _a = this.props, tpl = _a.tpl, html = _a.html, text = _a.text, data = _a.data, raw = _a.raw, placeholder = _a.placeholder;
+                        value = amisCore.getPropValue(this.props);
+                        if (!raw) return [3 /*break*/, 1];
+                        return [2 /*return*/, raw];
                     case 1:
+                        if (!html) return [3 /*break*/, 2];
+                        return [2 /*return*/, amisCore.asyncFilter(html, data)];
+                    case 2:
+                        if (!tpl) return [3 /*break*/, 3];
+                        return [2 /*return*/, amisCore.asyncFilter(tpl, data)];
+                    case 3:
+                        if (!text) return [3 /*break*/, 5];
                         _b = amisCore.escapeHtml;
                         return [4 /*yield*/, amisCore.asyncFilter(text, data)];
-                    case 2: return [2 /*return*/, _b.apply(void 0, [_c.sent()])];
+                    case 4: return [2 /*return*/, _b.apply(void 0, [_c.sent()])];
+                    case 5: return [2 /*return*/, value == null || value === ''
+                            ? "<span class=\"text-muted\">".concat(placeholder, "</span>")
+                            : typeof value === 'string'
+                                ? value
+                                : JSON.stringify(value)];
                 }
             });
         });
@@ -132,14 +147,8 @@ var Tpl = /** @class */ (function (_super) {
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", []),
-        tslib.__metadata("design:returntype", void 0)
+        tslib.__metadata("design:returntype", Promise)
     ], Tpl.prototype, "updateContent", null);
-    tslib.__decorate([
-        amisCore.autobind,
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", []),
-        tslib.__metadata("design:returntype", void 0)
-    ], Tpl.prototype, "getContent", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderers/VBox.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v3.1.0
+ * amis v3.1.1
  * Copyright 2018-2023 baidu
  */

package/lib/renderers/Video.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v3.1.0
+ * amis v3.1.1
  * Copyright 2018-2023 baidu
  */

package/lib/renderers/WebComponent.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v3.1.0
+ * amis v3.1.1
  * Copyright 2018-2023 baidu
  */

package/lib/renderers/Wizard.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v3.1.0
+ * amis v3.1.1
  * Copyright 2018-2023 baidu
  */

package/lib/renderers/Words.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v3.1.0
+ * amis v3.1.1
  * Copyright 2018-2023 baidu
  */

package/lib/renderers/Wrapper.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v3.1.0
+ * amis v3.1.1
  * Copyright 2018-2023 baidu
  */

package/lib/schemaExtend.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v3.1.0
+ * amis v3.1.1
  * Copyright 2018-2023 baidu
  */

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "amis",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "一种MIS页面生成工具",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -36,8 +36,8 @@
     }
   ],
   "dependencies": {
-    "amis-core": "^3.1.0",
-    "amis-ui": "^3.1.0",
+    "amis-core": "^3.1.1",
+    "amis-ui": "^3.1.1",
     "attr-accept": "2.2.2",
     "blueimp-canvastoblob": "2.1.0",
     "classnames": "2.3.1",
@@ -236,5 +236,5 @@
     "react": ">=16.8.6",
     "react-dom": ">=16.8.6"
   },
-  "gitHead": "020b12d0be43215664e0c0e53cd33486c43fde86"
+  "gitHead": "17e32ce204cfacf65f00db8ea0109295406d9282"
 }