jsbox-cview 1.2.8 → 1.3.1

package/components/dynamic-rowheight-list.ts

@@ -5,10 +5,11 @@
  * 
  * 核心策略为 list 的所有行均为 cview，且每一个 cview 需要实现一个方法：heightToWidth(width: number) => number  
  * 通过这个方法汇报自己在某个宽度的时候所需要的高度，这必须任何时候均立即可用；
- * 如果这个方法不可用，那么行高设为 44
  * 
  * 特别参数
  * sections: {title: string, rows: cview[]}[]
+ * rows: cview[]
+ * 两者不能同时存在，否则rows不起作用
  * 
  * 除了 props.data, props.template 和 events.rowHeight 不可用，其他均和 list 一致
  */
@@ -22,21 +23,27 @@ interface DynamicRowHeightListCView extends Base<any, any> {
 }
 
 export class DynamicRowHeightList extends Base<UIListView, UiTypes.ListOptions>{
-  _sections: {title: string, rows: DynamicRowHeightListCView[]}[];
   _defineView: () => UiTypes.ListOptions;
-  constructor({ sections, props, layout, events }: {
-    sections: {title: string, rows: DynamicRowHeightListCView[]}[];
+  constructor({ sections, rows, props, layout, events }: {
+    sections?: {title: string, rows: DynamicRowHeightListCView[]}[];
+    rows?: DynamicRowHeightListCView[];
     props: DynamicRowHeightListProps;
     layout: (make: MASConstraintMaker, view: UIListView) => void;
     events: DynamicRowHeightListEvents;
   }) {
     super();
-    this._sections = sections;
     this._defineView = () => {
-      const data = this._sections.map(n => ({
-        title: n.title,
-        rows: n.rows.map(r => r.definition)
-      }));
+      let data: any;
+      if (sections && sections.length > 0) {
+        data = sections.map(n => ({
+          title: n.title,
+          rows: n.rows.map(r => r.definition)
+        }));
+      } else if (rows && rows.length > 0) {
+        data = rows.map(r => r.definition);
+      } else {
+        throw new Error("sections or rows must be provided");
+      }
       return {
         type: "list",
         props: {
@@ -46,13 +53,14 @@ export class DynamicRowHeightList extends Base<UIListView, UiTypes.ListOptions>{
         layout,
         events: {
           rowHeight: (sender, indexPath) => {
-            const cview = this._sections[indexPath.section].rows[indexPath.row];
-            if (
-              cview.heightToWidth &&
-              typeof cview.heightToWidth === "function"
-            )
+            if (sections) {
+              const cview = sections[indexPath.section].rows[indexPath.row];
               return cview.heightToWidth(sender.frame.width);
-            else return 44;
+            } else if (rows) {
+              return rows[indexPath.row].heightToWidth(sender.frame.width);
+            } else {
+              throw new Error("sections or rows must be provided");
+            }
           },
           ...events
         }

package/components/symbol-button.ts

@@ -57,7 +57,8 @@ export class SymbolButton extends Base<UIButtonView, UiTypes.ButtonOptions> {
         props: {
           radius: 0,
           bgcolor: $color("clear"),
-          id: this.id
+          id: this.id,
+          menu: this._props.menu,
         },
         views: [
           {

package/dist/components/dynamic-rowheight-list.js

@@ -6,10 +6,11 @@
  *
  * 核心策略为 list 的所有行均为 cview，且每一个 cview 需要实现一个方法：heightToWidth(width: number) => number
  * 通过这个方法汇报自己在某个宽度的时候所需要的高度，这必须任何时候均立即可用；
- * 如果这个方法不可用，那么行高设为 44
  *
  * 特别参数
  * sections: {title: string, rows: cview[]}[]
+ * rows: cview[]
+ * 两者不能同时存在，否则rows不起作用
  *
  * 除了 props.data, props.template 和 events.rowHeight 不可用，其他均和 list 一致
  */
@@ -17,25 +18,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicRowHeightList = void 0;
 const base_1 = require("./base");
 class DynamicRowHeightList extends base_1.Base {
-    constructor({ sections, props, layout, events }) {
+    constructor({ sections, rows, props, layout, events }) {
         super();
-        this._sections = sections;
         this._defineView = () => {
-            const data = this._sections.map(n => ({
-                title: n.title,
-                rows: n.rows.map(r => r.definition)
-            }));
+            let data;
+            if (sections && sections.length > 0) {
+                data = sections.map(n => ({
+                    title: n.title,
+                    rows: n.rows.map(r => r.definition)
+                }));
+            }
+            else if (rows && rows.length > 0) {
+                data = rows.map(r => r.definition);
+            }
+            else {
+                throw new Error("sections or rows must be provided");
+            }
             return {
                 type: "list",
                 props: Object.assign({ data }, props),
                 layout,
                 events: Object.assign({ rowHeight: (sender, indexPath) => {
-                        const cview = this._sections[indexPath.section].rows[indexPath.row];
-                        if (cview.heightToWidth &&
-                            typeof cview.heightToWidth === "function")
+                        if (sections) {
+                            const cview = sections[indexPath.section].rows[indexPath.row];
                             return cview.heightToWidth(sender.frame.width);
-                        else
-                            return 44;
+                        }
+                        else if (rows) {
+                            return rows[indexPath.row].heightToWidth(sender.frame.width);
+                        }
+                        else {
+                            throw new Error("sections or rows must be provided");
+                        }
                     } }, events)
             };
         };

package/dist/components/symbol-button.js

@@ -37,7 +37,8 @@ class SymbolButton extends base_1.Base {
                 props: {
                     radius: 0,
                     bgcolor: $color("clear"),
-                    id: this.id
+                    id: this.id,
+                    menu: this._props.menu,
                 },
                 views: [
                     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsbox-cview",
-  "version": "1.2.8",
+  "version": "1.3.1",
   "description": "为 JSBox 设计的微型框架",
   "repository": {
     "type": "git",