kn-cli 1.0.60 → 1.0.62

package/build/build.sh

@@ -11,4 +11,4 @@ then
 fi
 export mock=0
 export build_type=build
-sh start.sh
+sh ./start.sh

package/build/dev.sh

@@ -1,3 +1,3 @@
 export build_type=dev
 # 如果 export dev_mode=watch 则启动webpack -w模式而非webpack-dev-server
-sh start.sh
+sh ./start.sh

package/package.json

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

package/readme.md

@@ -13,6 +13,12 @@
 
 > 项目创建后，记得执行sh init.sh 以激活git分支提交日志
 
+# Windows环境
+推荐windows下使用gitbash终端
+在使用`kn-cli --create`时，请改为接住winpty来执行，如`winpty kn-cli.cmd --create`  
+这是由于minTTY使用的gitbash无法处理我们创建项目时选择列表的问题，导致用户无法用上下来选择项目  
+
+
 # cli 其它常用方法
 1. 查看版本号： `kn-cli -v`    
 
@@ -74,6 +80,9 @@ module.exports = {
 ```
 
 # 更新日志
+* 1.0.61  
+  兼容windows下终端的编译  
+
 * 1.0.57  
   增加cli.config.js内devServer配置  
   

package/src/build.js

@@ -9,7 +9,15 @@ const {copyDir,TaskNodeVersion,replaceFileData,cleanDir}= require( './utils');
 const inquirer = require('inquirer');
 const ROOT=path.resolve(__dirname,"../");
 
-
+const IS_WINDOWS=()=>{
+  return process.platform === 'win32';
+}
+const TransformWindowsPath=(path)=>{
+  if (IS_WINDOWS()) {
+    path = path.replace(/\\/ig,'\\\\');
+  }
+  return path;
+}
 
 /**
  * 项目编译流程
@@ -241,12 +249,12 @@ module.exports= async (options={})=> {
           task.output = '项目目录:'+sourceFolder;
           try{
             await replaceFileData(tempWebpackConfigPath,function(data){
-              data = data.replace(/__dirname/ig,`"${sourceFolder}"`);
-              data = data.replace(/__webpackPath/ig,`"${tempWebpackDir}"`);
+              data = data.replace(/__dirname/ig,`"${TransformWindowsPath(sourceFolder)}"`);
+              data = data.replace(/__webpackPath/ig,`"${TransformWindowsPath(tempWebpackDir)}"`);
               return data;
             });
             await replaceFileData(tempStartShell,function(data){
-              data = data.replace(/__dirname/ig,`${sourceFolder}`);
+              data = data.replace(/__dirname/ig,`${TransformWindowsPath(sourceFolder)}`);
               return data;
             })
             resolve();
@@ -265,11 +273,15 @@ module.exports= async (options={})=> {
       title:"执行build",
       task:(ctx,task)=>{
         return new Promise(resolve=>{
-          let cmd='sh build.sh';
           shelljs.cd(tempWebpackDir);
           let cmdParams = [];
+          const shellFile={
+            dev:'sh ./dev.sh',
+            report:'sh ./report.sh',
+            build:'sh ./build.sh'
+          }
+          let cmd=shellFile[type]||shellFile.build;
           if(type=='dev'){
-            cmd='sh dev.sh';
             let build_env='';
             let mock='';
             let noSkipNpmInstall='';
@@ -295,15 +307,22 @@ module.exports= async (options={})=> {
             if(noSkipNpmInstall){
               cmdParams.push(`noSkipNpmInstall=${noSkipNpmInstall}`)
             }
-          }else if( type =='report'){
-            cmd='sh report.sh';
           }
+
           if(cliConfig?.registryType){
             cmdParams.push(`registryType=${cliConfig.registryType}`)
           }
+
+          shelljs.exec(`echo echo "run env.sh">env.sh`);
+          if (IS_WINDOWS()) {
+            shelljs.exec(`echo echo "set windows config">>env.sh`);
+            shelljs.exec(`echo alias sh='source'>>env.sh`);
+          } 
           if(cmdParams.length>0){
-            cmd = `export ${cmdParams.join(' ')}\n ${cmd}`;
+            shelljs.exec(`echo export ${cmdParams.join(' ')}>>env.sh`);
           }
+          shelljs.exec(`echo ${cmd}>>env.sh`);
+          cmd='sh ./env.sh'
           task.title=`执行:${cmd}`;
           let req = shelljs.exec(cmd)
           if(req.code==0){

package/templates/template_admin/build.sh

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

package/templates/template_admin/readme.md

@@ -21,6 +21,14 @@ kn-cli --dev
     构建方式：执行仓库下 sh frontend_build.sh
     部署方式：将构建完成的文件夹下的 `release` 内的内容部署到目标服务器  
     参考应用：oa-app
+    其它要求：nginx添加对index.html的缓存策略，配置如下：
+        expires 0;
+        add_header Cache-Control "max-age=0";
+        add_header Cache-Control "private";
+        add_header Cache-Control "no-store";
+        add_header Cache-Control "no-cache";
+        add_header Cache-Control "must-revalidate";
+        add_header Cache-Control "proxy-revalidate";
 
   ```  
 2. 进入CICD，构建相应环境  

package/templates/template_app/build.sh

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

package/templates/template_app/readme.md

@@ -30,6 +30,14 @@ sh report.sh
     构建方式：执行仓库下 sh frontend_build.sh
     部署方式：将构建完成的文件夹下的 `release` 内的内容部署到目标服务器  
     参考应用：oa-app
+    其它要求：nginx添加对index.html的缓存策略，配置如下：
+            expires 0;
+            add_header Cache-Control "max-age=0";
+            add_header Cache-Control "private";
+            add_header Cache-Control "no-store";
+            add_header Cache-Control "no-cache";
+            add_header Cache-Control "must-revalidate";
+            add_header Cache-Control "proxy-revalidate";
 
   ```  
 2. 进入CICD，构建相应环境  

package/templates/template_oa/build.sh

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

package/templates/template_oa/frontend_build.sh

@@ -73,8 +73,7 @@ build(){
 
   cp public/favicon.png release/favicon.png
   cp public/favicon.ico release/favicon.ico
-  checkResult "复制favicon"
-
+  checkResult "cp favicon"
 }
 
 checkNode

package/templates/template_oa/package.json

@@ -9,8 +9,9 @@
   "dependencies": {
     "antd": "~4.24.8",
     "axios": "~1.1.3",
+    "js-uuid": "^0.0.6",
+    "kn-hooks": "~0.0.26",
     "moment": "~2.29.4",
-    "kn-hooks": "~0.0.16",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
     "react-router": "~6.3.0",

package/templates/template_oa/public/index.html

@@ -12,7 +12,7 @@
 
   <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
   <link rel="icon" href="favicon.png" type="image/png">
-  <title>网站标题</title>
+  <title>案件管理系统</title>
 </head>
 
 <body>

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

@@ -111,27 +111,6 @@
   }
 
 
-  //Radio
-  .ant-radio {
-
-    .ant-radio-inner{
-      width:20px;
-      height:20px;
-      border-color:#d9d9d9;
-      &:after{
-        width:.10px;
-        height:10px;
-        top:4px;
-        left:4px;
-        background-color:#108ee9;
-      }
-    }
-    & .ant-radio-checked{
-      .ant-radio-checked{
-        border-color: #108ee9;
-      }
-    }
-  }
   
 
   //Checkbox

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

@@ -127,5 +127,8 @@ a,div,p,span,section,hgroup{
     padding:var(--padding-small)
   }
 
+  .mr-16 {
+    margin-right: 16px;
+  }
 }
 

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

@@ -51,7 +51,7 @@
   --margin-larger:24px;
   --margin-small:8px;
 
-  --padding-default:26px;
+  --padding-default:24px;
   --padding-larger:32px;
   --padding-small:16px;
 

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

@@ -29,7 +29,7 @@ export const AuthLogin=(props)=>{
     }else{
       console.log(`[Auth]检查用户登录态失败`)
       setPass(false);
-      navigate('/superAdminLogin');
+      navigate('/login');
     }
   }
   useEffect(check,[]);

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

@@ -0,0 +1,150 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+import IconFont from '@/components/IconFont';
+
+import Popup from '@/components/Popup';
+
+import styles from './index.less';
+import { Button } from 'antd';
+
+const Dialog = (props) => {
+  async function onClose() {
+    if (props.onClose) {
+      let ret = await props.onClose();
+      if (ret) {
+        props.destory();
+      }
+    } else {
+      props.destory();
+    }
+  }
+  async function onOk() {
+    if (props.onOk) {
+      let ret = await props.onOk();
+      if (ret) {
+        props.destory();
+      }
+    } else {
+      props.destory();
+    }
+  }
+  return (
+    <section className={styles.body}>
+      <div className={styles.mask} />
+      <section className={styles.wrap}>
+        <div className={styles.header}>
+          <span>{props.title}</span>
+          <IconFont icon='close' className={styles.close} onClick={onClose} />
+        </div>
+
+        {props.children}
+
+        <div className={styles.footer}>
+          <Button type='primary' onClick={onOk}>
+            {props.okText || '确认'}
+          </Button>
+          {props.noCancel ? (
+            ''
+          ) : (
+            <Button onClick={onClose} style={{ marginLeft: '10px' }}>
+              {props.cancelText || '取消'}
+            </Button>
+          )}
+        </div>
+      </section>
+    </section>
+  );
+};
+
+export const ShowDialog = (props) => {
+  return new Promise((reslove) => {
+    let popup = Popup(reslove);
+    ReactDOM.render(
+      <Dialog
+        title={props.title}
+        destory={popup.destory}
+        onOk={props.onOk}
+        okText={props.okText}
+        cancelText={props.cancelText}
+        noCancel={props.noCancel}
+        onClose={props.onClose}
+      >
+        {props.component}
+      </Dialog>,
+      popup.dom
+    );
+  });
+};
+
+export const ShowConfirm = async (props) => {
+  if (typeof props === 'string') {
+    props = { content: props };
+  }
+
+  let result = false;
+  await ShowDialog({
+    title: props.title || '注意',
+    okText: props.okText || '确认',
+    cancelText: props.cancelText || '取消',
+    noCancel: typeof props.noCancel !== 'undefined' ? props.noCancel : false,
+    onClose: async () => {
+      result = false;
+      return Promise.resolve(true);
+    },
+    onOk: async () => {
+      result = true;
+      return Promise.resolve(true);
+    },
+    component: (
+      <div className={styles.confirmWrap}>
+        {props.content}
+      </div>
+    ),
+  });
+  return result;
+};
+
+const Alert = (props) => {
+  function onOk() {
+    if (props.onOk) props.onOk();
+    props.destory();
+  }
+  return (
+    <section className={styles.body }>
+      <div className={styles.mask} />
+      <section className={styles.wrapAlert}>
+        <div className={styles.alertContent}>
+          <div className={props.type === 'success' ? styles.iconSuccess : styles.iconError} />
+          <span>{props.content}</span>
+        </div>
+        <div className={styles.alertFooter}>
+          <span onClick={onOk}>{props.okText || '确认'}</span>
+        </div>
+      </section>
+    </section>
+  );
+};
+
+export const ShowAlert = (props) => {
+  if (props.constructor === String) {
+    props = { content: props };
+  }
+  return new Promise((reslove) => {
+    let popup = Popup(reslove);
+
+    ReactDOM.render(
+      <Alert destory={popup.destory} type={props.type || 'success'} onOk={props.onOk} content={props.content} />,
+      popup.dom
+    );
+  });
+};
+
+export const ShowErrorAlert = (props) => {
+  if (props.constructor === String) {
+    props = { content: props };
+  }
+  return ShowAlert({ ...props, type: 'fail' });
+};
+
+export default Dialog;

package/templates/template_oa/public/src/components/Dialog/index.less

@@ -0,0 +1,123 @@
+.body {
+  width: 100%;
+  height: 100%;
+  min-height: 400px;
+  position: fixed;
+  z-index: 999;
+  left: 0;
+  top: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+
+}
+.mask {
+  background-color: rgba(0, 0, 0, 0.5);
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
+}
+.wrap {
+  position: relative;
+  min-width: 385px;
+  min-height: 2px;
+  background-color: white;
+  border-radius: 5px;
+  box-shadow: 0 1px 3px rgba(34, 25, 25, 0.4);
+}
+.close {
+  color: white;
+  font-size: 12px;
+  font-weight: bold;
+  &:hover {
+    cursor: pointer;
+  }
+}
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 20px;
+  span {
+    font-size: 14px;
+    color: white;
+    font-weight: 700;
+  }
+  background-color: #3e9cfc;
+  height: 45px;
+  padding: 0 20px;
+  border-radius: 5px 5px 0 0;
+  border-bottom: 1px solid #e5e5e5;
+}
+.footer {
+  display: flex;
+  justify-content: center;
+  height: 62px;
+  width: 100%;
+  background-color: #f6f6f6;
+  border-radius: 0 0 5px 5px;
+  border-top: 1px solid #dcdcdc;
+  padding-top: 13px;
+
+}
+
+.iconError {
+  background: url('~@/assets/images/NY-pop-bg.png') -63px -44px no-repeat;
+  width: 46px;
+  height: 46px;
+  margin-bottom: 18px;
+}
+.iconSuccess {
+  background: url('~@/assets/images/NY-pop-bg.png') -5px -97px no-repeat;
+  width: 46px;
+  height: 46px;
+  margin-bottom: 18px;
+}
+
+.wrapAlert {
+  position: relative;
+  min-width: 308px;
+  background-color: #f8f8f8;
+  border-radius: 5px;
+  box-shadow: 0 1px 3px rgba(34, 25, 25, 0.4);
+}
+.alertContent {
+  padding: 20px;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  span {
+    color: #666;
+    font-size: 18px;
+    font-weight: 400;
+  }
+}
+
+.alertFooter {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 44px;
+  width: 100%;
+  background-color: #fff;
+  border-radius: 0 0 5px 5px;
+  // border-top:1px solid #dcdcdc;
+  // padding-top:.13rem;
+  span {
+    color: #5fc0f9;
+    font-weight: 400;
+    font-size: 18px;
+    cursor: pointer;
+  }
+}
+
+.confirmWrap{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding:30px;
+}

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

@@ -0,0 +1,23 @@
+import React from 'react';
+import { Empty, Button } from 'antd';
+import styles from './index.less';
+
+/**
+ * 当table数据为空时下方有“添加数据”按钮
+ */
+function TableEmpty(props) {
+  return (
+    <section className={styles.tableEmpty}>
+      <Empty />
+      {props.editmode ? (
+        <Button style={{ marginTop: '.1rem' }} onClick={props.onClick} type='primary'>
+          添加数据
+        </Button>
+      ) : (
+        ''
+      )}
+    </section>
+  );
+}
+
+export default TableEmpty;

package/templates/template_oa/public/src/components/Empty/index.less

@@ -0,0 +1,6 @@
+.tableEmpty{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}

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

@@ -0,0 +1,39 @@
+import React, { useState } from 'react';
+import styles from './index.less';
+
+const FormRow = (props) => {
+  function createCol(item, idx) {
+    if (!item) return '';
+    const editmode = item.props.editmode === undefined ? true : item.props.editmode;
+    return (
+      <div key={idx} className={styles.formRow}>
+        <hgroup className={styles.row}>
+          <div className={styles.title}>
+            <div required={editmode && item.props.required}>{item.props.label}</div>
+          </div>
+          <div className={styles.data}>{item}</div>
+        </hgroup>
+      </div>
+    );
+  }
+  return (
+    <section className={styles.formRowBody}>
+      {props.children.length > 0 ? props.children.map(createCol) : createCol(props.children)}
+    </section>
+  );
+};
+
+function HocEditControl(props) {
+  const { editmode = true, txtdata ,textarea} = props;
+  if (editmode) {
+    return props.children;
+  }
+  if(textarea){
+    return <span style={{whiteSpace:'pre-wrap'}}>{txtdata||'-'}</span>
+  }
+  return <span>{txtdata || '-'}</span>;
+}
+
+FormRow.Col = HocEditControl;
+
+export default FormRow;