kn-cli 1.0.131 → 1.0.134

package/build/shellUtil.sh

@@ -5,11 +5,11 @@ checkResult(){
   ret=$?
   if [ $ret != 0 ]
   then
-    printf "\e[40;31m [$1] 执行失败 \e[0m\n"
+    printf "[$(TZ='Asia/Shanghai' date +%Y-%m-%d\ %H:%M:%S)]\e[40;31m [$1] 执行失败 \e[0m\n"
     exit 2
     return 0
   else
-    printf "\e[40;32m [$1] 执行成功\e[0m \n"
+    printf "[$(TZ='Asia/Shanghai' date +%Y-%m-%d\ %H:%M:%S)]\e[40;32m [$1] 执行成功\e[0m \n"
     return 0
   fi
 }

package/build/start.sh

@@ -58,7 +58,8 @@ setNpmSetup(){
     
     npm config delete registry -g
     npm config delete registry
-    
+
+
     # 解决postcss在引用puppeteer包时，下载chrome内核引起的安装失败问题
     # 报错内容:npm ERR! ERROR: Failed to download Chromium r686378! Set "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD" env variable to skip download.
     export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
@@ -99,7 +100,7 @@ setNpmSetup(){
       npm config set loglevel warn
       npm install
     fi
-    checkResult "npm install $(TZ='Asia/Shanghai' date +%Y-%m-%d\ %H:%M:%S)"
+    checkResult "npm install"
   else
     showWarn "跳过 npm install"
   fi

package/build/vite.config.js

@@ -131,7 +131,7 @@ export default defineConfig({
         // 允许访问项目源码目录
         dirname,
         // 允许访问 Vite 配置所在的目录（为了读取 node_modules 等）
-        path.resolve(__dirname)
+        webpackPath
       ]
     },
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kn-cli",
-  "version": "1.0.131",
+  "version": "1.0.134",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -11,6 +11,7 @@
     "src/",
     "templates/template_app/",
     "templates/template_admin/",
+    "templates/template_admin_antd5/",
     "templates/template_oa/",
     "templates/template_offcial/",
     "templates/template_oa_jwt/",

package/src/create.js

@@ -24,6 +24,7 @@ module.exports=async ()=> {
       choices:[
         '移动端APP',
         'pc管理系统',
+        'pc管理系统(antd5)',
         '官网',
         'OA管理系统',
         'OA管理系统-KssoJwt授权'
@@ -39,6 +40,7 @@ module.exports=async ()=> {
     switch(answer.type){
       case '移动端APP':{templateName='template_app'}break;
       case 'pc管理系统':{templateName='template_admin'}break;
+      case 'pc管理系统(antd5)':{templateName='template_admin_antd5'}break;
       case '官网':{templateName='template_offcial'}break;
       case 'OA管理系统':{templateName='template_oa'}break;
       case 'OA管理系统-KssoJwt授权':{templateName='template_oa_jwt'}

package/templates/template_admin_antd5/.vscode/settings.json

@@ -0,0 +1,28 @@
+{
+  "editor.tabSize": 2,
+  "editor.indentSize": "tabSize",
+  "files.exclude": {
+    "**/node_modules": true,
+  },
+  "search.exclude": {
+    "**/release": true,
+  },
+  // 控制折行的方式
+  "editor.wordWrap": "off",
+  // 控制树缩进(以像素为单位)。
+  "workbench.tree.indent": 16,
+  // jsx中使用单引号
+  "prettier.jsxSingleQuote": true,
+  // 代码块的开和闭合处会有一条引导线连接起来
+  "editor.guides.bracketPairs": true,
+  // 右侧缩略图宽度
+  "editor.minimap.maxColumn": 60,
+  // 滚轮缩放字体
+  "editor.mouseWheelZoom": true,
+  // 控制编辑器是否可以滚动到最后一行之后。
+  "editor.scrollBeyondLastLine": false,
+    // 代码可折叠的情况下，折叠符号一直展示
+  "editor.showFoldingControls": "always",
+  "workbench.list.smoothScrolling": true,
+  "workbench.tree.renderIndentGuides": "always",
+}

package/templates/template_admin_antd5/build.sh

@@ -0,0 +1,8 @@
+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_admin_antd5/cli.config.js

@@ -0,0 +1,35 @@
+
+module.exports = {
+  name:'admin_antd5',
+  version:'1.0.0',
+  registryType:'npm',//npm镜像源,taobao|npm
+  less:{
+    javascriptEnabled:true,//是否开启less js
+  },
+  resolve:{
+    modules:['node_modules']
+  },
+  rules:{
+    compileNpmPackage:['kn-hooks'],//需要参与编译的npm包
+  },
+  cssModule: (resourcePath) => {
+    console.log(resourcePath)
+    // antd.less编译的时候使用global模式
+    if (/antd.less$/i.test(resourcePath)) {
+      return 'global'
+    }
+    return "local";
+  },
+  devServer:{
+    host:'0.0.0.0',//指定调试地址IP
+    port:8080,
+  },
+  sourcemap:{
+    local:true
+  },
+  // 自定义多入口
+  // entry:{
+  //   'home/index': 'src/jsx/home/index.jsx',
+  // },
+  // copyFolder:['images','plugins'],//完整复制的文件夹
+};

package/templates/template_admin_antd5/dev.sh

@@ -0,0 +1,33 @@
+if [ -d "${HOME}/.nvm/" ]
+then
+  . ${HOME}/.nvm/nvm.sh
+fi
+
+. ./shellUtil.sh
+
+# 如果要使用webpack调试，改为16.18.0
+node_version="v20.19.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
+
+  # 如果需要输出详细日志
+  # export build_log_level=all
+
+  kn-cli --dev
+  checkResult "kn-cli --dev"
+}
+
+checkNode "${node_version}"
+checkResult "检查node"
+
+build
+checkResult "build"

package/templates/template_admin_antd5/frontend_build.sh

@@ -0,0 +1,48 @@
+if [ -d "${HOME}/.nvm/" ]
+then
+  . ${HOME}/.nvm/nvm.sh
+fi
+. ./shellUtil.sh
+
+export mock=0
+export noSkipNpmInstall=1
+node_version="v16.18.0"
+
+
+
+build(){
+  npm config delete registry -g
+  npm config delete registry
+
+  rm -rf release
+  checkResult "清理release"
+
+  checkKnCli
+  checkResult "检查kn-cli"
+
+  # npm i kn-cli@1.0.2 -g
+  # checkResult "npm kn-cli"
+
+  # 如果需要输出详细日志
+  # export build_log_level=all
+
+  kn-cli --build
+  checkResult "kn-cli --build"
+
+  mv public/dist release/
+  checkResult "打包结果同步至release"
+
+  cp public/favicon.png release/favicon.png
+  cp public/favicon.ico release/favicon.ico
+  checkResult "复制favicon"
+}
+
+checkNode "${node_version}"
+checkResult "检查node"
+
+
+build
+checkResult "build"
+
+
+

package/templates/template_admin_antd5/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_admin_antd5/init.sh

@@ -0,0 +1,24 @@
+
+. ./shellUtil.sh
+
+
+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_admin_antd5/jsconfig.json

@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "ignoreDeprecations":"6.0",
+    "noImplicitAny":false,
+    "strict": false,
+    "baseUrl": ".",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": ["dom", "ES2021"],
+    "allowJs":true,
+    "checkJs": true, 
+    "jsx": "react",
+    "paths": {
+      "@/*": ["./public/src/*"]
+    },
+  }
+}

package/templates/template_admin_antd5/package.json

@@ -0,0 +1,27 @@
+{
+  "name": "admin_antd5",
+  "version": "1.0.0",
+  "main": "lib/index",
+  "scripts": {
+    "clean": "rm -rf ./dist"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "ali-oss": "~6.20.0",
+    "antd": "~5.22.0",
+    "axios": "~1.1.3",
+    "jszip": "~3.10.1",
+    "kn-hooks": "~1.0.2",
+    "moment": "~2.29.4",
+    "react": "~18.3.0",
+    "react-dom": "~18.3.0",
+    "react18-json-view": "~0.2.9",
+    "react-router": "~6.3.0",
+    "react-router-dom": "~6.3.0",
+    "unstated-next": "~1.1.0",
+    "vconsole": "~3.9.5"
+  },
+  "devDependencies": {
+    "mockjs-async": "~0.0.5"
+  }
+}

package/templates/template_admin_antd5/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_admin_antd5/public/index.html

@@ -0,0 +1,48 @@
+<!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 data-debug-layout>
+  <div id="main-view" />
+  <script>
+    var docEl = document.documentElement;
+    function setRemUnit(type) {
+      let w = Math.max(window.innerWidth, docEl.clientWidth, docEl.offsetWidth);
+      let defaultWidth = 1440;//填入设计稿上的宽度
+      let minWidth=1364;
+      let maxWidth=1440;
+      // w = w > defaultWidth ? defaultWidth : w;
+      w = w < minWidth ? minWidth :w;
+      w = w > maxWidth ? maxWidth :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_admin_antd5/public/src/_antd.less

@@ -0,0 +1,37 @@
+// @import '~antd/dist/antd.less';
+@import '_mixin.module.less';
+
+
+// 这里可以重写antd的主题样式变量，参考 https://4x.ant.design/docs/react/customize-theme-cn
+@primary-color:#0974F2;
+@table-header-bg:#F5F8FF;
+@btn-border-radius-base:4px;
+@modal-border-radius:8px;
+
+:global{
+  .ant-form-inline{
+    row-gap: 8px;
+  }
+  .ant-menu-item *{
+    .no-select;
+  }
+  .ant-badge-multiple-words{
+    padding:0px 4PX 0 2PX;
+  }
+  .ant-select-selection-overflow{
+    column-gap: 6PX;
+  }
+
+  .ant-badge{
+    letter-spacing: -1PX;
+  }
+  .ant-form-horizontal .ant-form-item{
+    margin-bottom: 16PX;
+  }
+  .ant-tabs-tab-btn{
+    .no-select;
+  }
+  .ant-form-item-label{
+    .no-select;
+  }
+}

package/templates/template_admin_antd5/public/src/_mixin.module.less

@@ -0,0 +1,79 @@
+
+
+.no-wrap{
+  flex-wrap: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.no-select{
+  -webkit-touch-callout:none;
+  -webkit-user-drag:none;
+  -webkit-user-select:none;
+  -moz-user-select:none;
+  -ms-user-select:none;
+  user-select:none;
+}
+
+.scrollBar{
+  &::-webkit-scrollbar{
+    width:3px;//竖向滚动条宽度
+    height: 3px;//横向滚动条高度
+    display:block;//强制一直显示
+  }
+  //整个滚动条的轨道
+  &::-webkit-scrollbar-track
+  {
+    background-color: #f2f2f2;//整个滚动条背景颜色
+  }
+  //滚动条当前可拖动的bar的样式
+  &::-webkit-scrollbar-thumb{
+    background-color: #acacac;
+  }
+}
+
+
+.scrollBarLarge{
+
+  &::-webkit-scrollbar{
+    width:6px;//竖向滚动条宽度
+    height: 6px;//横向滚动条高度
+    display:block;//强制一直显示
+  }
+  //整个滚动条的轨道
+  &::-webkit-scrollbar-track
+  {
+    background-color: transparent;//整个滚动条背景颜色
+  }
+  //滚动条当前可拖动的bar的样式
+  &::-webkit-scrollbar-thumb{
+    background-color: rgba(0,0,0,0.15);
+    border-radius: 5px 5px 5px 5px;
+
+  }
+}
+
+
+.scrollBarDark{
+  &::-webkit-scrollbar{
+    width:3px;//竖向滚动条宽度
+    height: 3px;//横向滚动条高度
+    display:block;//强制一直显示
+  }
+  //整个滚动条的轨道
+  &::-webkit-scrollbar-track
+  {
+    background-color: #acacac22;//整个滚动条背景颜色
+  }
+  //滚动条当前可拖动的bar的样式
+  &::-webkit-scrollbar-thumb{
+    background-color: #f2f2f2;
+  }
+}
+
+.hideScrollBar{
+  &::-webkit-scrollbar {
+    display: none;
+  }
+}

package/templates/template_admin_antd5/public/src/_reset.module.less

@@ -0,0 +1,134 @@
+
+@import '~@/assets/iconfont/iconfont.module.less';
+@import './_variable.module.less';
+
+:global {
+  html{
+    // ios webview 进入后高度不正确的问题
+    background-color: white;   
+    width:100vw;
+    height: 100%;
+    // height:100vh;
+    padding:0;//var(--safeTop) var(--safeRight) var(--safeBottom) var(--safeLeft);
+    overflow:hidden;
+  }
+
+  body{
+    background-color: #f2f2f2;    
+    width:100%;
+    height:100%;
+    overflow: auto;
+  }
+
+  #main-view {
+    background-color: #f2f2f2;    
+    width:100%;
+    height:100%;
+    position: relative;
+    overflow: hidden;
+  }
+
+
+  u {
+    font-weight: inherit;
+  }
+  u,
+  b,
+  strong {
+    font-size: inherit;
+    color: inherit;
+    line-height: inherit;
+    letter-spacing: inherit;
+  }
+  *[data-inherit] {
+    font-weight: inherit;
+    font-size: inherit;
+    color: inherit;
+    line-height: inherit;
+    letter-spacing: inherit;
+  }
+  a{
+    color: var(--color-primary);
+  }
+
+
+img,.no-select{
+  -webkit-touch-callout:none;
+  -webkit-user-drag:none;
+  -webkit-user-select:none;
+  -moz-user-select:none;
+  -ms-user-select:none;
+  user-select:none;
+}
+
+
+
+  * {
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+    // position: relative;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+    -webkit-text-size-adjust: none;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+
+    margin: 0;
+    padding: 0;
+    border: 0;
+    border-spacing: 0;
+    outline: none;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    -webkit-touch-callout: none;
+    // font-size:1px;
+    font-weight:var(--weight-Regular);
+    font-size:var(--font-Regular);
+  }
+  svg{
+    font-size: inherit;
+    font-weight: inherit;
+  }
+  html{
+    font-size: 100PX;
+  }
+  
+  *[data-weight-thin]{font-weight: var(--weight-Thin);}//极细体
+  *[data-weight-ultraLight]{font-weight: var(--weight-Ultralight);}//纤细体
+  *[data-weight-light]{font-weight: var(--weight-Light);}//细体
+  *[data-weight-regular]{font-weight: var(--weight-Regular);}//常规
+  *[data-weight-medium]{font-weight: var(--weight-Medium);}//中黑、中粗
+  *[data-weight-semibold]{font-weight: var(--weight-Semibold);}//中黑、中粗
+
+
+  #__vconsole *{
+    font-size:14PX;
+  }
+
+
+  #main-view{
+    background-color: white;
+  }
+
+  body[scroll]{
+    overflow:visible;
+  }
+  .touch-scroll {
+    overflow: scroll;
+    -webkit-overflow-scrolling: touch;
+  }
+
+  p,div,section,hgroup
+  {
+    &[data-text-break]{
+      white-space: pre-wrap;
+      word-break:break-all;
+    }
+  }
+
+  .wrap-space{
+    padding:var(--padding-small)
+  }
+
+}
+