1

package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.11",
         "echarts": "^5.5.1",
         "element-plus": "2.7.6",
-        "hc-vue3-ui": "^4.0.5",
+        "hc-vue3-ui": "^4.0.6",
         "js-base64": "^3.7.7",
         "js-fast-way": "^0.5.0",
         "js-md5": "^0.8.3",

src/views/project/list/adjust-excel.vue

@@ -11,7 +11,6 @@
                     <el-segmented v-model="tabsKey" :options="tabsProps" @change="tabsChange" />
                 </template>
                 <HcSetInput v-if="tabsKey === 'tab1'" :info="dataInfo" />
-                其它内容
             </hc-card>
         </hc-page-split>
     </hc-drawer>

src/views/project/list/set-input.vue

@@ -9,7 +9,7 @@
                     <el-option v-for="item in sysTextType" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </el-form-item>
-            <el-row :gutter="20">
+            <el-row v-if="formModel.type === 'date' || formModel.type === 'daterange'" :gutter="20">
                 <el-col :span="18">
                     <el-form-item label="日期格式：" prop="date">
                         <el-checkbox-group v-model="checkDateList" @change="dateChange">
@@ -27,7 +27,7 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row v-if="formModel.type === 'date' || formModel.type === 'daterange'" :gutter="20">
                 <el-col :span="18">
                     <el-form-item label="时间格式：" prop="time">
                         <el-checkbox-group v-model="checkTimeist" @change="timeChange">
@@ -45,9 +45,19 @@
                     </el-form-item>
                 </el-col>
             </el-row>
+            <el-form-item v-if="formModel.type === 'daterange'" label="中间分隔符：" prop="rangeDivide">
+                <el-select v-model="checkRangeDivide" block placeholder="选择中间分隔符">
+                    <el-option label="至" value="至" />
+                    <el-option label="-" value="-" />
+                    <el-option label="~" value="~" />
+                </el-select>
+            </el-form-item>
         </el-form>
-        <div class="action-btn-box">
-            <el-button hc-btn type="primary" :loading="submitLoading" @click="dialogSubmit">提交</el-button>
+        <div class="action-btn-box mt-30px text-center">
+            <el-button type="primary" :loading="submitLoading" @click="dialogSubmit">
+                <hc-icon name="save" />
+                <span>保存设置</span>
+            </el-button>
         </div>
     </div>
 </template>
@@ -102,6 +112,8 @@ const checkTimeDivide = ref('文本')
 const timeChange = () => {
     console.log(checkTimeist.value)
 }
+//中间分割符
+const checkRangeDivide = ref('至')
 
 //基础表单
 const formRef = ref(null)
@@ -137,6 +149,11 @@ const formRules = {
         trigger: 'blur',
         message: '请选择时间分割',
     },
+    rangeDivide: {
+        required: true,
+        trigger: 'blur',
+        message: '请选择中间分隔符',
+    },
 }
 
 //提交

yarn.lock

@@ -1038,17 +1038,6 @@
   resolved "http://39.108.216.210:9000/@vitejs/plugin-vue/-/plugin-vue-5.0.5.tgz#e3dc11e427d4b818b7e3202766ad156e3d5e2eaa"
   integrity sha512-LOjm7XeIimLBZyzinBQ6OSm3UBCNVCpLkxGC0oWmm2YPzVZoxMsdvNVimLTBzpAnR9hl/yn1SHGuRfe6/Td9rQ==
 
-"@vue/compiler-core@3.4.30":
-  version "3.4.30"
-  resolved "http://39.108.216.210:9000/@vue/compiler-core/-/compiler-core-3.4.30.tgz#a554978f68199a0f254ad5159e9665370c8c1250"
-  integrity sha512-ZL8y4Xxdh8O6PSwfdZ1IpQ24PjTAieOz3jXb/MDTfDtANcKBMxg1KLm6OX2jofsaQGYfIVzd3BAG22i56/cF1w==
-  dependencies:
-    "@babel/parser" "^7.24.7"
-    "@vue/shared" "3.4.30"
-    entities "^4.5.0"
-    estree-walker "^2.0.2"
-    source-map-js "^1.2.0"
-
 "@vue/compiler-core@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/compiler-core/-/compiler-core-3.4.31.tgz#b51a76f1b30e9b5eba0553264dff0f171aedb7c6"
@@ -1060,14 +1049,6 @@
     estree-walker "^2.0.2"
     source-map-js "^1.2.0"
 
-"@vue/compiler-dom@3.4.30":
-  version "3.4.30"
-  resolved "http://39.108.216.210:9000/@vue/compiler-dom/-/compiler-dom-3.4.30.tgz#5af9a5f6f0752f7882d4eba0795e4d00525006dc"
-  integrity sha512-+16Sd8lYr5j/owCbr9dowcNfrHd+pz+w2/b5Lt26Oz/kB90C9yNbxQ3bYOvt7rI2bxk0nqda39hVcwDFw85c2Q==
-  dependencies:
-    "@vue/compiler-core" "3.4.30"
-    "@vue/shared" "3.4.30"
-
 "@vue/compiler-dom@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/compiler-dom/-/compiler-dom-3.4.31.tgz#30961ca847f5d6ad18ffa26236c219f61b195f6b"
