From 809c6769f6c7a1a3c584a3026079d332c437f179 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 16 Mar 2023 12:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Module/TimeRange.php                          | 4 ++--
 resources/assets/js/components/MDEditor/index.vue | 4 ++--
 resources/assets/js/store/utils.js                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Module/TimeRange.php b/app/Module/TimeRange.php
index df178bd46..7bff37fa7 100644
--- a/app/Module/TimeRange.php
+++ b/app/Module/TimeRange.php
@@ -15,7 +15,7 @@ class TimeRange
     public function __construct($data)
     {
         if (is_array($data)) {
-            $range = explode("," , $data['timerange']);
+            $range = explode("-", str_replace([",", "|"], "-", $data['timerange']));
             if ($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'];
             }
         } else {
-            $range = explode("," , $data);
+            $range = explode("-", str_replace([",", "|"], "-", $data));
         }
         //
         $updated = Base::isNumber($range[0]) ? intval($range[0]) : trim($range[0]);
diff --git a/resources/assets/js/components/MDEditor/index.vue b/resources/assets/js/components/MDEditor/index.vue
index 4474beaf8..8478537ad 100755
--- a/resources/assets/js/components/MDEditor/index.vue
+++ b/resources/assets/js/components/MDEditor/index.vue
@@ -56,8 +56,8 @@
                 <div>{{$L('正在上传文件...')}}</div>
             </Spin>
         </Modal>
-        <Modal v-model="html2md" title="html转markdown" okText="转换成markdown" width="680" class-name="simple-modal" @on-ok="htmlOk" transfer>
-            <Input type="textarea" v-model="htmlValue" :rows="14" placeholder="请输入html代码..." />
+        <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="$L('请输入html代码...')" />
         </Modal>
     </div>
 </template>
diff --git a/resources/assets/js/store/utils.js b/resources/assets/js/store/utils.js
index 83021fc61..d83f59851 100644
--- a/resources/assets/js/store/utils.js
+++ b/resources/assets/js/store/utils.js
@@ -27,7 +27,7 @@ function __callData(key, requestData, state) {
      * @returns {*}
      */
     this.get = () => {
-        requestData.timerange = requestData.timerange || `${callData.updated},${callData.deleted}`
+        requestData.timerange = requestData.timerange || `${callData.updated}-${callData.deleted}`
         return requestData
     }