0.4.6

package.json

@@ -1,6 +1,6 @@
 {
     "name": "noob-mengyxu",
-    "version": "0.4.2",
+    "version": "0.4.6",
     "main": "index.ts",
     "module": "index.ts",
     "keywords": [

packages/base/data/modify-form.vue

@@ -6,8 +6,8 @@
                 <el-form-item :label="item.name || t(item.i18n)" :prop="item.code"
                     v-if="!modify || (modify && !item.noModify)">
                     <NoobSelect v-if="item.dict || item.maxValue" v-model="param[item.code]" :dict="item.dict"
-                        :max-value="item.maxValue" full :placeholder="t('rule.pleaseSelect') + (item.name || t(item.i18n))"
-                        :disabled="item.disabled" />
+                        :max-value="item.maxValue" full
+                        :placeholder="t('rule.pleaseSelect') + (item.name || t(item.i18n))" :disabled="item.disabled" />
                     <NoobDate v-else-if="item.date" v-model="param[item.code]" :formater="item.formater" full
                         :placeholder="t('rule.pleaseSelect') + (item.name || t(item.i18n))" :disabled="item.disabled" />
                     <slot v-else-if="item.slot" :name="item.code" />
@@ -17,8 +17,8 @@
             </template>
             <slot></slot>
             <el-form-item class="form-btns">
-                <NoobButton type="primary" @click="formConfirm">{{ t('base.confirm') }}</NoobButton>
-                <NoobButton type="info" @click="emit('cancel')">{{ t('base.cancel') }}</NoobButton>
+                <NoobButton type="primary" @click="formConfirm">{{ t(confirm) }}</NoobButton>
+                <NoobButton type="info" @click="emit('cancel')">{{ t(cancel) }}</NoobButton>
             </el-form-item>
         </el-form>
     </div>
@@ -60,6 +60,14 @@ const prop = defineProps({
         type: Array<any>(),
         default: [],
     },
+    confirm: {
+        type: String,
+        default: 'base.confirm'
+    },
+    cancel: {
+        type: String,
+        default: 'base.cancel'
+    }
 });
 const emit = defineEmits(["confirm", "cancel"]);
 const modifyForm = ref<FormInstance>();

packages/manage/common/login.vue

@@ -63,11 +63,12 @@ const loginConfirm = user => {
     param.password = md5(param.password);
     Api.pub.login(param).then(rsp => {
         if (rsp) {
-            state.size.headHeight = state.size.head + 'px';
-            state.size.asideWidth = state.size.aside + 'px';
-            commit("initSize");
-            dispatch("getMenus");
+            if (window.history.length <= 1) {
+                router.push('/');
+            } else {
                 router.back();
+            }
+            dispatch('login')
             document.removeEventListener('keyup', enter_up);
         }
     })

packages/manage/common/login2.vue

@@ -62,11 +62,8 @@ const loginConfirm = user => {
     param.password = md5(param.password);
     Api.pub.login(param).then(rsp => {
         if (rsp) {
-            state.size.headHeight = state.size.head + 'px';
-            state.size.asideWidth = state.size.aside + 'px';
-            commit("initSize");
-            dispatch("getMenus");
-            router.back();
+            router.push('/');
+            dispatch('login')
             document.removeEventListener('keyup', enter_up);
         }
     })
@@ -83,8 +80,6 @@ const login = () => {
 }
 
 const enter_up = (e) => {
-    console.log(e);
-    
     if (e.keyCode == 13 || e.keyCode == 100) {
         login();
     }

packages/manage/router/index.vue

@@ -161,8 +161,8 @@ body {
 .app-main {
     box-shadow: 2px 2px 5px 3px #e5e6eb;
     border-radius: 4px;
-    margin: 3px 0px 0px 3px !important;
-    padding: v-bind('state.size.mainPad') !important;
+    margin: 0px 0px 0px 3px !important;
+    padding: 0 !important;
     height: v-bind('state.size.mainHeight');
 }
 

plugs/api/base.ts

@@ -85,7 +85,7 @@ export const update = (url, role) => {
 
 export const deleteById = (url, id) => {
   return new Promise((resolve, reject) => {
-    delate(url + '/' + id).then(
+    delate(url, id).then(
       (rsp: any) => {
         if (rsp) {
           resolve(rsp);

plugs/api/public.ts

@@ -5,6 +5,7 @@ const urls = {
   login: 'public/login',
   logout: 'public/logout',
   menu: 'public/menu',
+  actions: 'public/actions',
 };
 
 export const getByCodes = (codes) => {
@@ -83,3 +84,19 @@ export const getMenus = () => {
     );
   });
 };
+export const getActions = (content) => {
+  return new Promise((resolve, reject) => {
+    get(urls.actions + '/' + content, null, true, true).then(
+      (rsp: any) => {
+        if (rsp) {
+          resolve(rsp);
+        } else {
+          resolve([]);
+        }
+      },
+      (err) => {
+        resolve([]);
+      }
+    );
+  });
+};

plugs/store/index.ts

@@ -1,6 +1,6 @@
 import { createStore as create } from 'vuex';
 import { Styles, Size } from '../config';
-import { getByCodes, getMenus, logout } from '../api/public';
+import { getByCodes, getMenus, logout, getActions } from '../api/public';
 import { mapping } from '../api/role';
 
 export class State {
@@ -15,6 +15,7 @@ export class State {
   roleRefresh = true;
   style = Styles.plain;
   size = Size.normal;
+  actions = [];
 }
 
 export class Actions {
@@ -55,6 +56,16 @@ export class Actions {
   getMenus = ({ state, commit }) => {
     getMenus().then((rsp) => commit('updateState', ['menus', rsp]));
   };
+  getMyActions = ({ state, commit }, content) => {
+    getActions(content).then((rsp) => commit('updateState', ['actions', rsp]));
+  };
+  login = (store) => {
+    const { state, commit } = store;
+    state.size.headHeight = state.size.head + 'px';
+    state.size.asideWidth = state.size.aside + 'px';
+    commit("initSize");
+    this.getMenus(store)
+  };
 }
 
 export class Mutations {

yarn.lock

@@ -2824,10 +2824,10 @@ electron-to-chromium@^1.4.284:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.356.tgz#b75a8a8c31d571f6024310cc980a08cd6c15a8c5"
   integrity sha512-nEftV1dRX3omlxAj42FwqRZT0i4xd2dIg39sog/CnCJeCcL1TRd2Uh0i9Oebgv8Ou0vzTPw++xc+Z20jzS2B6A==
 
-element-plus@2.2.20:
-  version "2.2.20"
-  resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.2.20.tgz#f4395c276c0945cc8dbb8e6ed4a8d97f173a1ca2"
-  integrity sha512-ludShd3f5kNRY4FLzeoNitLcwZ4qs2M/zwKeyeE7rUzZJAQ0BZtcT3SvZoEoBLmgxw9jHoonl4WIwon4UzhyRA==
+element-plus@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.4.0.tgz#e79249ac4c0a606d377c2f31ad553aa992286fe3"
+  integrity sha512-yJEa8LXkGOOgkfkeqMMEdeX/Dc8EH9qPcRuX91dlhSXxgCKKbp9tH3QFTOG99ibZsrN/Em62nh7ddvbc7I1frw==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.0.6"