Merge 3b6b534211 into 820dc5bf4c

packages-user/client-modules/src/render/components/list.tsx

@@ -192,6 +192,8 @@ export const ListPage = defineComponent<
         emit('update:selected', key);
     };
 
+    const close = () => emit('close');
+
     return () => (
         <container loc={props.loc}>
             <List
@@ -211,6 +213,7 @@ export const ListPage = defineComponent<
                     text="关闭"
                     cursor="pointer"
                     font={props.font}
+                    onClick={close}
                 ></text>
             )}
         </container>

packages-user/client-modules/src/render/ui/statistics.tsx

@@ -5,7 +5,7 @@ import {
     UIComponentProps
 } from '@motajs/system-ui';
 import { defineComponent } from 'vue';
-import { waitbox, ListPage } from '../components';
+import { waitbox, ListPage, TextContent } from '../components';
 import { DefaultProps } from '@motajs/render-vue';
 import { ItemState } from '@user/data-state';
 
@@ -48,7 +48,7 @@ export const Statistics = defineComponent<StatisticsProps>(props => {
         <ListPage
             list={list}
             selected="total"
-            loc={[180, 0, 480, 480]}
+            loc={[180, 0, 630, 480]}
             close
             onClose={close}
             lineHeight={24}
@@ -75,7 +75,7 @@ const statisticsPanelProps = {
 const TotalStatistics = defineComponent<StatisticsPanelProps>(props => {
     return () => (
         <container>
-            <text text="测试"></text>
+            <TextContent text='' width={310}></TextContent>
         </container>
     );
 }, statisticsPanelProps);