Browse Source

更新依赖,优化图片颜色设置

ZaiZai 1 year ago
parent
commit
fe225f192c
4 changed files with 17 additions and 22 deletions
  1. 2 2
      package.json
  2. 2 3
      src/layout/index.vue
  3. 5 9
      src/views/login/index.vue
  4. 8 8
      yarn.lock

+ 2 - 2
package.json

@@ -12,10 +12,10 @@
         "crypto-js": "^4.1.1",
         "dayjs": "^1.11.7",
         "echarts": "^5.4.2",
-        "element-plus": "2.3.3",
+        "element-plus": "2.3.4",
         "js-base64": "^3.7.5",
         "js-cookie": "^3.0.4",
-        "js-fast-way": "^0.0.9",
+        "js-fast-way": "^0.1.0",
         "js-md5": "^0.7.3",
         "js-web-screen-shot": "^1.9.2",
         "nprogress": "^0.2.0",

+ 2 - 3
src/layout/index.vue

@@ -71,7 +71,7 @@ import ConfigBar from "./modules/ConfigBar.vue"
 import TopMenuBar from "./modules/TopMenuBar.vue"
 import {initButtons, initProjectContract} from "~sto/app";
 import website from '~src/config/index'
-import {setImageColor} from "js-fast-way";
+import {setImageColorStyle} from "js-fast-way";
 import {setAppName} from "~uti/tools";
 
 //初始组合式
@@ -162,8 +162,7 @@ watch(() => [
 
 //设置Logo图片颜色
 const setLogoImageColor = () => {
-    const { result } = setImageColor(AppColor.value?.color);
-    document.getElementById('logo-icon').style = result.filter
+    setImageColorStyle('logo-icon', AppColor.value?.color)
 }
 
 //设置折叠

+ 5 - 9
src/views/login/index.vue

@@ -23,9 +23,6 @@
                 <div v-if="account" class="form-box mt-4">
                     <el-form ref="formRef" :model="formValue" :rules="formRules" label-position="left" label-width="0px"
                              size="large">
-                        <el-form-item prop="tenantId" v-if="tenantMode">
-                            <el-input v-model="formValue.tenantId" clearable placeholder="租户ID"/>
-                        </el-form-item>
                         <el-form-item prop="username">
                             <el-input v-model="formValue.username" clearable placeholder="账号"/>
                         </el-form-item>
@@ -37,6 +34,9 @@
                                 </template>
                             </el-input>
                         </el-form-item>
+                        <el-form-item prop="tenantId" v-if="tenantMode">
+                            <el-input v-model="formValue.tenantId" clearable placeholder="租户ID"/>
+                        </el-form-item>
                         <el-form-item>
                             <el-checkbox v-model="checkbox" label="记住密码"/>
                         </el-form-item>
@@ -80,7 +80,7 @@ import HcPicVue from './components/pic.vue'
 import HcHomeBg from './components/home-bg.vue'
 import logoIcon from "~src/assets/logo/icon.png";
 import logoName from "~src/assets/logo/name.png";
-import {formValidate, getObjVal, setImageColor} from "js-fast-way"
+import {formValidate, getObjVal, setImageColorStyle} from "js-fast-way"
 
 const userStore = useAppStore()
 userStore.clearStoreData() //先清理下缓存
@@ -103,11 +103,7 @@ onMounted(() => {
 })
 
 const setAppImageColor = () => {
-    const dom = document.getElementById('logo-icon')
-    if (dom) {
-        const { result } = setImageColor('#1ECC95');
-        dom.style = result.filter
-    }
+    setImageColorStyle('logo-icon', '#1ECC95')
 }
 
 //表单

+ 8 - 8
yarn.lock

@@ -659,10 +659,10 @@ electron-to-chromium@^1.4.284:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.367.tgz#d9ddc529ba2315fc852b722c359e4a40e86aa742"
   integrity sha512-mNuDxb+HpLhPGUKrg0hSxbTjHWw8EziwkwlJNkFUj3W60ypigLDRVz04vU+VRsJPi8Gub+FDhYUpuTm9xiEwRQ==
 
-element-plus@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.3.3.tgz#33173bbbe84ada40f4d796fe5043c44781198ea4"
-  integrity sha512-Zy61OXrG6b4FF3h29A9ZOUkaEQXjCuFwNa7DlpB3Vo+42Tw5zBbHe5a4BY7i56TVJG5xTbS9UQyA726J91pDqg==
+element-plus@2.3.4:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.3.4.tgz#4319f6b0a1096cfac9c53b69da2fe23ac5aea63e"
+  integrity sha512-SQr0J9z7N4z48WYk/l9NE2tizl8Q7j2OhqlpTc42k4pGncry3+rVX6dsmcsglFynn6vt3NzYxWJqmLFyDKQq+g==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.0.6"
@@ -931,10 +931,10 @@ js-cookie@^3.0.4:
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.4.tgz#9ae3c5f6eb34d2292d76e0579fabfe7c872e1fae"
   integrity sha512-tlu5VGqPFMP5eBefnmszCFZkPXG2n527NRN9XdNtN6FZ5n/0e98TdDm8BOz290OIIsxtXb9XTJjfqE6gVhOHQw==
 
-js-fast-way@^0.0.9:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/js-fast-way/-/js-fast-way-0.0.9.tgz#4b438e132c85aebddca7c17f600a7a44a3f8b58b"
-  integrity sha512-9ZAsgq3kYbtEqAYqD+gkMQASSk0ymK/evbKuyJBnMBRG+JG7bMmdYuUZssJIBS6OBepF1el/blHGszSDGiebrg==
+js-fast-way@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/js-fast-way/-/js-fast-way-0.1.0.tgz#92da060b161e5602c37cb4d2d6d4338958d8b807"
+  integrity sha512-Pv/x/Adk2QVvTpcDQaJ1O3++NsEFAfT3OdwgAfB+mwEx6Q3fmFnT4WdYjNtEcnlNcaAg+k65FTdsEoNsUHedlA==
 
 js-md5@^0.7.3:
   version "0.7.3"