kz-ui-base 1.0.87 → 1.0.89

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/common/src/views/login.vue +33 -24
  2. package/common/src/views/tenantLogin.vue +27 -19
  3. package/list-base-page/listBasePageTs.vue +0 -1
  4. package/package.json +1 -1
package/common/src/views/login.vue CHANGED
@@ -114,7 +114,10 @@
114
114
  </el-form>
115
115
  <!-- 底部 -->
116
116
  <div class="el-login-footer">
117
- <span>Copyright © 2021-{{ new Date().getFullYear() }} kezhitt.cn All Rights Reserved.</span>
117
+ <span
118
+ >Copyright © 2021-{{ new Date().getFullYear() }} kezhitt.cn All Rights
119
+ Reserved.</span
120
+ >
118
121
  </div>
119
122
  </div>
120
123
  </template>
@@ -161,6 +164,7 @@ export default {
161
164
  redirect: undefined,
162
165
 
163
166
  imgs: [],
167
+ layoutSetting:undefined
164
168
  };
165
169
  },
166
170
  watch: {
@@ -174,31 +178,36 @@ export default {
174
178
  created() {
175
179
  this.$store.dispatch("LogOut").then(() => {
176
180
  this.$store.dispatch("tagsView/delAllViews");
177
- localStorage.clear();
178
- removeToken();
179
- let enterpriseName = Cookies.get("enterpriseName");
180
- var webConfig = getWebConfig();
181
- if (webConfig) {
182
- localStorage.setItem("configRes", JSON.stringify(webConfig));
183
- if (!enterpriseName) {
184
- if (webConfig.tenantName) {
185
- this.loginForm.enterpriseName = webConfig.tenantName;
186
- } else {
187
- // this.loginForm.enterpriseName = "mom";
188
- }
189
- }
190
- if (this.$route.query.tenantName) {
191
- this.loginForm.enterpriseName = this.$route.query.tenantName;
192
- }
193
- if (webConfig.bgImages) {
194
- this.imgs = webConfig.bgImages;
195
- }
196
- if (webConfig.tenantSystemName) {
197
- this.loginForm.title = webConfig.tenantSystemName;
181
+ this.layoutSetting = JSON.parse(localStorage.getItem("layout-setting"));
182
+ localStorage.clear();
183
+ localStorage.setItem(
184
+ "layout-setting",
185
+ JSON.stringify(this.layoutSetting)
186
+ );
187
+ removeToken();
188
+ let enterpriseName = Cookies.get("enterpriseName");
189
+ var webConfig = getWebConfig();
190
+ if (webConfig) {
191
+ localStorage.setItem("configRes", JSON.stringify(webConfig));
192
+ if (!enterpriseName) {
193
+ if (webConfig.tenantName) {
194
+ this.loginForm.enterpriseName = webConfig.tenantName;
195
+ } else {
196
+ // this.loginForm.enterpriseName = "mom";
198
197
  }
199
198
  }
200
- this.getCode();
201
- this.getCookie();
199
+ if (this.$route.query.tenantName) {
200
+ this.loginForm.enterpriseName = this.$route.query.tenantName;
201
+ }
202
+ if (webConfig.bgImages) {
203
+ this.imgs = webConfig.bgImages;
204
+ }
205
+ if (webConfig.tenantSystemName) {
206
+ this.loginForm.title = webConfig.tenantSystemName;
207
+ }
208
+ }
209
+ this.getCode();
210
+ this.getCookie();
202
211
  });
203
212
  },
204
213
  methods: {
package/common/src/views/tenantLogin.vue CHANGED
@@ -114,7 +114,10 @@
114
114
  </el-form>
115
115
  <!-- 底部 -->
116
116
  <div class="el-login-footer">
117
- <span>Copyright © 2021-{{ new Date().getFullYear() }} kezhitt.cn All Rights Reserved.</span>
117
+ <span
118
+ >Copyright © 2021-{{ new Date().getFullYear() }} kezhitt.cn All Rights
119
+ Reserved.</span
120
+ >
118
121
  </div>
119
122
  </div>
120
123
  </template>
@@ -160,6 +163,7 @@ export default {
160
163
  redirect: undefined,
161
164
 
162
165
  imgs: [],
166
+ layoutSetting:undefined
163
167
  };
164
168
  },
165
169
  watch: {
@@ -173,24 +177,28 @@ export default {
173
177
  created() {
174
178
  this.$store.dispatch("LogOut").then(() => {
175
179
  this.$store.dispatch("tagsView/delAllViews");
176
- localStorage.clear();
177
- removeToken();
178
- this.axios.get("/config.json").then((res) => {
179
- // if (res.data.tenantName) {
180
- // this.loginForm.enterpriseName = res.data.tenantName;
181
- // } else {
182
- // this.loginForm.enterpriseName = "administrator";
183
- // }
184
- if (res.data.bgImages) {
185
- this.imgs = res.data.bgImages;
186
- }
187
- if (res.data.tenantSystemName) {
188
- this.loginForm.title = res.data.tenantSystemName;
189
- }
190
- });
191
- this.getCode();
192
- this.getCookie();
193
-
180
+ this.layoutSetting = JSON.parse(localStorage.getItem("layout-setting"));
181
+ localStorage.clear();
182
+ localStorage.setItem(
183
+ "layout-setting",
184
+ JSON.stringify(this.layoutSetting)
185
+ );
186
+ removeToken();
187
+ this.axios.get("/config.json").then((res) => {
188
+ // if (res.data.tenantName) {
189
+ // this.loginForm.enterpriseName = res.data.tenantName;
190
+ // } else {
191
+ // this.loginForm.enterpriseName = "administrator";
192
+ // }
193
+ if (res.data.bgImages) {
194
+ this.imgs = res.data.bgImages;
195
+ }
196
+ if (res.data.tenantSystemName) {
197
+ this.loginForm.title = res.data.tenantSystemName;
198
+ }
199
+ });
200
+ this.getCode();
201
+ this.getCookie();
194
202
  });
195
203
  },
196
204
  methods: {
package/list-base-page/listBasePageTs.vue CHANGED
@@ -208,7 +208,6 @@
208
208
  display: inline-block;
209
209
  width: 100%;
210
210
  z-index: 1000;
211
- margin-top: -15px;
212
211
  margin-bottom: 0;
213
212
  top: 55px;
214
213
  right: 0;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kz-ui-base",
3
- "version": "1.0.87",
3
+ "version": "1.0.89",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {