Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

README.md

@@ -35,3 +35,114 @@
 ### 构建
 
 `pnpm build`
+
+### 主题
+
+主题可以在 /views/vent/sys/setting/index.vue 中找到设置入口
+
+常规的颜色、变量在 /design/color.less 或 /design/themify/ 下添加，图片资源应在 /assets/images/themify/ 下添加
+
+各个页面的主题化标准模板可以参考登录页 /views/sys/login/Login.vue
+
+下面是配合主题化使用的工具，输入页面的 css 样式，即可输出标准模板所需的资源
+
+```javascript
+// Please make sure these requires before using this function:
+// 1. replace all url patterns to patterns like `url(/@/xxx/xxx.xxx)`.
+// 2. remove all the in-line comments(//) or replace them to block comments(/** */).
+// 3. replace all rbg/rgba/hsa or any other css color functions to hex colors(#xxxxxx).
+function themifyScript(
+  str,
+  options = {
+    color: false,
+    gradient: false,
+    url: true,
+  }
+) {
+  const keySet = new Set();
+  let strcopy = str;
+  let varstr = '';
+
+  // process url, extract all css url and replace them to css var and record them.
+  {
+    keySet.clear();
+    const regexp = /url\('?(\/[@|0-9|a-z|A-Z|\-|_]+)+.(png|svg)'?\)/g;
+    let res = regexp.exec(str);
+    while (res) {
+      const [url, image] = res;
+      const varname = `--image-${image.replace('/', '')}`;
+      if (!keySet.has(image)) {
+        keySet.add(image);
+        varstr += `${varname}: ${url};`;
+      }
+      if (options.url) {
+        strcopy = strcopy.replace(url, `var(${varname})`);
+      }
+      res = regexp.exec(str);
+    }
+  }
+
+  // process gradient, extract all css gradient and replace them to css var and record them.
+  {
+    keySet.clear();
+    let key = 0;
+    const regexp = /linear-gradient\([0-9|a-z|A-Z|#|,|\s|%|.]+\)/g;
+    let res = regexp.exec(str);
+    while (res) {
+      const [gradient] = res;
+      const varname = `--gradient-${key}`;
+      if (!keySet.has(gradient)) {
+        keySet.add(gradient);
+        varstr += `${varname}: ${gradient};`;
+      }
+      if (options.gradient) {
+        strcopy = strcopy.replace(gradient, `var(${varname})`);
+      }
+      res = regexp.exec(str);
+      key += 1;
+    }
+  }
+  {
+    keySet.clear();
+    let key = 0;
+    const regexp = /radial-gradient\([0-9|a-z|A-Z|#|,|\s|%|.]+\)/g;
+    let res = regexp.exec(str);
+    while (res) {
+      const [gradient] = res;
+      const varname = `--gradient-${key}`;
+      if (!keySet.has(gradient)) {
+        keySet.add(gradient);
+        varstr += `${varname}: ${gradient};`;
+      }
+      if (options.gradient) {
+        strcopy = strcopy.replace(gradient, `var(${varname})`);
+      }
+      res = regexp.exec(str);
+      key += 1;
+    }
+  }
+
+  // process color, extract all css colors and replace them to css var and record them.
+  {
+    keySet.clear();
+    let key = 0;
+    const regexp = /#[0-9|a-z|A-Z]{3,8}/g;
+    let res = regexp.exec(str);
+    while (res) {
+      const [color] = res;
+      const varname = `--color-${key}`;
+      if (!keySet.has(color)) {
+        keySet.add(color);
+        varstr += `${varname}: ${color};`;
+      }
+      if (options.color) {
+        strcopy = strcopy.replace(color, `var(${varname})`);
+      }
+      res = regexp.exec(str);
+      key += 1;
+    }
+  }
+
+  return [varstr, strcopy];
+}
+```

index.html

@@ -43,13 +43,6 @@
           background-color: none;
           background-image: url('./src/assets/images/themify/deepblue/loading-bg.png');
         }
-        html[data-theme='deepblue'] .app-loading .app-loading-title {
-          padding: 10px 100px;
-          background-size: 100% auto;
-          background-position: center;
-          background-image: url('./src/assets/images/themify/deepblue/login/input-down.png');
-          background-repeat: no-repeat;
-        }
         body{
           background-color: var(--vent-base-color)
         }

src/api/sys/user.ts

@@ -97,15 +97,14 @@ export function phoneLoginApi(params: LoginParams, mode: ErrorMessageMode = 'mod
   );
 }
 
