调整

app/components/Func/action-panel/index.json

@@ -1,8 +1,8 @@
 {
   "component": true,
   "usingComponents": {
-      "g-btn": "../../UI/g-btn/index",
-      "g-icon": "../../UI/g-icon/index",
-      "g-drawer": "../../UI/g-drawer/index"
+      "g-btn": "../../UI/btn/index",
+      "g-icon": "../../UI/icon/index",
+      "g-drawer": "../../UI/drawer/index"
   }
 }

app/components/extraFile/gallery/index.json

@@ -1,8 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-      "g-btn": "../../UI/g-btn/index",
-      "g-icon": "../../UI/g-icon/index"
+      "l-icon": "../../../lin-ui/icon/index"
   },
   "componentGenerics": {
     "item": true

app/components/extraFile/gallery/index.wxml

@@ -4,7 +4,7 @@
             <view class="file-list__item  file-list__item--{{size}} l-item-class" style="{{itemSizePercentage?'width:'+itemSizePercentage+'padding-bottom:'+itemSizePercentage:'xxx'}}">
                 <item data-index="{{index}}" bind:tap="onItemTapped" mode="{{mode}}" oakValue="{{item}}" oakPath="{{index}}" oakParent="{{oakFullpath}}" />
                 <view wx:if="{{!disableDelete}}" mut-bind:tap="onDelete" class="file-list__remove" data-value="{{item}}" data-index="{{ index }}">
-                    <g-icon name="clear" color="#ffffff" size="24" />
+                    <l-icon name="close" color="#ffffff" size="18" />
                 </view>
             </view>
         </block>
@@ -14,7 +14,7 @@
             <slot />
         </view>
         <view class="file-list__image--add">
-            <g-icon name="add" size="80" />
+            <l-icon name="add" size="80" />
         </view>
     </view>
 </view>

app/pages/examples/btn/index.json

@@ -1,6 +1,6 @@
 {
     "navigationBarTitleText": "g-button",
     "usingComponents": {
-        "g-btn": "../../../components/UI/g-btn/index"
+        "g-btn": "../../../components/UI/btn/index"
     }
 }

app/pages/examples/input/index.json

@@ -1,7 +1,7 @@
 {
   "navigationBarTitleText": "Input 输入框",
   "usingComponents": {
-    "g-input": "../../../components/UI/g-input/index",
-    "g-pannel": "../../../components/UI/g-panel/index"
+    "g-input": "../../../components/UI/input/index",
+    "g-panel": "../../../components/UI/panel/index"
   }
 }

app/pages/examples/input/index.wxml

@@ -1,15 +1,15 @@
 <view class="container">
-    <g-pannel title="基础用法">
+    <g-panel title="基础用法">
         <g-input value="{{ value1 }}" title="收货人" autofocus placeholder="名字" bind:change="changeValue" />
         <g-input value="{{ value2 }}" type="number" title="联系电话" placeholder="请输入手机号" />
         <g-input value="{{ value3 }}" type="textarea" title="详细地址" placeholder="请输入详细地址(最多50字)" maxlength="50" />
         <g-input value="{{ value4 }}" title="用户信息" disabled />
-    </g-pannel>
-    <g-pannel title="无标题">
+    </g-panel>
+    <g-panel title="无标题">
         <g-input value="{{ value5 }}" placeholder="请输入收货人姓名" />
-    </g-pannel>
-    <g-pannel title="圆角">
+    </g-panel>
+    <g-panel title="圆角">
         <g-input value="{{ value6 }}" type="number" right title="消费总额" mode="wrapped" placeholder="询问收银员后输入" />
         <g-input value="{{ value7 }}" type="number" right error title="不参与优惠金额" mode="wrapped" placeholder="询问收银员后输入" />
-    </g-pannel>
+    </g-panel>
 </view>

app/pages/wechatQrCode/scan/index.json

@@ -1,6 +1,6 @@
 {
     "navigationBarTitleText": "扫码结果",
     "usingComponents": {
-        "g-icon": "../../../components/UI/g-icon/index"
+        "l-icon": "../../../lin-ui/icon/index"
     }
 }

app/pages/wechatQrCode/scan/index.wxml

@@ -2,25 +2,25 @@
 <view class="page-body">
     <block wx:if="{{oakLoading}}">
         <view class="circle-view">
-            <g-icon name="near_me" size="80" />
+            <l-icon name="loading" size="80" />
             <text class="text">加载中</text>
         </view>
     </block>
     <block wx:elif="{{!isExist}}">
         <view class="circle-view">
-            <g-icon name="near_me" size="80" />
+            <g-icon name="warning" size="80" />
             <text class="text">二维码非法</text>
         </view>
     </block>
     <block wx:elif="{{expired}}">
         <view class="circle-view">
-            <g-icon name="timer_off" size="80" />
+            <g-icon name="error" size="80" />
             <text class="text">二维码已过期</text>
         </view>
     </block>
     <block wx:else>
         <view class="circle-view">
-            <g-icon name="near_me" size="80" />
+            <g-icon name="loading" size="80" />
             <text class="text">跳转中</text>
         </view>
     </block>

lib/aspects/aspectDict.d.ts

@@ -1,11 +1,13 @@
+import { WebEnv, WechatMpEnv } from "general-app-domain/Token/Schema";
 import { EntityDict } from "general-app-domain";
-import { WechatMpEnv } from "general-app-domain/Token/Schema";
 import { QiniuUploadInfo } from "oak-frontend-base/src/types/Upload";
-import { GeneralRuntimeContext } from "..";
+import { GeneralRuntimeContext } from "../RuntimeContext";
 declare type GeneralAspectDict<ED extends EntityDict, Cxt extends GeneralRuntimeContext<ED>> = {
-    loginByPassword: (params: {
-        password: string;
+    loginByMobile: (params: {
+        captcha?: string;
+        password?: string;
         mobile: string;
+        env: WebEnv | WechatMpEnv;
     }, context: Cxt) => Promise<string>;
     loginMp: (params: {
         code: string;
@@ -25,6 +27,10 @@ declare type GeneralAspectDict<ED extends EntityDict, Cxt extends GeneralRuntime
         origin: string;
         fileName: string;
     }, context: Cxt) => Promise<QiniuUploadInfo>;
+    sendCaptcha: (params: {
+        mobile: string;
+        env: WechatMpEnv | WebEnv;
+    }) => Promise<string>;
 };
 export declare type AspectDict<ED extends EntityDict, Cxt extends GeneralRuntimeContext<ED>> = GeneralAspectDict<ED, Cxt>;
 export {};

lib/triggers/userEntityGrant.js

@@ -61,7 +61,7 @@ const triggers = [
                         entityId: id,
                         applicationId,
                         props: {
-                            pathname: 'pages/userEntityGrant/confirm/index',
+                            pathname: '/userEntityGrant/confirm',
                             props: {
                                 oakId: id,
                             },

lib/types/Exceptions.d.ts

@@ -22,4 +22,4 @@ export declare function makeException(data: {
     name: string;
     message?: string;
     [A: string]: any;
-}): import("oak-domain/lib/types").OakException | undefined;
+}): import("oak-domain/lib/types").OakException | import("oak-domain/lib/types").OakExternalException | undefined;

src/aspects/AspectDict.ts

@@ -2,7 +2,7 @@ import { WebEnv, WechatMpEnv } from "general-app-domain/Token/Schema";
 import { EntityDict } from "general-app-domain";
 import { QiniuUploadInfo } from "oak-frontend-base/src/types/Upload";
 // import { AspectDict as CommonAspectDict } from 'oak-common-aspect/src/aspectDict';
-import { GeneralRuntimeContext } from "..";
+import { GeneralRuntimeContext } from "../RuntimeContext";
 
 type GeneralAspectDict<ED extends EntityDict, Cxt extends GeneralRuntimeContext<ED>> = {
     loginByMobile: (params: { captcha?: string, password?: string, mobile: string, env: WebEnv | WechatMpEnv }, context: Cxt) => Promise<string>,