@@ -1076,21 +1057,6 @@
     "@vue/compiler-core" "3.4.31"
     "@vue/shared" "3.4.31"
 
-"@vue/compiler-sfc@3.4.30":
-  version "3.4.30"
-  resolved "http://39.108.216.210:9000/@vue/compiler-sfc/-/compiler-sfc-3.4.30.tgz#6a3cc86c20349f8c1976c968a8c80dd7cfef2430"
-  integrity sha512-8vElKklHn/UY8+FgUFlQrYAPbtiSB2zcgeRKW7HkpSRn/JjMRmZvuOtwDx036D1aqKNSTtXkWRfqx53Qb+HmMg==
-  dependencies:
-    "@babel/parser" "^7.24.7"
-    "@vue/compiler-core" "3.4.30"
-    "@vue/compiler-dom" "3.4.30"
-    "@vue/compiler-ssr" "3.4.30"
-    "@vue/shared" "3.4.30"
-    estree-walker "^2.0.2"
-    magic-string "^0.30.10"
-    postcss "^8.4.38"
-    source-map-js "^1.2.0"
-
 "@vue/compiler-sfc@3.4.31", "@vue/compiler-sfc@^3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/compiler-sfc/-/compiler-sfc-3.4.31.tgz#cc6bfccda17df8268cc5440842277f61623c591f"
@@ -1106,14 +1072,6 @@
     postcss "^8.4.38"
     source-map-js "^1.2.0"
 
-"@vue/compiler-ssr@3.4.30":
-  version "3.4.30"
-  resolved "http://39.108.216.210:9000/@vue/compiler-ssr/-/compiler-ssr-3.4.30.tgz#7938b51f17d62b883d2a61ae42ec4f8398115b1d"
-  integrity sha512-ZJ56YZGXJDd6jky4mmM0rNaNP6kIbQu9LTKZDhcpddGe/3QIalB1WHHmZ6iZfFNyj5mSypTa4+qDJa5VIuxMSg==
-  dependencies:
-    "@vue/compiler-dom" "3.4.30"
-    "@vue/shared" "3.4.30"
-
 "@vue/compiler-ssr@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/compiler-ssr/-/compiler-ssr-3.4.31.tgz#f62ffecdf15bacb883d0099780cf9a1e3654bfc4"
@@ -1127,13 +1085,6 @@
   resolved "http://39.108.216.210:9000/@vue/devtools-api/-/devtools-api-6.6.1.tgz#7c14346383751d9f6ad4bea0963245b30220ef83"
   integrity sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==
 
-"@vue/reactivity@3.4.30":
-  version "3.4.30"
-  resolved "http://39.108.216.210:9000/@vue/reactivity/-/reactivity-3.4.30.tgz#6849e293eab7feed7d307446feaf1e3d759d5c45"
-  integrity sha512-bVJurnCe3LS0JII8PPoAA63Zd2MBzcKrEzwdQl92eHCcxtIbxD2fhNwJpa+KkM3Y/A4T5FUnmdhgKwOf6BfbcA==
-  dependencies:
-    "@vue/shared" "3.4.30"
-
 "@vue/reactivity@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/reactivity/-/reactivity-3.4.31.tgz#eda80e90c4f9d7659efe1f5ed99c2dfdc9e93d77"
@@ -1141,14 +1092,6 @@
   dependencies:
     "@vue/shared" "3.4.31"
 
-"@vue/runtime-core@3.4.30":
-  version "3.4.30"
-  resolved "http://39.108.216.210:9000/@vue/runtime-core/-/runtime-core-3.4.30.tgz#6db949b273af0b988b4f13fecb034f9c9439c41e"
-  integrity sha512-qaFEbnNpGz+tlnkaualomogzN8vBLkgzK55uuWjYXbYn039eOBZrWxyXWq/7qh9Bz2FPifZqGjVDl/FXiq9L2g==
-  dependencies:
-    "@vue/reactivity" "3.4.30"
-    "@vue/shared" "3.4.30"
-
 "@vue/runtime-core@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/runtime-core/-/runtime-core-3.4.31.tgz#ad3a41ad76385c0429e3e4dbefb81918494e10cf"
@@ -1157,16 +1100,6 @@
     "@vue/reactivity" "3.4.31"
     "@vue/shared" "3.4.31"
 
