kn-cli 1.0.63 → 1.0.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kn-cli",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -13,6 +13,7 @@
     "templates/template_admin/",
     "templates/template_oa/",
     "templates/template_offcial/",
+    "templates/template_oa_jwt/",
     "build"
   ],
   "bin": {

package/readme.md

@@ -81,6 +81,12 @@ module.exports = {
 ```
 
 # 更新日志
+* 1.0.65  
+  增加OA管理系统jwt授权的模板  
+  
+* 1.0.64  
+  oa模板的readme更新  
+  
 * 1.0.61  
   兼容windows下终端的编译  
 

package/src/create.js

@@ -25,6 +25,7 @@ module.exports=async ()=> {
         'pc管理系统',
         '官网',
         'OA管理系统',
+        'OA管理系统-KssoJwt授权'
         // '移动端H5活动(未开放)',
         // 'pc官网(未开放)',
         // 'pc管理系统',
@@ -39,6 +40,7 @@ module.exports=async ()=> {
       case 'pc管理系统':{templateName='template_admin'}break;
       case '官网':{templateName='template_offcial'}break;
       case 'OA管理系统':{templateName='template_oa'}break;
+      case 'OA管理系统-KssoJwt授权':{templateName='template_oa_jwt'}
 
     }
   }

package/templates/template_oa/public/src/components/IFrame/index.jsx

@@ -14,6 +14,9 @@ const Iframe=(props)=>{
         }
       }else if(e?.data?.msg==='link'){
         location.href=e.data.url;
+      }else if(e?.data?.msg==='server'){
+        const url = `${OA_KSSO_HOST}?target=${encodeURIComponent(location.href)}`;
+        location.href=url;
       }else{
         // console.log(e?.data);
       }

package/templates/template_oa/readme.md

@@ -4,7 +4,10 @@
 git仓库建立完毕后，执行`sh init.sh`  
 
 ### 本地调试  
-kn-cli --dev
+1、sh dev.sh  
+2、打开 `http://192.168.90.250:8886/` 才测试环境登录账号成功后将它的cookie的 oa_session 复制到本站cookie内  
+
+> 借助chrome-oa插件 https://gitlab.ops.kingnet.com/changx/chrome-plugin-oa-test-helper 可以在本站内右键直接将oa cookie导入 
 
 ### 生产环境部署    
 1. 向运维申请CICD环境,申请模板如下:   
@@ -35,6 +38,8 @@ kn-cli --dev
 3. 快速发布  
 4. 进入域名访问  
 
+> 注意需要在测试和生产环境的OA系统内 增加本站域名的跨域支持  
+
 
 
 ### 版本发布Tag

package/templates/template_oa/webpack.api.js

@@ -4,21 +4,25 @@ const configs = {
     API_HOST: '/api',
     OA_HOST: '/oaApi',
     OA_MENU_HOST:'//192.168.90.250:8020/oa-menu/?mock=1',
-    LOGIN_URL: 'http://192.168.90.250:8886'
+    LOGIN_URL: 'http://192.168.90.250:8886',
+    OA_KSSO_HOST:'http://192.168.90.250:8886/ksso/auto_redirect',
+
   },
   // cicd构建时研发环境
   dev: {
     API_HOST: 'http://dev-drama-admin-api.skitoon.com',
     OA_HOST: 'http://192.168.90.250:8886',
     OA_MENU_HOST:'//192.168.90.250:8020/oa-menu/',
-    LOGIN_URL: 'http://192.168.90.250:8886'
+    LOGIN_URL: 'http://192.168.90.250:8886',
+    OA_KSSO_HOST:'http://192.168.90.250:8886/ksso/auto_redirect',
   },
   // cicd构建时生产环境
   prod: {
     API_HOST: 'http://dev-drama-admin-api.skitoon.com',
     OA_HOST: 'https://oa.kingnet.com',
     OA_MENU_HOST:'//micro-front.kingnet.com/oa-menu/',
-    LOGIN_URL: 'https://oa.kingnet.com'
+    LOGIN_URL: 'https://oa.kingnet.com',
+    OA_KSSO_HOST:'https://oa.kingnet.com/ksso/auto_redirect',
   },
 };
 

package/templates/template_oa_jwt/.gitignore

@@ -0,0 +1,6 @@
+**/node_modules
+**/package-lock.json
+**/.DS_Store
+**/dist
+**/release
+

package/templates/template_oa_jwt/build.sh

@@ -0,0 +1,7 @@
+if [[ "$OSTYPE" =~ ^cygwin|msys$ ]]
+then
+  echo 'windows alias sh=source'
+  alias sh='source'
+fi
+export build_env=dev
+sh ./frontend_build.sh

package/templates/template_oa_jwt/cli.config.js

@@ -0,0 +1,30 @@
+
+module.exports = {
+  name:'template-oa-jwt',
+  registryType:'npm',//npm镜像源,taobao|npm
+  less:{
+    javascriptEnabled:true,//是否开启less js
+  },
+  rules:{
+    compileNpmPackage:['kn-hooks'],//需要参与编译的npm包
+  },
+  cssModule: (resourcePath) => {
+    console.log(resourcePath)
+    // antd.less编译的时候使用global模式
+    if (/antd.less$/i.test(resourcePath)) {
+      return 'global'
+    }
+    return "local";
+  },
+  devServer:{
+    // 不用本地IP，因为需要配跨域
+    // host:'0.0.0.0',//指定调试地址IP
+    port: 8534,
+    // useLocalIp: true,//是否使用本地IP地址代替localhost
+  }
+  // 自定义多入口
+  // entry:{
+  //   'home/index': 'src/jsx/home/index.jsx',
+  // },
+  // copyFolder:['images','plugins'],//完整复制的文件夹
+};

package/templates/template_oa_jwt/dev.sh

@@ -0,0 +1,89 @@
+if [ -d "${HOME}/.nvm/" ]
+then
+  . ${HOME}/.nvm/nvm.sh
+fi
+
+node_version="v16.18.0"
+
+checkNode(){
+  for line in `node -v` 
+  do
+  if [ $line != $node_version ]
+  then
+    echo "change Node from $line to $node_version"
+    nvm use $node_version
+    ret=$?
+    if [ $ret != 0 ]
+    then
+      echo "Please run nvm install $node_version"
+      exit 3
+    else
+      return 0
+    fi
+  else
+    return 0
+  fi
+  done
+}
+
+checkResult(){
+  ret=$?
+  if [ $ret != 0 ]
+  then
+    echo "[$1]执行失败"
+    exit 2
+    return 0
+  else
+    echo "[$1]执行成功"
+    return 0
+  fi
+}
+
+
+
+
+# 智能检测并安装/升级CLI的版本
+checkKnCli(){
+  # dev只需要保持安装了就行，版本通过开发自己控制
+  if ! [ -x "$(command -v kn-cli)" ]
+  then
+    echo "安装kn-cli"
+    npm i kn-cli -g
+    return 0
+  fi
+  # for line in `npm view kn-cli version` 
+  # do
+  #   for line2 in `kn-cli -v` 
+  #   do
+  #   if [ $line != $line2 ]
+  #   then
+  #     echo "升级kn-cli"
+  #     npm upgrade kn-cli -g
+  #     return 0
+  #   fi
+  #   done
+  # done
+  # return 0
+}
+
+
+
+build(){
+  npm config delete registry -g
+  npm config delete registry
+
+  checkKnCli
+  checkResult "检查kn-cli"
+  # dev_mode=watch 代表使用 webpack -w模式将文件编译后生成到磁盘上进行监听更新
+  # 默认情况下为 webpack-dev-server模式，将资源编译后放入内存监听
+  # export dev_mode=watch
+
+  kn-cli --dev
+  checkResult "kn-cli --dev"
+}
+
+checkNode
+checkResult "检查node"
+
+build
+checkResult "build"

package/templates/template_oa_jwt/frontend_build.sh

@@ -0,0 +1,88 @@
+if [ -d "${HOME}/.nvm/" ]
+then
+  . ${HOME}/.nvm/nvm.sh
+fi
+
+export mock=0
+export noSkipNpmInstall=1
+node_version="v16.18.0"
+
+checkNode(){
+  for line in `node -v` 
+  do
+  if [ $line != $node_version ]
+  then
+    echo "change Node from $line to $node_version"
+    nvm use $node_version
+    ret=$?
+    if [ $ret != 0 ]
+    then
+      echo "Please run nvm install $node_version"
+      exit 3
+    else
+      return 0
+    fi
+  else
+    return 0
+  fi
+  done
+}
+
+
+checkKnCli(){
+  if ! [ -x "$(command -v kn-cli)" ]
+  then
+    npm i kn-cli -g
+    return 0
+  fi
+  return 0
+}
+
+
+checkResult(){
+  ret=$?
+  if [ $ret != 0 ]
+  then
+    echo "[$1]执行失败"
+    exit 2
+    return 0
+  else
+    echo "[$1]执行成功"
+    return 0
+  fi
+}
+
+build(){
+  npm config delete registry -g
+  npm config delete registry
+
+  checkKnCli
+  checkResult "检查kn-cli"
+
+  # npm i kn-cli@1.0.2 -g
+  # checkResult "npm kn-cli"
+
+  kn-cli --build
+  checkResult "kn-cli --build"
+
+  rm -rf release
+  checkResult "清理release"
+
+  mv public/dist release/
+  checkResult "打包结果同步至release"
+
+  cp public/favicon.png release/favicon.png
+  cp public/favicon.ico release/favicon.ico
+  checkResult "cp favicon"
+
+}
+
+checkNode
+checkResult "检查node"
+
+
+build
+checkResult "build"
+
+
+

package/templates/template_oa_jwt/init/prepare-commit-msg

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# 查询当前分支
+NAME=[$(git branch | grep '*' | grep -Eo "\S+$")]
+echo "$NAME"': '$(cat "$1") > "$1"

package/templates/template_oa_jwt/init.sh

@@ -0,0 +1,33 @@
+checkResult(){
+  ret=$?
+  if [ $ret != 0 ]
+  then
+    echo "[$1]执行失败"
+    exit 2
+    return 0
+  else
+    echo "[$1]执行成功"
+    return 0
+  fi
+}
+
+echo "安装git提交钩子脚本 cp prepare-commit-msg ./.git/hooks/prepare-commit-msg"  
+ls -A ./.git/
+ret=$?
+if [ $ret != 0 ]
+then
+  echo "缺少.git文件夹"
+  exit 2
+fi
+
+ls -A ./.git/hooks/
+ret=$?
+if [ $ret != 0 ]
+then
+  mkdir ./.git/hooks
+  checkResult '创建hooks文件夹'
+fi
+cp ./init/prepare-commit-msg ./.git/hooks/prepare-commit-msg
+checkResult '复制prepare-commit-msg'
+chmod u+x ./.git/hooks/prepare-commit-msg
+checkResult '权限变更prepare-commit-msg'

package/templates/template_oa_jwt/jsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "paths": {
+      "@/*": ["./public/src/*"]
+    }
+  },
+}

