@zscreate/zhxy-app-component 1.0.329 → 1.0.331
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1255,13 +1255,13 @@ export default {
|
|
|
1255
1255
|
const comps = this.getAllComponent()
|
|
1256
1256
|
let target = comps.find(item => item.model == options.conditionValue)
|
|
1257
1257
|
if (options.condition.includes('小于')) {
|
|
1258
|
-
if (options.condition.includes('等于') ? moment(value).unix() <= moment(time).unix(): moment(value).unix()
|
|
1258
|
+
if (options.condition.includes('等于') ? moment(value).unix() <= moment(time).unix(): moment(value).unix() <= moment(time).unix()) {
|
|
1259
1259
|
callback()
|
|
1260
1260
|
} else {
|
|
1261
1261
|
callback(`${this.widget.name}必须${options.condition}${target.name}`);
|
|
1262
1262
|
}
|
|
1263
1263
|
} else if(options.condition.includes('大于')) {
|
|
1264
|
-
if (options.condition.includes('等于') ? moment(value).unix() >= moment(time).unix(): moment(value).unix()
|
|
1264
|
+
if (options.condition.includes('等于') ? moment(value).unix() >= moment(time).unix(): moment(value).unix() >= moment(time).unix()) {
|
|
1265
1265
|
callback()
|
|
1266
1266
|
} else {
|
|
1267
1267
|
callback(`${this.widget.name}必须${options.condition}${target.name}`);
|
|
@@ -38,10 +38,12 @@
|
|
|
38
38
|
</view>
|
|
39
39
|
</view>
|
|
40
40
|
</view>
|
|
41
|
+
<!-- #ifdef H5 -->
|
|
41
42
|
<page-pagination v-if="tablePageInfo[item.model]&&tablePageInfo[item.model].total" :total="tablePageInfo[item.model]&&tablePageInfo[item.model].total"
|
|
42
43
|
:currentPage="tablePageInfo[item.model]&&tablePageInfo[item.model].current"
|
|
43
44
|
@change="(...args) => tablePageChange(item,...args)"
|
|
44
45
|
:numAround="true" :showBorder="false"></page-pagination>
|
|
46
|
+
<!-- #endif -->
|
|
45
47
|
</template>
|
|
46
48
|
<template v-else>
|
|
47
49
|
<view class="table-item" v-for="(table, tableCIndex) in tableData[item.model]"
|