kn-cli 1.0.60 → 1.0.61

package/templates/template_oa/public/src/services/common.js

@@ -0,0 +1,132 @@
+
+import {GET_TOKEN,GET_DEFAULT_CROSS} from '@/services';
+import axios from 'axios';
+
+/**
+ * 获取员工列表
+ */
+export async function GET_STAFF_LIST() {
+  let ret = await GET_DEFAULT_CROSS(`${OA_HOST}/common/getNewUserList`);
+  return ret;
+  // let response = await axios({
+  //   method: 'get',
+  //   xsrfCookieName: '',
+  //   xsrfHeaderName: '',
+  //   withCredentials: true,
+  //   url: `${EnvConfig.oaHost}/common/getNewUserList`,
+  // });
+
+  // return response && response.data ? response.data : null;
+}
+
+/**
+ * 所有部门信息
+ */
+export async function GET_DEP_LIST() {
+  return GET_DEFAULT_CROSS(`${OA_HOST}/common/getBenefitDept`);
+}
+
+/**
+ * 获取公司信息
+ * @returns 
+ */
+export function GET_COMPANY_LIST(){
+  return GET_DEFAULT_CROSS(`${OA_HOST}/filestore/list?status=1`);
+}
+
+
+
+
+/**
+ * 上传文件
+ */
+export async function POST_IMPORT_EXCEL(url, file, onProgress) {
+  let formdata = new FormData();
+  let token = await GET_TOKEN();
+  formdata.append('file', file);
+  formdata.append('_token', token);
+  let response = await axios({
+    method: 'post',
+    url: url,
+    data: formdata,
+    onUploadProgress: (e) => {
+      onProgress({ percent: `${e.loaded}/${e.total}` * 100 });
+    },
+  });
+  return response && response.data ? response.data : null;
+}
+
+/**
+ * 获取下载文件的url路径
+ */
+export function GET_DOWNLOAD_FILE(s_name) {
+  return `${OA_HOST}/file/download?name=${s_name}`;
+}
+
+
+
+export async function UPLOAD_FILE(file, param, onProgress) {
+  // return new Promise(res=>{
+  //   res({
+  //       url:'https://officialwebsite-static.kingnet.com/20210312142223-360%E6%88%AA%E5%9B%BE20210312142143898.jpg',
+  //       key:'123',
+  //   })
+  // });
+  let token = await GET_TOKEN();
+  let formdata = new FormData();
+
+  formdata.append('uploadFile', file);
+  formdata.append('_token', token);
+
+  let response = await axios({
+    method: 'post',
+    url: `${OA_HOST}/file/upload`,
+    data: formdata,
+    xsrfCookieName: '',
+    xsrfHeaderName: '',
+    withCredentials: true,
+
+    onUploadProgress: (e) => {
+      let per = parseFloat((e.loaded / e.total) * 100).toFixed(0);
+      onProgress({ percent: per });
+    },
+  });
+  if(response&&response.data&&response.data.info){
+    response = response.data.info;
+    response = {
+      url:response.s_name,
+      key:response.c_name
+    };
+  }else{
+    return null;
+  }
+  return response||null;
+
+}
+
+/**
+ * 检查文件类型
+ * filename:文件名称
+ * types:array|string,['png','gif']|'png' 类型
+ */
+export function CHECK_FILE_TYPE(types, filename) {
+  let reg = '';
+
+  if (types.constructor === Array) {
+    types = types.join('|');
+  }
+  reg = `[.](${types})$`;
+  reg = new RegExp(reg, 'i');
+  return reg.test(filename);
+}
+
+
+
+/**
+ * 模拟延迟
+ */
+export async function DELAY(ms) {
+  return new Promise((reslove) => {
+    setTimeout(reslove, ms);
+  });
+}

package/templates/template_oa/public/src/services/index.js

@@ -15,7 +15,8 @@ let Modal = {
 };
 
 let jwt = '';