package/templates/template_oa_jwt/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "template-oa-jwt",
+  "version": "1.0.0",
+  "main": "lib/index",
+  "scripts": {
+    "clean": "rm -rf ./dist"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "antd": "~4.24.8",
+    "axios": "~1.1.3",
+    "js-uuid": "^0.0.6",
+    "kn-hooks": "~0.0.30",
+    "moment": "~2.29.4",
+    "react": "~17.0.2",
+    "react-dom": "~17.0.2",
+    "react-router": "~6.3.0",
+    "react-router-dom": "~6.3.0",
+    "unstated-next": "~1.1.0",
+    "vconsole": "~3.9.5"
+  },
+  "engines": {
+    "node": "16.18.0"
+  }
+}

package/templates/template_oa_jwt/public/404.html

@@ -0,0 +1,26 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+<title>404</title>
+<style>
+	body{
+		background-color:#444;
+		font-size:14px;
+	}
+	h3{
+		font-size:60px;
+		color:#eee;
+		text-align:center;
+		padding-top:30px;
+		font-weight:normal;
+	}
+</style>
+</head>
+
+<body>
+<h3>404，您请求的文件不存在!</h3>
+</body>
+</html>

package/templates/template_oa_jwt/public/index.html

@@ -0,0 +1,44 @@
+<!doctype html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport"
+    content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no,viewport-fit=cover" />
+  <meta name="format-detection" content="telephone=no,email=no,adress=no">
+  <meta name="apple-touch-fullscreen" content="yes">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+  <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
+  <link rel="icon" href="favicon.png" type="image/png">
+  <title>管理系统</title>
+</head>
+
+<body>
+  <div id="main-view" />
+  <script src="//activity-static.kingnet.com/js/knFeishu.js?v=20230504" type="text/javascript"></script>
+  <script>
+    var docEl = document.documentElement;
+    function setRemUnit(type) {
+      let w = Math.max(window.innerWidth, docEl.clientWidth, docEl.offsetWidth);
+      let defaultWidth = 375;//填入设计稿上的宽度
+      w = w > defaultWidth ? defaultWidth : w;
+      var rem = w / defaultWidth * 100;
+      docEl.style.fontSize = rem + 'px'
+    }
+    setRemUnit('init');
+    if (document.readyState === 'interactive') {
+      setRemUnit('init');
+    } else {
+      window.addEventListener('DOMContentLoaded', function () {
+        setRemUnit('init');
+      })
+    }
+    window.addEventListener("resize", function () {
+      setRemUnit('resize');
+    });
+  </script>
+</body>
+
+</html>

