github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 19:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

数据优化

Browse Source
This commit is contained in:
kuaifan 2023-03-16 12:18:14 +08:00
parent 20d70c980e
commit 809c6769f6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Module/TimeRange.php
View File

@ -15,7 +15,7 @@ class TimeRange
public function __construct($data) public function __construct($data)
{ {
if (is_array($data)) { if (is_array($data)) {
$range = explode("," , $data['timerange']); $range = explode("-", str_replace([",", "|"], "-", $data['timerange']));
if ($data['updated_at'] || $data['at_after']) { if ($data['updated_at'] || $data['at_after']) {
$range[0] = $data['updated_at'] ?: $data['at_after']; $range[0] = $data['updated_at'] ?: $data['at_after'];
} }
@ -23,7 +23,7 @@ class TimeRange
$range[1] = $data['deleted_at']; $range[1] = $data['deleted_at'];
} }
} else { } else {
$range = explode("," , $data); $range = explode("-", str_replace([",", "|"], "-", $data));
} }
// //
$updated = Base::isNumber($range[0]) ? intval($range[0]) : trim($range[0]); $updated = Base::isNumber($range[0]) ? intval($range[0]) : trim($range[0]);

4
resources/assets/js/components/MDEditor/index.vue
View File

@ -56,8 +56,8 @@
<div>{{$L('正在上传文件...')}}</div> <div>{{$L('正在上传文件...')}}</div>
</Spin> </Spin>
</Modal> </Modal>
<Modal v-model="html2md" title="html转markdown" okText="转换成markdown" width="680" class-name="simple-modal" @on-ok="htmlOk" transfer> <Modal v-model="html2md" :title="$L('html转markdown')" :okText="$L('转换成markdown')" width="680" class-name="simple-modal" @on-ok="htmlOk" transfer>
<Input type="textarea" v-model="htmlValue" :rows="14" placeholder="请输入html代码..." /> <Input type="textarea" v-model="htmlValue" :rows="14" :placeholder="$L('请输入html代码...')" />
</Modal> </Modal>
</div> </div>
</template> </template>

2
resources/assets/js/store/utils.js vendored
View File

@ -27,7 +27,7 @@ function __callData(key, requestData, state) {
* @returns {*} * @returns {*}
*/ */
this.get = () => { this.get = () => {
requestData.timerange = requestData.timerange || `${callData.updated},${callData.deleted}` requestData.timerange = requestData.timerange || `${callData.updated}-${callData.deleted}`
return requestData return requestData
} }