-"@vue/runtime-dom@3.4.30":
-  version "3.4.30"
-  resolved "http://39.108.216.210:9000/@vue/runtime-dom/-/runtime-dom-3.4.30.tgz#49f399adc300a000419cb57a20b4481c98f523a4"
-  integrity sha512-tV6B4YiZRj5QsaJgw2THCy5C1H+2UeywO9tqgWEc21tn85qHEERndHN/CxlyXvSBFrpmlexCIdnqPuR9RM9thw==
-  dependencies:
-    "@vue/reactivity" "3.4.30"
-    "@vue/runtime-core" "3.4.30"
-    "@vue/shared" "3.4.30"
-    csstype "^3.1.3"
-
 "@vue/runtime-dom@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/runtime-dom/-/runtime-dom-3.4.31.tgz#bae7ad844f944af33699c73581bc36125bab96ce"
@@ -1177,14 +1110,6 @@
     "@vue/shared" "3.4.31"
     csstype "^3.1.3"
 
-"@vue/server-renderer@3.4.30":
-  version "3.4.30"
-  resolved "http://39.108.216.210:9000/@vue/server-renderer/-/server-renderer-3.4.30.tgz#41f117cec12b5fbb9d7c741f59e7a0b515e9b607"
-  integrity sha512-TBD3eqR1DeDc0cMrXS/vEs/PWzq1uXxnvjoqQuDGFIEHFIwuDTX/KWAQKIBjyMWLFHEeTDGYVsYci85z2UbTDg==
-  dependencies:
-    "@vue/compiler-ssr" "3.4.30"
-    "@vue/shared" "3.4.30"
-
 "@vue/server-renderer@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/server-renderer/-/server-renderer-3.4.31.tgz#bbe990f793c36d62d05bdbbaf142511d53e159fd"
@@ -1193,11 +1118,6 @@
     "@vue/compiler-ssr" "3.4.31"
     "@vue/shared" "3.4.31"
 
-"@vue/shared@3.4.30":
-  version "3.4.30"
-  resolved "http://39.108.216.210:9000/@vue/shared/-/shared-3.4.30.tgz#72acfe8df65139dcf298e965fb2ab1cff419e400"
-  integrity sha512-CLg+f8RQCHQnKvuHY9adMsMaQOcqclh6Z5V9TaoMgy0ut0tz848joZ7/CYFFyF/yZ5i2yaw7Fn498C+CNZVHIg==
-
 "@vue/shared@3.4.31":
   version "3.4.31"
   resolved "http://39.108.216.210:9000/@vue/shared/-/shared-3.4.31.tgz#af9981f57def2c3f080c14bf219314fc0dc808a0"
@@ -2097,10 +2017,10 @@ has-flag@^4.0.0:
   resolved "http://39.108.216.210:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^4.0.5:
-  version "4.0.5"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.0.5.tgz#6884ba25d6d887583d5c6479cc7a8f8e277e2c37"
-  integrity sha512-ou9IFaI8vhiU6rrtzlAMOvNOrdMauo/fU1gyu4nbLq0wL0lqKUUrh++UiTLe8BoNFxZI/NcCI48y8ExfeuQXPQ==
+hc-vue3-ui@^4.0.6:
+  version "4.0.6"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.0.6.tgz#090e94f4c63fe7c12574f037e02c30efe36526b7"
+  integrity sha512-5Ck0kSnoCuZgpWSfz69Lyq1lXNJcC67nO67hLYB1QkZpm5bGx+PYALGFtzjGUqgpBySzge56jdiQXbwmWwWCzA==
   dependencies:
     axios "^1.7.2"
     dayjs "^1.11.11"
@@ -2109,7 +2029,7 @@ hc-vue3-ui@^4.0.5:
     js-md5 "^0.8.3"
     sortablejs "^1.15.1"
     split.js "^1.6.5"
-    vue "3.4.30"
+    vue "3.4.31"
 
 human-signals@^2.1.0:
   version "2.1.0"
@@ -3143,17 +3063,6 @@ vue-router@^4.4.0:
   dependencies:
     "@vue/devtools-api" "^6.5.1"
 
-vue@3.4.30:
-  version "3.4.30"
-  resolved "http://39.108.216.210:9000/vue/-/vue-3.4.30.tgz#02c75c63a21e305c38a937866d8ee2269b62bbb4"
-  integrity sha512-NcxtKCwkdf1zPsr7Y8+QlDBCGqxvjLXF2EX+yi76rV5rrz90Y6gK1cq0olIhdWGgrlhs9ElHuhi9t3+W5sG5Xw==
-  dependencies:
-    "@vue/compiler-dom" "3.4.30"
-    "@vue/compiler-sfc" "3.4.30"
-    "@vue/runtime-dom" "3.4.30"
-    "@vue/server-renderer" "3.4.30"
-    "@vue/shared" "3.4.30"
-
 vue@3.4.31:
   version "3.4.31"
   resolved "http://39.108.216.210:9000/vue/-/vue-3.4.31.tgz#83a3c4dab8302b0e974b0d4b92a2f6a6378ae797"