From 5e049769a274d25af3b6ebb58c940e41724fdd39 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Tue, 10 Jan 2023 14:08:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=AE=B0=E5=BD=95&=E6=90=9C=E7=B4=A2=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E5=A2=9E=E5=8A=A0=E7=AB=96=E7=BA=BF=EF=BC=8C=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE2023.1.6=E6=97=A5UI=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                 | 14 +++++++-------
 package.json                      |  2 +-
 src/views/home/introduce.vue      | 31 ++++++++++++++++++++++++++++++-
 src/views/searchBar/searchBar.vue | 19 ++++++++++++++++++-
 4 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e9ee0bd..a078555 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "code-brick-wd",
       "version": "0.1.0",
       "dependencies": {
-        "code-brick-zj": "^0.0.6",
+        "code-brick-zj": "^0.0.7",
         "core-js": "^3.8.3",
         "element-ui": "^2.15.12",
         "vue": "^2.6.14",
@@ -4007,9 +4007,9 @@
       }
     },
     "node_modules/code-brick-zj": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.6.tgz",
-      "integrity": "sha512-8Wdr0J4v7zfmOLhG1fvDi5rPSkFB5r/onwi1GFdIZyiSwl5Xia61df11OdCFP8cPksL2hATiTTWs6WU/6s/cxA=="
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.7.tgz",
+      "integrity": "sha512-ZuhseY/9RUUUweAiTdumq5pJKAKAJxpvD8yjcVluY+cGDEKyoKzN9PjycPh2tUsE/gmwShfgrcIcm5DKcmzqvA=="
     },
     "node_modules/color-convert": {
       "version": "1.9.3",
@@ -14473,9 +14473,9 @@
       }
     },
     "code-brick-zj": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.6.tgz",
-      "integrity": "sha512-8Wdr0J4v7zfmOLhG1fvDi5rPSkFB5r/onwi1GFdIZyiSwl5Xia61df11OdCFP8cPksL2hATiTTWs6WU/6s/cxA=="
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/code-brick-zj/-/code-brick-zj-0.0.7.tgz",
+      "integrity": "sha512-ZuhseY/9RUUUweAiTdumq5pJKAKAJxpvD8yjcVluY+cGDEKyoKzN9PjycPh2tUsE/gmwShfgrcIcm5DKcmzqvA=="
     },
     "color-convert": {
       "version": "1.9.3",
diff --git a/package.json b/package.json
index db4cd2c..014de0d 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "code-brick-zj": "^0.0.6",
+    "code-brick-zj": "^0.0.7",
     "core-js": "^3.8.3",
     "element-ui": "^2.15.12",
     "vue": "^2.6.14",
diff --git a/src/views/home/introduce.vue b/src/views/home/introduce.vue
index 8f9b881..ff74511 100644
--- a/src/views/home/introduce.vue
+++ b/src/views/home/introduce.vue
@@ -3,7 +3,36 @@
     <p>
       组件包目前封装常用的四个组件:表格，搜索区域，分页，对话框。包npm地址为：https://www.npmjs.com/package/code-brick-zj。
     </p>
-    <p>文档当前使用的组件包的版本为：0.0.6</p>
+    <p>文档当前使用的组件包的版本为：0.0.7</p>
+    <div class="block">
+      <el-timeline>
+        <el-timeline-item timestamp="2023/1/10" placement="top">
+          <el-card>
+            <h4>修改</h4>
+            <h4>搜索区域UI样式更新,按2023.1.16的样式修改</h4>
+            <p>组件版本号为：0.0.7</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2023/1/9" placement="top">
+          <el-card>
+            <h4>修改</h4>
+            <h4>
+              1.table的序号列默认左侧固定，提供cancelPageFixed可以取消固定。
+            </h4>
+            <h4>2.提供方法doLayout，具体见文档基础表格下说明。</h4>
+            <p>组件版本号为：0.0.6</p>
+          </el-card>
+        </el-timeline-item>
+        <el-timeline-item timestamp="2023/1/6" placement="top">
+          <el-card>
+            <h4>修改</h4>
+            <h4>1.table改成默认有border的，需要无border的table另外传参数。</h4>
+            <h4>2.css修改，适配没有sass-loader的项目</h4>
+            <p>组件版本号为：0.0.5</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </div>
   </div>
 </template>
 <script>
diff --git a/src/views/searchBar/searchBar.vue b/src/views/searchBar/searchBar.vue
index 53b8ec0..66f1ba4 100644
--- a/src/views/searchBar/searchBar.vue
+++ b/src/views/searchBar/searchBar.vue
@@ -589,6 +589,9 @@
                         btnName: '重置',
                         name: 'reset'
                       },
+                      {
+                        type: 'separate'
+                      },
                       {
                         type: 'button',
                         btnName: '打印',
@@ -1318,6 +1321,16 @@ export default {
           endPlaceholder: '结束时间',
           defaultSelect: ['2022-08-11', '2022-08-12'],
           param: 'searchTime4'
+        },
+        {
+          type: 'datePicker',
+          label: '产品上片时间',
+          dateType: 'datetime',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          placeholder: '产品上片时间',
+          param: 'testTime',
+          width: 200
         }
       ],
       formConfig33: [
@@ -1443,6 +1456,9 @@ export default {
           btnName: '重置',
           name: 'reset'
         },
+        {
+          type: 'separate'
+        },
         {
           type: 'button',
           btnName: '打印',
@@ -1454,7 +1470,8 @@ export default {
           type: 'button',
           btnName: '成功',
           name: 'success',
-          color: 'success'
+          color: 'success',
+          plain: true
         },
         {
           type: 'button',