页面首次登录问题解决

ruoyi-ui/public/index.html

@@ -8,7 +8,7 @@
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
-	  <style>
+	  <style >
     html,
     body,
     #app {

ruoyi-ui/src/App.vue

@@ -21,7 +21,7 @@ export default {
     }
 };
 </script>
-<style scoped>
+<style >
 #app .theme-picker {
   display: none;
 }

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -226,3 +226,4 @@
     }
   }
 }
+

ruoyi-ui/src/components/TopNav/index.vue

@@ -169,8 +169,8 @@ export default {
   },
 };
 </script>
-
-<style lang="scss">
+<!-- 
+<style lang="scss" scoped>
 #app .sidebar-container .theme-dark .is-active > .el-submenu__title {
     color: #a6b2d9 !important;
 }
@@ -260,4 +260,4 @@ element.style {
 
 
 
-</style>
+</style> -->

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -62,7 +62,7 @@ export default {
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  height: 50px;
+  /* height: 50px; */
   line-height: 50px;
   background: #2b2f3a;
   text-align: center;

ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -55,3 +55,4 @@ export default {
     }
 };
 </script>
+

ruoyi-ui/src/main.js

@@ -44,8 +44,6 @@ import DictData from '@/components/DictData'
 import JsonExcel from 'vue-json-excel'
 
 
-
-
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey

ruoyi-ui/src/views/index.vue

@@ -43,7 +43,7 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
+<style  lang="scss" scoped>
 .home {
   blockquote {
     padding: 10px 20px;

ruoyi-ui/src/views/login.vue

@@ -21,7 +21,7 @@
           type="text"
           auto-complete="off"
           placeholder="账号"
-          show-password
+          
           class="inputt"
         />
       </el-row>
@@ -50,11 +50,11 @@
               placeholder="验证码"
               @keyup.enter.native="handleLogin"
               class="inputt"
-              show-password
+             
             >
             </el-input>
           </el-col>
-          <el-col :span="5" :offset="1">
+          <el-col :span="4" :offset="1">
             <div class="login-code">
               <img :src="codeUrl" @click="getCode" class="login-code-img" />
             </div>
@@ -265,7 +265,7 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style rel="stylesheet/scss" lang="scss" scoped>
 .logg{
   margin-top:42px ;
   margin-left:196px ;
@@ -385,9 +385,12 @@ export default {
 }
 
 .login-code{
+  width: 40px;
   height: 54px;
   opacity: 1;
 }
-
+.el-col-18 {
+    width: 66%;
+}
 
 </style>

ruoyi-ui/src/views/system/data/index.vue

@@ -90,6 +90,7 @@ export default {
     total: {
       required: true,
       type: Number,
+      required:true,
     },
     page: {
       type: Number,

ruoyi-ui/src/views/system/fromModeling/examples/main.js

@@ -1,14 +1,20 @@
-
+/*
+ * @Descripttion:
+ * @Author: kcz
+ * @Date: 2021-05-02 16:04:02
+ * @LastEditors: kcz
+ * @LastEditTime: 2022-10-26 23:28:19
+ */
 // 引入@babel/polyfill处理兼容
 import "@babel/polyfill";
 
 import Vue from "vue";
 import App from "./App.vue";
-import router from "./router/index.js";
+import router from "./router/";
 import Cmp from "./components/CustomComponent/index.vue";
 
 // 预加载组件
-// import "../packages/core/preUseComponents";
+import "../packages/core/preUseComponents";
 // 懒加载组件
 import { useAntd } from "../packages/core/useComponents";
 import { nodeSchema } from "../packages/mini";

ruoyi-ui/src/views/system/fromModeling/package/components/KFormDesign/index.vue

@@ -506,3 +506,11 @@ export default {
   }
 };
 </script>
+<style>
+.form-designer-container-9136076486841527 .content aside, .k-form-build-9136076486841527 .content aside {
+    -webkit-box-shadow: 0 0 1px 1px #ccc;
+    box-shadow: 0 0 1px 1px #ccc;
+    width: 300px !important;
+    height: 100%;
+}
+</style>

ruoyi-ui/src/views/system/fromModeling/package/components/KFormDesign/module/codeModal.vue

@@ -161,3 +161,4 @@ export default {
   }
 };
 </script>
+

ruoyi-ui/src/views/system/fromModeling/package/components/KFormDesign/module/header.vue

@@ -18,3 +18,7 @@ export default {
   }
 };
 </script>
+
+<style lang="scss" scoped>
+
+</style>

ruoyi-ui/src/views/system/fromModeling/public/demo.html

@@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>表单设计器kcz111</title>
+    <meta charset="UTF-8" />
+    <link
+      rel="shortcut icon"
+      href="http://cdn.kcz66.com/favicon.ico"
+      type="image/x-icon"
+    />
+    <link rel="stylesheet" href="./k-form-design.css" />
+  </head>
+
+  <body>
+    <div id="app">
+      <k-form-design
+        :showBtnList="[
+    'preview',
+    'importJson',
+    'exportJson',
+    'exportCode',
+    'reset',
+  ]"
+        title="表单设计器 -自定义标题"
+      ></k-form-design>
+    </div>
+    <script src="http://cdn.kcz66.com/vue.min.js"></script>
+    <script src="./k-form-design.umd.min.js"></script>
+    <script>
+      let jsonData = {
+        list: [
+          {
+            type: "input",
+            name: "单行文本",
+            options: {
+              width: "100%",
+              defaultValue: "",
+              placeholder: "请输入",
+              disabled: false,
+            },
+            model: "input_1574002292465",
+            key: "input_1574002292465",
+            rules: [{ required: false, message: "必填项" }],
+          },
+        ],
+        config: {
+          layout: "horizontal",
+          labelCol: { span: 4 },
+          wrapperCol: { span: 18 },
+          hideRequiredMark: false,
+          width: "100%",
+          marginTop: "0px",
+          marginRight: "0px",
+          marginBottom: "0px",
+          marginLeft: "0px",
+        },
+      };
+      let vm = new Vue({
+        el: "#app",
+        data: {
+          jsonData,
+        },
+        methods: {
+          handleSubmit() {},
+        },
+        mounted() {
+          let Cmp = {
+            label: "cmp",
+            render: function(h) {
+              return h("div", "我是自定义组件");
+            },
+          };
+
+          window["k-form-design"].setFormDesignConfig({
+            title: "自定义字段",
+            list: [
+              {
+                type: "demo", // 组件类型
+                label: "自定义组件", // 组件名称
+                component: Cmp, // 组件
+                options: {
+                  defaultValue: undefined, // 可选值
+                  multiple: false, // 可选值
+                  disabled: false, // 可选值
+                  width: "100%",
+                  clearable: true, // 可选值
+                  placeholder: "请选择", // 可选值
+                  showSearch: false, // 可选值
+                  color:'red'
+                },
+                model: "", // 可选值
+                key: "",
+                rules: [
+                  // 可选值
+                  {
+                    required: false,
+                    message: "必填项",
+                  },
+                ],
+              },
+            ],
+          });
+         
+          // 添加组件
+          // window["k-form-design"].nodeSchema.addSchemas([
+          //   {
+          //     type: "demo", // 表单类型
+          //     label: "自定义组件", // 标题文字
+          //     icon: "icon-gallery",
+          //     component: Cmp,
+          //     options: {
+          //       defaultValue: undefined,
+          //       multiple: false,
+          //       disabled: false,
+          //       width: "100%",
+          //       clearable: true,
+          //       placeholder: "请选择",
+          //       showSearch: false,
+          //       showLabel: true,
+          //     },
+          //     model: "",
+          //     key: "",
+          //     rules: [
+          //       {
+          //         required: false,
+          //         message: "必填项",
+          //       },
+          //     ],
+          //   },
+          // ]);
+
+          // // 添加分组
+          // window["k-form-design"].nodeSchema.addSchemaGroup({
+          //   title: "自定义组件",
+          //   list: ["demo"],
+          // });
+        },
+      });
+    </script>
+  </body>
+</html>

ruoyi-ui/src/views/system/fromModeling/public/index.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <title>表单设计器</title>
+  </head>
+  <body>
+    <noscript>
+      <strong>We're sorry but dd doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  <!-- <script src="//at.alicdn.com/t/font_1609652_zmwe9ifljsh.js"></script> -->
+</body>
+</html>

ruoyi-ui/src/views/system/fromModeling/styles/form-design.less

@@ -10,8 +10,8 @@
 @title-text-color: #fff;
 @border-color    : #ccc;
 
-@left-right-width      : 270px;
-@header-height         : 0px;
+@left-right-width      : 305px;
+@header-height         : 2px;
 @operating-area-height : 45px;
 
 
@@ -986,4 +986,6 @@
 //     color          : @primary-color;
 //     text-decoration: none;
 //   }
-// }
+// }
+
+

ruoyi-ui/src/views/system/menu/index.vue

@@ -451,7 +451,7 @@ export default {
   }
 };
 </script>
-<style scoped lang="scss">
+<style scoped lang="scss" scoped>
 
 
 /* #app .sidebar-container .submenu-title-noDropdown:hover, #app .sidebar-container .el-submenu__title:hover {
@@ -460,4 +460,5 @@ export default {
 .submenu-title-noDropdown:hover{
   background-color:  linear-gradient(to right, blue, rgb(69, 118, 225));
 }
+
 </style>

ruoyi-ui/src/views/system/processModeling/flow-x6/index.vue

@@ -91,7 +91,7 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
 .x6-widget-snapline-vertical {
   border-right-color: #ff4e50 !important;
 }

ruoyi-ui/src/views/tool/build/index.vue

@@ -445,15 +445,15 @@ export default {
     padding: 12px 18px 15px 15px;
   }
 }
-.left-scrollbar .el-scrollbar__wrap {
+/* .left-scrollbar .el-scrollbar__wrap {
   box-sizing: border-box;
   overflow-x: hidden !important;
   margin-bottom: 0 !important;
-}
+} */
 .center-tabs {
-  .el-tabs__header {
+  /* .el-tabs__header {
     margin-bottom: 0 !important;
-  }
+  } */
   .el-tabs__item {
     width: 50%;
     text-align: center;