kn-cli 1.0.94 → 1.0.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kn-cli",
-  "version": "1.0.94",
+  "version": "1.0.96",
   "description": "",
   "main": "index.js",
   "scripts": {

package/readme.md

@@ -140,6 +140,9 @@ report
 
 
 # 更新日志
+* 1.0.96  
+修正工程package.json内devDependencies部分内容没有被同步的问题  
+
 * 1.0.92  
 所有模版文件夹首字母大写问题修正  
 

package/src/build.js

@@ -164,6 +164,8 @@ module.exports= async (options={})=> {
             webpackPackage= require(tempWebpackPackagePath);
             // 将项目文件夹下的package.json内dependencies部分合并入 _webpack/package.json
             webpackPackage.dependencies = {...webpackPackage.dependencies ,...projectPackage.dependencies};
+            webpackPackage.devDependencies = {...webpackPackage.devDependencies ,...projectPackage.devDependencies};
+
             // 将package配置写回_webpack/package.json内
             jsonfile.writeFile(tempWebpackPackagePath,webpackPackage,{spaces: 2, EOL: '\r\n' },function(err){
               if(err){

package/templates/template_admin/public/src/components/menu/topMenu/index.jsx

@@ -65,7 +65,10 @@ const TopMenu=()=>{
 
   // 推出登录
   const onAvatarClick = (key)=>{
-    if (key === 'logout') {
+    if(key==='user'){
+      app.updateUserInfo();
+    }
+    else if (key === 'logout') {
       app.logout();
     }else if(key=='relogin'){
       navigate('/superAdminLogin')
@@ -105,7 +108,7 @@ const TopMenu=()=>{
         <Dropdown menu={{items:[
             {
               key:'user',
-              label:<span onClick={onAvatarClick.bind(this,'user')}><UserOutlined />用户名</span>
+              label:<span onClick={onAvatarClick.bind(this,'user')}><UserOutlined />刷新用户权限</span>
             },
             {
               key:'relogin',

package/templates/template_admin/public/src/mock/demo.js

@@ -108,6 +108,7 @@ async function GET_DETAIL(req){
 }
 
 
+let GET_USER_INFO_COUNT=0;
 let USER_INFO={
   authorities:['leader','admin'],
   realName:'cx',
@@ -117,12 +118,18 @@ let USER_INFO={
   token:'token',
   username:'fanta',
 };
+function _GET_USER_INFO(){
+  let req = {...USER_INFO};
+  req.authorities = GET_USER_INFO_COUNT%2==0?['leader']:['leader','admin'];
+  GET_USER_INFO_COUNT++;
+  return req;
+}
 async function GET_USER_INFO(req){
   await waitTime();
 
   return {
     [RESPONSE_STRUCT.CODE]:0,
-    [RESPONSE_STRUCT.DATA]:USER_INFO,
+    [RESPONSE_STRUCT.DATA]:_GET_USER_INFO(),
     [RESPONSE_STRUCT.MSG]:''
   }
 }
@@ -133,7 +140,7 @@ async function Login(req,res){
   await waitTime();
   return {
     [RESPONSE_STRUCT.CODE]:0,
-    [RESPONSE_STRUCT.DATA]:USER_INFO,
+    [RESPONSE_STRUCT.DATA]:_GET_USER_INFO(),
     [RESPONSE_STRUCT.MSG]:''
   }
 }
@@ -142,7 +149,7 @@ async function KssoLogin(req,res){
   await waitTime();
   return {
     [RESPONSE_STRUCT.CODE]:0,
-    [RESPONSE_STRUCT.DATA]:USER_INFO,
+    [RESPONSE_STRUCT.DATA]:_GET_USER_INFO(),
     [RESPONSE_STRUCT.MSG]:''
   }
 }

package/templates/template_admin/public/src/provider/app.jsx

@@ -23,7 +23,7 @@ import {jumpUrl} from '@/utils';
  * @property {(user:object)=>void} setUser - 注销病退回登录界面
  * @property {object} user - 注销病退回登录界面
  * @property {()=>Promise<boolean>} kssoLogin - 触发ksso登录
- * 
+ * @property {()=>Promise} updateUserInfo - 更新用户信息
  */
 
 
@@ -144,7 +144,7 @@ const useApp=() =>{
       kssoLogin,
       updateUserInfo
     }
-  },[loading,nav,setNav,user,setUser,isLogin,kssoLogin,login]);
+  },[loading,nav,setNav,user,setUser,isLogin,kssoLogin,login,updateUserInfo]);
 
   return action
 }