package/templates/template_oa_jwt/public/src/_antd.less

@@ -0,0 +1,216 @@
+@import '~antd/dist/antd.less';
+
+// 这里可以重写antd的主题样式变量，参考 https://4x.ant.design/docs/react/customize-theme-cn
+
+@primary-color:#2a96fc;
+
+@checkbox-size:18px;
+@height-base: 28px;
+@btn-height-base: 28px;
+@input-height-base: 28px;
+@font-size-base: 14px;
+@border-radius-base: 4px;
+
+@pagination-item-size:26px;
+
+
+
+:global{
+  @colorTable: #32a3fa;
+
+  .ant-upload-list-picture-card .ant-upload-list-item-info:before{
+    left:0;
+  }
+  //Anchor
+  .ant-anchor-link{
+    position: static !important;
+  }
+  .ant-anchor-ink-ball{
+    width:1px;
+    border-radius: 0;
+    border-width: 1px;
+    height:19px;
+    margin-top:-5px;
+  }
+  .ant-anchor-wrapper{
+    box-shadow: 3px 4px 5px #ccc;
+    padding:10px 5px
+  }
+
+  //Table
+  .ant-table tbody > tr > td {
+    padding:10px;
+  }
+  .ant-table-tbody>.ant-table-row:nth-child(even) td {
+    background: #f9fafa
+  }
+  .ant-table thead > tr > th {
+    padding:0 8px;
+  }
+
+  .ant-table-content{
+    thead>tr>th{
+      height: 45px;
+      font-weight: 700;
+      color: @colorTable;
+      font-weight: 500;
+      background: #f9faf9!important;
+      background: -webkit-linear-gradient(top, #f9faf9 0, #f0f0ef 100%)!important;
+    }
+    .ant-table-cell{
+      font-size: 14px;
+      a[data-oper]{
+        margin-right: 10px;
+        &:last-child{
+          margin-right: 0;;
+        }
+        &[data-edit]{
+          color:@colorTable;
+          font-size: inherit;
+        }
+        &[data-view]{
+          color:@colorTable;
+          font-size: inherit;
+        }
+        &[data-cancel]{
+          color:#2a96fc;
+          font-size: inherit;
+        }
+        &:disabled{
+          color:#ccc;
+        }
+      } 
+    }
+  }
+
+  //Pagination
+  .ant-pagination-item-active{
+    background-color: #108ee9;
+    a,
+    &:hover a,
+    &:focus a{
+      color:#fff;
+    }
+  }
+  .ant-pagination-next,
+  .ant-pagination-prev{
+    svg{font-size:10px;padding-bottom:2px;}
+  }
+
+  //Input
+  .ant-input-group-addon{
+    border:0;
+    background:transparent;
+  }
+
+
+
+  span.anticon.anticon-down.ant-input-number-handler-down-inner *,
+  span.anticon.anticon-up.ant-input-number-handler-up-inner *{
+    font-size:12px;
+  }
+
+
+  
+
+  //Checkbox
+  .ant-checkbox-inner ,
+  .ant-checkbox-checked:after{
+    border-radius:0;
+  }
+
+  .ant-checkbox-checked .ant-checkbox-inner{
+    background-color:#108ee9;
+    border-color:#108ee9;
+  }
+  .ant-checkbox-group-item {
+    // margin-bottom: .08rem;
+  }
+  .ant-checkbox + span {font-weight:700;font-size:12px;}
+
+  .ant-checkbox-wrapper+.ant-checkbox-wrapper{
+    margin-left:0;
+  }
+  .ant-checkbox-wrapper:not(:last-child){
+    margin-right:8px;
+  }
+
+  //Select
+  .ant-select-arrow .anticon.anticon-down,
+  .ant-select-open .ant-select-arrow .anticon.anticon-down {
+    transform-origin: 50% 30% ;
+    transition:none;
+  }
+  .ant-select-selection-search-input{
+    border-radius: 4px;
+  }
+  .ant-select-multiple .ant-select-selection-item-remove svg{
+    font-size:8px;
+    top:-2px;
+  }
+  .ant-select-arrow .anticon > svg {
+    font-size:8px;
+    top:1px;
+  }
+
+
+
+
+
+
+  .ant-btn.ant-btn-primary[data-submit] {
+    color: #fff;
+    background-color: #3ab925;
+    border-color: #3ab925;
+  }
+  .ant-btn.ant-btn-primary{
+    // background:#2a96fc;
+    &:hover{
+      opacity: .9;
+    }
+  }
+
+  //Upload
+  .ant-upload-list-item-card-actions{
+    right:-14px;
+  }
+  .ant-upload-list-item-name{
+    color:#219efd;
+  }
+  .ant-upload-list{
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+  }
+
+  //Form.Item
+  //取消Form.Item下面会空一行的问题
+  .ant-form-item{
+    margin-bottom:0;
+  }
+
+  //label占1rem,控件占2.5rem的样式
+  .FORM_STYLE_08_25{
+    .ant-form-item{
+      width:370px;
+      .ant-form-item-label{
+        flex: 0 0 90px
+      }
+      .ant-form-item-control{
+        flex:1 1 auto;
+      }
+    }
+  }
+  .FORM_STYLE_1_25{
+    .ant-form-item{
+      width:350px;
+      .ant-form-item-label{
+        flex: 0 0 100px;
+      }
+      .ant-form-item-control{
+        flex:1 1 auto;
+      }
+    }
+  }
+
+}