From d5dc6912e44eccd0f5f850cd91547a10dac9b3b9 Mon Sep 17 00:00:00 2001
From: pengYYY <pengyue970715@gmail.com>
Date: Fri, 17 Jun 2022 16:16:33 +0800
Subject: [PATCH 1/2] feat: upgrade 0.16.0

---
 package.json                                         | 2 +-
 src/pages/dashboard/base/components/middle-chart.vue | 3 +--
 src/pages/dashboard/base/components/overview.vue     | 3 +--
 src/pages/dashboard/detail/index.vue                 | 6 ++----
 src/pages/list/components/CommonTable.vue            | 1 +
 src/pages/user/index.vue                             | 3 +--
 src/style/index.less                                 | 4 ----
 src/style/layout.less                                | 7 +++++--
 8 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 8f5e0aa..9771f2a 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "pinia": "^2.0.11",
     "qrcode.vue": "^3.2.2",
     "tdesign-icons-vue-next": "^0.0.6",
-    "tdesign-vue-next": "^0.15.4",
+    "tdesign-vue-next": "^0.16.0",
     "tvision-color": "^1.3.1",
     "vue": "^3.2.31",
     "vue-clipboard3": "^2.0.0",
diff --git a/src/pages/dashboard/base/components/middle-chart.vue b/src/pages/dashboard/base/components/middle-chart.vue
index b3e4a72..3cac2f1 100644
--- a/src/pages/dashboard/base/components/middle-chart.vue
+++ b/src/pages/dashboard/base/components/middle-chart.vue
@@ -4,11 +4,10 @@
       <t-card title="统计数据" :subtitle="`(万元)${currentMonth}`" class="dashboard-chart-card">
         <template #option>
           <div class="dashboard-chart-title-container">
-            <t-date-picker
+            <t-date-range-picker
               class="card-date-picker-container"
               theme="primary"
               mode="date"
-              range
               :default-value="LAST_7_DAYS"
               @change="onCurrencyChange"
             />
diff --git a/src/pages/dashboard/base/components/overview.vue b/src/pages/dashboard/base/components/overview.vue
index 790dd21..cb2edd4 100644
--- a/src/pages/dashboard/base/components/overview.vue
+++ b/src/pages/dashboard/base/components/overview.vue
@@ -9,11 +9,10 @@
           :class="{ 'dashboard-overview-card': true, 'overview-panel': true }"
         >
           <template #actions>
-            <t-date-picker
+            <t-date-range-picker
               class="card-date-picker-container"
               theme="primary"
               mode="date"
-              range
               :default-value="LAST_7_DAYS"
               @change="onStokeDataChange"
             />
diff --git a/src/pages/dashboard/detail/index.vue b/src/pages/dashboard/detail/index.vue
index 05b4543..38c56a4 100644
--- a/src/pages/dashboard/detail/index.vue
+++ b/src/pages/dashboard/detail/index.vue
@@ -20,12 +20,11 @@
       <t-col :xs="12" :xl="9">
         <t-card class="dashboard-detail-card" title="采购商品申请趋势" subtitle="(件)">
           <template #actions>
-            <t-date-picker
+            <t-date-range-picker
               class="card-date-picker-container"
               :default-value="LAST_7_DAYS"
               theme="primary"
               mode="date"
-              range
               style="width: 240px"
               @change="onMaterialChange"
             />
@@ -44,12 +43,11 @@
     </t-row>
     <t-card :class="['dashboard-detail-card', 'row-margin']" title="采购商品满意度分布">
       <template #actions>
-        <t-date-picker
+        <t-date-range-picker
           class="card-date-picker-container"
           :default-value="LAST_7_DAYS"
           theme="primary"
           mode="date"
-          range
           style="display: inline-block; margin-right: 8px; width: 240px"
           @change="onSatisfyChange"
         />
diff --git a/src/pages/list/components/CommonTable.vue b/src/pages/list/components/CommonTable.vue
index aaf6028..14dbbb6 100644
--- a/src/pages/list/components/CommonTable.vue
+++ b/src/pages/list/components/CommonTable.vue
@@ -47,6 +47,7 @@
               <t-form-item label="合同类型" name="type">
                 <t-select
                   v-model="formData.type"
+                  style="display: inline-block"
                   class="form-item-content"
                   :options="CONTRACT_TYPE_OPTIONS"
                   placeholder="请选择合同类型"
diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue
index 0b258aa..aaa2ce3 100644
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
@@ -35,12 +35,11 @@
           <t-tab-panel value="second" label="内容列表">
             <t-card :bordered="false" class="card-padding-no" title="主页访问数据" describe="（次）">
               <template #actions>
-                <t-date-picker
+                <t-date-range-picker
                   class="card-date-picker-container"
                   :default-value="LAST_7_DAYS"
                   theme="primary"
                   mode="date"
-                  range
                   @change="onLineChange"
                 />
               </template>
diff --git a/src/style/index.less b/src/style/index.less
index 1977358..a5d9f1b 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -68,10 +68,6 @@ p {
   }
 }
 
-.t-button + .t-button {
-  margin-left: var(--tdvns-spacer);
-}
-
 .container-base-margin-top {
   margin-top: 16px;
 }
diff --git a/src/style/layout.less b/src/style/layout.less
index a477c7a..badc39e 100644
--- a/src/style/layout.less
+++ b/src/style/layout.less
@@ -7,10 +7,13 @@
   width: fit-content;
 }
 
-.t-button + .t-button {
-  margin-left: var(--tdvns-spacer);
+.left-operation-container,.operation-container {
+  .t-button + .t-button {
+    margin-left: var(--tdvns-spacer);
+  }
 }
 
+
 .t-layout.t-layout--with-sider {
   > .t-layout {
     flex: 1;

From 0cc022c7020d7daa935ce49e96828b126292f0bd Mon Sep 17 00:00:00 2001
From: pengYYY <pengyue970715@gmail.com>
Date: Fri, 17 Jun 2022 16:39:29 +0800
Subject: [PATCH 2/2] feat: update style

---
 src/pages/detail/deploy/index.vue         |  2 ++
 src/pages/list/components/CommonTable.vue |  8 ++++----
 src/style/layout.less                     | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/pages/detail/deploy/index.vue b/src/pages/detail/deploy/index.vue
index 2a620be..db98147 100644
--- a/src/pages/detail/deploy/index.vue
+++ b/src/pages/detail/deploy/index.vue
@@ -204,6 +204,8 @@ const deleteClickOp = (e) => {
 </script>
 
 <style lang="less" scoped>
+@import url('../base/index.less');
+
 .detail-deploy {
   :deep(.t-card) {
     padding: 8px;
diff --git a/src/pages/list/components/CommonTable.vue b/src/pages/list/components/CommonTable.vue
index 14dbbb6..7bd93ca 100644
--- a/src/pages/list/components/CommonTable.vue
+++ b/src/pages/list/components/CommonTable.vue
@@ -12,7 +12,7 @@
       <t-row>
         <t-col :span="10">
           <t-row :gutter="[16, 24]">
-            <t-col :flex="1">
+            <t-col :span="4">
               <t-form-item label="合同名称" name="name">
                 <t-input
                   v-model="formData.name"
@@ -23,7 +23,7 @@
                 />
               </t-form-item>
             </t-col>
-            <t-col :flex="1">
+            <t-col :span="4">
               <t-form-item label="合同状态" name="status">
                 <t-select
                   v-model="formData.status"
@@ -33,7 +33,7 @@
                 />
               </t-form-item>
             </t-col>
-            <t-col :flex="1">
+            <t-col :span="4">
               <t-form-item label="合同编号" name="no">
                 <t-input
                   v-model="formData.no"
@@ -43,7 +43,7 @@
                 />
               </t-form-item>
             </t-col>
-            <t-col :flex="1">
+            <t-col :span="4">
               <t-form-item label="合同类型" name="type">
                 <t-select
                   v-model="formData.type"
diff --git a/src/style/layout.less b/src/style/layout.less
index badc39e..c22bf9a 100644
--- a/src/style/layout.less
+++ b/src/style/layout.less
@@ -7,6 +7,23 @@
   width: fit-content;
 }
 
+.t-button + .t-button {
+  margin-left: var(--tdvns-spacer);
+}
+
+.t-jumper-jumper {
+  .t-button + .t-button {
+    margin-left: 0
+  }
+}
+.tdesign-starter-link {
+  color: var(--td-brand-color);
+  text-decoration: none;
+  margin-right: 24px;
+  cursor: pointer;
+  transition: color .2s cubic-bezier(.38,0,.24,1);
+}
+
 .left-operation-container,.operation-container {
   .t-button + .t-button {
     margin-left: var(--tdvns-spacer);