kn-cli 1.0.44 → 1.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kn-cli",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,6 +10,7 @@
     "bin/",
     "src/",
     "templates/template_app/",
+    "templates/template_admin/",
     "build"
   ],
   "bin": {

package/readme.md

@@ -66,6 +66,9 @@ module.exports = {
 ```
 
 # 更新日志
+* 1.0.45  
+  后管模板创建不了的问题  
+  
 * 1.0.44
   更新后管模板 
   

package/src/utils/index.js

@@ -10,7 +10,7 @@ module.exports = {
       // console.log(`${src}--->${target}`)
       ncp(src, target,{clobber:options.overwrite||false},function(err){
         if(err){
-          throw new Error(err.message);
+          throw new Error(err);
         }
         resolve();
       })

package/templates/template_admin/.gitignore

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

package/templates/template_admin/build.sh

@@ -0,0 +1,2 @@
+export build_env=dev
+sh frontend_build.sh

package/templates/template_admin/cli.config.js

@@ -0,0 +1,21 @@
+
+module.exports = {
+  name:'template-admin',
+  registryType:'npm',//npm镜像源,taobao|npm
+  less:{
+    javascriptEnabled:true,//是否开启less js
+  },
+  cssModule: (resourcePath) => {
+    console.log(resourcePath)
+    // antd.less编译的时候使用global模式
+    if (/antd.less$/i.test(resourcePath)) {
+      return 'global'
+    }
+    return "local";
+  },
+  // 自定义多入口
+  // entry:{
+  //   'home/index': 'src/jsx/home/index.jsx',
+  // },
+  // copyFolder:['images','plugins'],//完整复制的文件夹
+};

package/templates/template_admin/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_admin/frontend_build.sh

@@ -0,0 +1,83 @@
+if [ -d "${HOME}/.nvm/" ]
+then
+  . ${HOME}/.nvm/nvm.sh
+fi
+
+export mock=0
+export oSkipNpmInstall=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
+
+  rm -rf release
+  checkResult "清理release"
+
+  checkKnCli
+  checkResult "检查kn-cli"
+
+  # npm i kn-cli@1.0.2 -g
+  # checkResult "npm kn-cli"
+
+  kn-cli --build
+  checkResult "kn-cli --build"
+
+  mv public/dist release/
+  checkResult "打包结果同步至release"
+}
+
+checkNode
+checkResult "检查node"
+
+
+build
+checkResult "build"
+
+
+

package/templates/template_admin/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/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_admin/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "mobile-app",
+  "version": "1.0.0",
+  "main": "lib/index",
+  "scripts": {
+    "clean": "rm -rf ./dist"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "antd": "~4.24.8",
+    "axios": "~1.1.3",
+    "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_admin/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/public/index.html

@@ -0,0 +1,43 @@
+<!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>
+    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_admin/public/src/_antd.less

@@ -0,0 +1,4 @@
+@import '~antd/dist/antd.less';
+
+// 这里可以重写antd的主题样式变量，参考 https://4x.ant.design/docs/react/customize-theme-cn
+@primary-color:#EB437C;

package/templates/template_admin/public/src/_reset.less

@@ -0,0 +1,128 @@
+
+@import '~@/assets/iconfont/iconfont.less';
+@import './_variable.less';
+
+:global {
+  html{
+    // ios webview 进入后高度不正确的问题
+    background-color: white;   
+    width:100vw;
+    height: 100%;
+    // height:100vh;
+    padding:var(--safeTop) var(--safeRight) var(--safeBottom) var(--safeLeft);
+  }
+
+  body,#main-view{
+    background-color: #f2f2f2;    
+    width:100%;
+    height:100%;
+  }
+
+  body,html{
+    overflow:hidden;
+  }
+  #main-view {
+    overflow: auto;
+    overflow: scroll;
+    -webkit-overflow-scrolling: touch;
+    // font-size: 0;
+  }
+
+
+  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);
+  }
+
+
+a,div,p,span,section,hgroup{
+    // -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);
+  }
+
+  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;
+  }
+
+  body[data-debug-layout]{
+    border:4px solid #d64f68;
+  }
+
+  #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;
+  }
+}

package/templates/template_admin/public/src/_variable.less

@@ -0,0 +1,80 @@
+
+@pullLoadHeight:100;
+
+:root{
+  --safeTop: constant(safe-area-inset-top);
+  --safeBottom: constant(safe-area-inset-bottom);
+  --safeLeft: constant(safe-area-inset-left);
+  --safeRight: constant(safe-area-inset-right);
+
+  --safeTop: env(safe-area-inset-top);
+  --safeBottom: env(safe-area-inset-bottom);
+  --safeLeft: env(safe-area-inset-left);
+  --safeRight: env(safe-area-inset-right);
+  
+  --weight-Thin:100;
+  --weight-Ultralight:200;
+  --weight-Light:300;
+  --weight-Regular:400;
+  --weight-Medium:500;
+  --weight-Semibold:700;
+
+  --font-Regular:14px;
+
+
+  --color-primary-dark:#001529;
+  --color-primary:#2F7CFF;
+  --color-primary-hover:#1565c0;
+
+  --color-font-bold:#141414;
+  --color-font-gray:#8C8C8C;
+  --color-underscore:#D9D9D9;
+  --color-error:#d32f2f;
+
+  --color-border-hover:rgba(0, 0, 0, 0.9);
+  --color-text:#262626;
+  --color-text-hover:rgba(0,0,0,.9);
+  --color-menu-text:rgba(0, 0, 0, 0.45);
+  --color-menu-text-active:white;
+
+  --color-dropmenu-hover:rgba(0, 0, 0, 0.04);
+  --color-dropmenu-text:rgba(0, 0, 0, 0.7);
+  --color-box-shadow:#dddddd;
+
+
+  --color-body-background:#F0F2F3;
+
+  --radius-default: 8px;
+  --radius-small: 4px;
+
+  --margin-default:12px;
+  --margin-larger:24px;
+  --margin-small:8px;
+
+  --padding-default:26px;
+  --padding-larger:32px;
+  --padding-small:16px;
+
+  --padding-body:34px 24px;
+
+  --nav-width:240px;
+  --center-body-width:100%;
+  --body-width:640px;
+
+  --height-header:40px;
+  --topMenu-height:64px;
+  --height-input:50px;
+  --height-input-small:40px;
+
+  // 100以下为非弹出式的UI
+  --z-nav-pc:10;
+  --z-top-menu:10;
+  --z-nav-mobile:50;
+
+  // 100以上为弹出式的UI
+  --z-dropMenu:100;
+  --z-dialog:1040;
+  --z-toast:1045;
+
+
+}

package/templates/template_admin/public/src/assets/iconfont/iconfont.less

@@ -0,0 +1,57 @@
+:global{
+  @font-face {
+    font-family: "iconfont";
+    src: url('~@/assets/iconfont/iconfont.eot');
+    src: url('~@/assets/iconfont/iconfont.eot?#iefix') format('eot'),
+      url('~@/assets/iconfont/iconfont.woff') format('woff'),
+      url('~@/assets/iconfont/iconfont.ttf') format('truetype'),
+      url('~@/assets/iconfont/iconfont.svg#iconfont') format('svg');
+  }
+
+  .iconfont:before {
+    font-family: "iconfont";
+      -webkit-font-smoothing: antialiased;
+      -moz-osx-font-smoothing: grayscale;
+    font-style: normal;
+    font-variant: normal;
+    font-weight: normal;
+    /* speak: none; only necessary if not using the private unicode range (firstGlyph option) */
+    text-decoration: none;
+    text-transform: none;
+  }
+
+  
+  .icon-arrowBack:before {
+    content: "\E001";
+  }
+  
+  .icon-check:before {
+    content: "\E002";
+  }
+  
+  .icon-close:before {
+    content: "\E003";
+  }
+  
+  .icon-down:before {
+    content: "\E004";
+  }
+  
+  .icon-image:before {
+    content: "\E005";
+  }
+  
+  .icon-play:before {
+    content: "\E006";
+  }
+  
+  .icon-refresh:before {
+    content: "\E007";
+  }
+  
+  .icon-warn:before {
+    content: "\E008";
+  }
+  
+
+}