Oak-Team
/
oak-frontend-base
13
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 37 Wiki Activity

Merge branch 'dev' into release

This commit is contained in:
Xu Chang 2024-05-13 13:19:33 +08:00
parent a7464e7d3e c38fbfa008
commit 924303a673
10 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
es/features/cache.js
View File

@ -102,9 +102,9 @@ export class Cache extends Feature {
// 如果是数据不一致错误，这里可以让用户知道
this.refreshing--;
if (e instanceof OakException) {
const { opRecord } = e;
if (opRecord) {
this.syncInner([opRecord]);
const { opRecords } = e;
if (opRecords) {
this.syncInner(opRecords);
this.publish();
}
}

2
es/miniprogram_npm/lin-ui/button/index.less
View File

@ -157,6 +157,8 @@
// Disabled
&-disabled {
opacity: 0.8;
background-color: @disabled-color;
color: rgba(0, 0, 0, 0.25);
}
}

2
es/miniprogram_npm/lin-ui/button/index.wxml
View File

@ -10,7 +10,7 @@
hover-stop-propagation="{{hoverStopPropagation}}"
hover-start-time="{{hoverStartTime}}"
hover-stay-time="{{hoverStayTime}}"
style="{{width?'min-width:'+width+'rpx;':''}} {{height?'height:'+height+'rpx;'+'line-height:'+height+'rpx;':''}} {{size=='long'?'border-radius:0;':''}} {{'background-color:'+bgColor}}">
style="{{width?'min-width:'+width+'rpx;':''}} {{height?'height:'+height+'rpx;'+'line-height:'+height+'rpx;':''}} {{size=='long'?'border-radius:0;':''}} {{bgColor ? 'background-color:'+bgColor : ''}}">
<view wx:if="{{loading}}" class="l-btn-loading {{'margin-' + size}} {{ plain ?'l-btn-loading-' + type : '' }}"></view>
<l-icon l-class="l-icon-class" class="{{'margin-' + size}}" wx:if="{{icon}}" name="{{icon}}" color="{{iconColor}}" size="{{iconSize}}" />
<slot/>

2
es/miniprogram_npm/lin-ui/styles/_base.less
View File

@ -6,7 +6,7 @@
@success-color : @oak-color-success;
@warning-color : @oak-color-warning;
@error-color : @oak-color-error;
@disabled-color : fade(@oak-color-info, 80%);
@disabled-color : rgba(0, 0, 0, 0.04);
@selected-color : fade(@default-color, 90%);
@tooltip-color : #fff;
@subsidiary-color : fade(@oak-color-primary, 60%);

6
lib/features/cache.js
View File

@ -105,9 +105,9 @@ class Cache extends Feature_1.Feature {
// 如果是数据不一致错误，这里可以让用户知道
this.refreshing--;
if (e instanceof Exception_1.OakException) {
const { opRecord } = e;
if (opRecord) {
this.syncInner([opRecord]);
const { opRecords } = e;
if (opRecords) {
this.syncInner(opRecords);
this.publish();
}
}

8
package.json
View File

@ -1,6 +1,6 @@
{
"name": "oak-frontend-base",
"version": "5.0.4",
"version": "5.0.5",
"description": "oak框架中前端与业务逻辑无关的平台部分",
"author": {
"name": "XuChang"
@ -21,9 +21,9 @@
"history": "^5.3.0",
"i18n-js": "^4.3.0",
"node-schedule": "^2.1.1",
"oak-common-aspect": "^3.0.0",
"oak-domain": "5.0.3",
"oak-memory-tree-store": "^3.3.0",
"oak-common-aspect": "~3.0.0",
"oak-domain": "~5.0.5",
"oak-memory-tree-store": "~3.3.0",
"ol": "^7.3.0",
"react-native-device-info": "^10.12.0",
"react-native-localize": "^3.0.4",

6
src/features/cache.ts
View File

@ -167,9 +167,9 @@ export class Cache<ED extends EntityDict & BaseEntityDict> extends Feature {
// 如果是数据不一致错误，这里可以让用户知道
this.refreshing--;
if (e instanceof OakException) {
const { opRecord } = e;
if (opRecord) {
this.syncInner([opRecord]);
const { opRecords } = e;
if (opRecords) {
this.syncInner(opRecords as OpRecord<ED>[]);
this.publish();
}
}

2
src/miniprogram_npm/lin-ui/button/index.less
View File

@ -157,6 +157,8 @@
// Disabled
&-disabled {
opacity: 0.8;
background-color: @disabled-color;
color: rgba(0, 0, 0, 0.25);
}
}

2
src/miniprogram_npm/lin-ui/button/index.wxml
View File

@ -10,7 +10,7 @@
hover-stop-propagation="{{hoverStopPropagation}}"
hover-start-time="{{hoverStartTime}}"
hover-stay-time="{{hoverStayTime}}"
style="{{width?'min-width:'+width+'rpx;':''}} {{height?'height:'+height+'rpx;'+'line-height:'+height+'rpx;':''}} {{size=='long'?'border-radius:0;':''}} {{'background-color:'+bgColor}}">
style="{{width?'min-width:'+width+'rpx;':''}} {{height?'height:'+height+'rpx;'+'line-height:'+height+'rpx;':''}} {{size=='long'?'border-radius:0;':''}} {{bgColor ? 'background-color:'+bgColor : ''}}">
<view wx:if="{{loading}}" class="l-btn-loading {{'margin-' + size}} {{ plain ?'l-btn-loading-' + type : '' }}"></view>
<l-icon l-class="l-icon-class" class="{{'margin-' + size}}" wx:if="{{icon}}" name="{{icon}}" color="{{iconColor}}" size="{{iconSize}}" />
<slot/>

2
src/miniprogram_npm/lin-ui/styles/_base.less
View File

@ -6,7 +6,7 @@
@success-color : @oak-color-success;
@warning-color : @oak-color-warning;
@error-color : @oak-color-error;
@disabled-color : fade(@oak-color-info, 80%);
@disabled-color : rgba(0, 0, 0, 0.04);
@selected-color : fade(@default-color, 90%);
@tooltip-color : #fff;
@subsidiary-color : fade(@oak-color-primary, 60%);