-export function tokenLogin(params: TokenInfo, mode: ErrorMessageMode = 'modal') {
-  return defHttp.get<GetUserInfoModel>(
+export function tokenLogin(params: TokenInfo, mode: ErrorMessageMode = 'modal', successMode: SuccessMessageMode = 'success') {
+  return defHttp.post<GetUserInfoModel>(
     {
       url: Api.tokenLogin,
-      headers: {
-        token: decodeURIComponent(params.token),
-      },
+      data: params.token,
     },
     {
+      successMessageMode: successMode,
       errorMessageMode: mode,
     }
   );

src/assets/images/themify/deepblue/fire/max.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="31.761" height="46.177" viewBox="0 0 31.761 46.177">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#0a84ff"/>
+      <stop offset="1" stop-color="#0a84ff" stop-opacity="0"/>
+    </linearGradient>
+  </defs>
+  <g id="组_15429" data-name="组 15429" transform="translate(-506.549 -355.112)">
+    <path id="路径_55369" data-name="路径 55369" d="M226.661,25.849V14.585a1.244,1.244,0,0,0-1.242-1.242h-.1a1.2,1.2,0,0,0-1.206,1.206v11.3a4.375,4.375,0,0,0-3.211,4.17,4.486,4.486,0,1,0,5.757-4.17Zm6.6-4.99a1.134,1.134,0,0,1-.443-.861V7.262a7.432,7.432,0,0,0-14.86,0V19.637a1.771,1.771,0,0,1-.6,1.357,11.81,11.81,0,0,0-4.224,9.029,12.264,12.264,0,0,0,24.521,0A11.811,11.811,0,0,0,233.259,20.859Zm-7.873,17.333a8.3,8.3,0,0,1-8.4-8.172,8.1,8.1,0,0,1,3.924-6.905l.595-.365a.659.659,0,0,0,.312-.558V7.262a3.573,3.573,0,0,1,7.143,0v14.93a.659.659,0,0,0,.312.558l.595.365a8.086,8.086,0,0,1,3.92,6.905,8.3,8.3,0,0,1-8.4,8.172Z" transform="translate(293.42 359.295)" fill="url(#linear-gradient)"/>
+    <path id="路径_55370" data-name="路径 55370" d="M282,155.954v9.231h1.865v-9.231l1.958,1.958,1.305-1.4-4.2-4.2-4.2,4.2,1.305,1.305Zm-4.662-4.755h11.189v-1.865H277.333Z" transform="translate(249.788 205.778)" fill="#fff"/>
+  </g>
+</svg>

src/assets/images/themify/deepblue/fire/min.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="31.761" height="46.177" viewBox="0 0 31.761 46.177">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#0a84ff"/>
+      <stop offset="1" stop-color="#0a84ff" stop-opacity="0"/>
+    </linearGradient>
+  </defs>
+  <g id="组_15430" data-name="组 15430" transform="translate(0 0)">
+    <path id="路径_55369" data-name="路径 55369" d="M226.661,25.849V14.585a1.244,1.244,0,0,0-1.242-1.242h-.1a1.2,1.2,0,0,0-1.206,1.206v11.3a4.375,4.375,0,0,0-3.211,4.17,4.486,4.486,0,1,0,5.757-4.17Zm6.6-4.99a1.134,1.134,0,0,1-.443-.861V7.262a7.432,7.432,0,0,0-14.86,0V19.637a1.771,1.771,0,0,1-.6,1.357,11.81,11.81,0,0,0-4.223,9.029,12.264,12.264,0,0,0,24.521,0A11.811,11.811,0,0,0,233.259,20.859Zm-7.873,17.333a8.3,8.3,0,0,1-8.4-8.172,8.1,8.1,0,0,1,3.924-6.905l.595-.365a.659.659,0,0,0,.312-.558V7.262a3.573,3.573,0,0,1,7.143,0v14.93a.659.659,0,0,0,.312.558l.595.365a8.086,8.086,0,0,1,3.92,6.905,8.3,8.3,0,0,1-8.4,8.172Z" transform="translate(-213.129 4.184)" fill="url(#linear-gradient)"/>
+    <path id="路径_55370" data-name="路径 55370" d="M282,158.565v-9.231h1.865v9.231l1.958-1.958,1.305,1.4-4.2,4.2-4.2-4.2,1.305-1.305Zm-4.662,4.755h11.189v1.865H277.333Z" transform="translate(-256.76 -149.334)" fill="#fff"/>
+  </g>
+</svg>

src/assets/images/themify/deepblue/fire/pj.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="31.761" height="46.177" viewBox="0 0 31.761 46.177">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#0a84ff"/>
+      <stop offset="1" stop-color="#0a84ff" stop-opacity="0"/>
+    </linearGradient>
+  </defs>
+  <g id="组_15431" data-name="组 15431" transform="translate(0 0)">
+    <path id="路径_55369" data-name="路径 55369" d="M226.661,25.849V14.585a1.244,1.244,0,0,0-1.242-1.242h-.1a1.2,1.2,0,0,0-1.206,1.206v11.3a4.375,4.375,0,0,0-3.211,4.17,4.486,4.486,0,1,0,5.757-4.17Zm6.6-4.99a1.134,1.134,0,0,1-.443-.861V7.262a7.432,7.432,0,0,0-14.86,0V19.637a1.771,1.771,0,0,1-.6,1.357,11.81,11.81,0,0,0-4.223,9.029,12.264,12.264,0,0,0,24.521,0A11.811,11.811,0,0,0,233.259,20.859Zm-7.873,17.333a8.3,8.3,0,0,1-8.4-8.172,8.1,8.1,0,0,1,3.924-6.905l.595-.365a.659.659,0,0,0,.312-.558V7.262a3.573,3.573,0,0,1,7.143,0v14.93a.659.659,0,0,0,.312.558l.595.365a8.086,8.086,0,0,1,3.92,6.905,8.3,8.3,0,0,1-8.4,8.172Z" transform="translate(-213.129 4.184)" fill="url(#linear-gradient)"/>
+    <path id="路径_55371" data-name="路径 55371" d="M64,120.4v2.264H75.189V120.4Zm0,13.846H75.189v-2.264H64Zm0-5.79H75.189v-2.264H64Z" transform="translate(-43.428 -120.4)" fill="#fff"/>
+  </g>
+</svg>