-let logout = ()=>{}
+let logout = ()=>{
+}
 
 export const setJwt = (value) => {
   if(value==''){
@@ -62,9 +63,9 @@ axios.interceptors.response.use(
       return response;
     }
 
-    if (Number(response.data.code) !== 0) {
-      console.log(`${JSON.stringify(response.data)}`);
-      Modal.error({ title: `注意`, content: `${response.data.message}(${response.data.code})` });
+    if (Number(response.data.code) !== 1) {
+      // console.log(`${JSON.stringify(response.data)}`);
+      Modal.error({ title: `注意`, content: `${response.data.info}(${response.data.code})` });
     }
     return response;
   },
@@ -79,7 +80,7 @@ axios.interceptors.response.use(
     } else if (error.response.status === 403) {
       Modal.error({
         title: '提示',
-        content: `${error.response.data.message}`,
+        content: `${error.response.data.info}`,
       });
       return;
     }
@@ -148,11 +149,14 @@ export async function POST_DEFAULT(url, params, method, options) {
   // } else {
   //   data = { ...params };
   // }
-
+  let token= await GET_TOKEN();
   let response = await axios({
     method: method || 'POST',
     url: url,
-    data,
+    data:{
+      _token:token,
+      ...data
+    },
     ...options,
     // headers: { 'content-type': 'application/x-www-form-urlencoded' },
   });
@@ -160,6 +164,8 @@ export async function POST_DEFAULT(url, params, method, options) {
 }
 
 export async function POST_DEFAULT_CROSS(url, params) {
+  let token= await GET_TOKEN();
+
   let data = {};
   // if (params) params = qs.stringify(params, { arrayFormat: 'indices' });
 
@@ -169,13 +175,41 @@ export async function POST_DEFAULT_CROSS(url, params) {
     data = { ...params };
   }
   let response = await axios({
+    headers:{
+      'X-XSRF-TOKEN': token,
+    },
     method: 'POST',
     url: url,
     xsrfCookieName: '',
     xsrfHeaderName: '',
     withCredentials: true,
-    data,
+    data: {
+      _token:token,
+      ...data,
+    },
   });
 
   return response && response.data ? response.data : null;
 }
+
+
+/**************************************************************************
+ *                  基础共享接口
+ *************************************************************************/
+
+
+
+/**
+ * 获取用户token
+ */
+export async function GET_TOKEN() {
+  let cookie = document.cookie.split(';').map(item=>item.split('='));
+  let xsrf = cookie.filter(item=>item[0].trim().toUpperCase()==='CSRF-TOKEN')
+  return Promise.resolve(xsrf[0][1]);
+  // let response = await axios({
+  //     method: 'get',
+  //     url: '/csrf_token',
+  // })
+  // return (response && response.data) ? response.data : null;
+}
+

package/templates/template_oa/public/src/services/video.js

@@ -6,6 +6,7 @@ export function GET_LIST(params={
   keywords:''
 }){
   const {current,pageSize,keywords='-'}=params;
+  console.log('GET_LIST',params)
   let list=[];
   for(let i=0;i<200;i++){
     list.push({

package/templates/template_oa/public/src/utils/index.js

@@ -63,4 +63,64 @@ export const closeWindow = () => {
       window.close();
     }
   }
-};
+};
+
+
+/**
+ * 数组转对象, lodash的keyBy
+ * @param {*} array 
+ * @param {*} key 
+ * @returns 
+ */
+const keyBy = (array, key) => {
+  const obj = {};
+  array.map(i => {
+    obj[i[key]] = i;
+  })
+  return obj;
+}
+
+/** 
+ * 案件类型枚举
+ */
+export const caseTypeEnum = [
+  {value: '1', label: '诉讼'},
+  {value: '2', label: '劳动仲裁'},
+  {value: '3', label: '商事仲裁'},
+]
+export const caseTypeEnumObjByValue = keyBy(caseTypeEnum, 'value');
+/**
+ * 案件状态枚举
+ */
+export const caseStatusEnum = [
+  {value: '1', label: '审理中'},
+  {value: '2', label: '已终结'},
+]
+export const caseStatusEnumObjByValue = keyBy(caseStatusEnum, 'value');
+/**
+ * 案件是否保全枚举
+ */
+export const caseIsPreservationEnum = [
+  {value: '1', label: '是'},
+  {value: '2', label: '否'},
+]
+export const caseIsPreservationEnumObjByValue = keyBy(caseIsPreservationEnum, 'value');
+/**
+ * 申请法院强制执行 枚举
+ */
+export const caseEnforceEnum = [
+  {value: '1', label: '是'},
+  {value: '2', label: '否'},
+]
+export const caseEnforceEnumObjByValue = keyBy(caseEnforceEnum, 'value');
+/**
+ * 配置页面模块 枚举
+ */
+export const moduleEnum = [
+  {value: '0', label: '基本信息'},
+  {value: '1', label: '仲裁'},
+  {value: '2', label: '一审'},
+  {value: '3', label: '二审'},
+  {value: '4', label: '执行'},
+  {value: '5', label: '提醒事项'},
+]

package/templates/template_oa/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_oa/webpack.api.js

@@ -2,20 +2,23 @@ const configs = {
   // 本地研发环境（npm start）
   localdebug: {
     API_HOST: '/api',
-    OA_HOST: '',
-    OA_MENU_HOST:'/oa-menu/'
+    OA_HOST: '/oaApi',
+    OA_MENU_HOST:'//192.168.90.250:8020/oa-menu/?mock=1',
+    LOGIN_URL: 'http://192.168.90.250:8886'
   },
   // 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/'
+    OA_MENU_HOST:'//192.168.90.250:8020/oa-menu/',
+    LOGIN_URL: 'http://192.168.90.250:8886'
   },
   // 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/'
+    OA_MENU_HOST:'//micro-front.kingnet.com/oa-menu/',
+    LOGIN_URL: 'https://oa.kingnet.com'
   },
 };
 
@@ -28,29 +31,14 @@ const API_PROXY= {
       '^/api': '/', // rewrite path
     },
   },
-  '/common/**': {
-    target: 'http://192.168.90.250:8886/common/',
+  '/oaApi/**': {
+    target: 'http://192.168.90.250:8886/',
     changeOrigin: true,
     logLevel: 'debug',
     pathRewrite: {
-      '^/common': '/', // rewrite path
+      '^/oaApi': '/', // rewrite path
     },
   },
-  '/file/':{
-    target:'http://192.168.90.250:8886/file/',
-    changeOrigin:true,
-    pathRewrite: {
-      '^/file': '/', // rewrite path
-    },
-  },
-  '/oa-menu/**': {
-      target: 'http://192.168.90.250:8020/oa-menu/',
-      changeOrigin: true,
-      logLevel: 'debug',
-      pathRewrite: {
-        '^/oa-menu': '/', // rewrite path
-      },
-  },
 };
 
 const env = process.env.build_env||'localdebug';

package/templates/template_offcial/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_offcial/readme.md

@@ -21,6 +21,14 @@ sh dev.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/public/src/components/mask/index.jsx

@@ -1,47 +0,0 @@
-import React, { useEffect, useRef } from 'react';
-import ReactDOM from 'react-dom';
-import styles from './index.less';
-import Popup from '@/components/Popup/index.jsx';
-
-
-const useToast = () => {
-
-  const ref = useRef();
-
-  const runNext = (props) => {
-    console.log(props.popup.dom);
-    ReactDOM.render(
-      <Toast {...props} />,
-      props.popup.dom
-    );
-  }
-
-  const Toast = ({ children }) => {
-    return (
-      <section className={styles.wrap}>
-        <div className={styles.content + `  animate__animated animate__fast`}>
-          {children}
-        </div>
-      </section>
-    )
-  }
-
-  const hiddenToast = () => {
-    ref.current.destory();
-  }
-  const showToast = props => {
-    props = { children: props }
-    return new Promise((resolve) => {
-      let popup = Popup(resolve);
-      ref.current = popup;
-      props.popup = popup;
-      runNext(props);
-    });
-  }
-  return {
-    showToast, hiddenToast
-  }
-
-}
-
-export default useToast;

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

@@ -1,32 +0,0 @@
-@import '~@/_variable.less';
-
-.wrap{
-  position: fixed;
-  left:0;
-  top:0;
-  width:100vw;
-  height:100vh;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  z-index: 1000;
-  .content{
-    position: fixed;
-    left:0;
-    top:0;
-    width:100vw;
-    height:100vh;
-
-    background: rgba(0,0,0,.8);
-    padding:var(--padding-default);
-
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-
-    font-size: 14px;
-    color: #FFFFFF;
-  }
-}

package/templates/template_oa/public/src/dictionary/index.js

@@ -1,39 +0,0 @@
-
-import React, { useState, useEffect,useMemo} from 'react';
-import {GET_USER_TYPE} from '@/services/user';
-import {useDictionary} from 'kn-hooks';
-import ShowToast from '@/components/Toast';
-export const SelectOption=(props)=>{
-  const {value}=props;
-  const name = props['data-keyname'];
-  const onClick=(e)=>{
-    ShowToast(`点击option name=${name},value=${value},label=${props.children}`)
-    if(props.onClick)props.onClick();
-  }
-  return <hgroup onClick={onClick} key={value} name={name} value={value}>{props.children}</hgroup>
-}
-
-useDictionary.SetConfig({SelectOption})
-
-
-export const useUserType = useDictionary.createDictionary({
-  api:GET_USER_TYPE,
-  afterApi:(response)=>{
-    if(response?.code==0){
-      let req= response.data.map(item=>{
-        const  {label,value:id,key:name}=item;
-        return {label,id,name}
-      });
-      return req;
-    }
-    return [];
-  }
-});
-
-export const useTaskState= useDictionary.createDictionary({
-  defaultTypes:[
-    {label:'进行中',id:'1',name:'run'},
-    {label:'已完成',id:'5',name:'complete'},
-  ]
-});
-

package/templates/template_oa/public/src/provider/menu.jsx

@@ -1,20 +0,0 @@
-import {  useState,useMemo } from 'react';
-import { createContainer } from "unstated-next"
-import {GET_MENU} from '@/services/auth';
-
-const useProvider=() =>{
-  const [menus,setMenus]= useState([]);
-
-  const reload= async ()=>{
-    await GET_MENU();
-  }
-  const action=useMemo(()=>{
-    return {
-      menus,setMenus
-    }
-  },[menus,setMenus]);
-  return action
-}
-const App = createContainer(useProvider);
-
-export default App;

package/templates/template_oa/public/src/services/user.js

@@ -1,26 +0,0 @@
-import {GET_DEFAULT,PUT_DEFAULT,POST_DEFAULT,API_ROOT} from './index.js';
-
-
-
-export function GET_USER(){
-  return GET_DEFAULT(`${HOST}/user`);
-}
-
-export function SET_USER(params={
-  name:'',
-  age:''
-}){
-  return POST_DEFAULT(`${HOST}/user`,params)
-}
-
-
-export function GET_USER_LIST(params={
-  current:1,
-  pageSize:20
-}){
-  return GET_DEFAULT(`${API_ROOT}/userList`,params)
-}
-
-export function GET_USER_TYPE(){
-  return GET_DEFAULT(`${API_ROOT}/userType`)
-}