kn-cli 1.0.60 → 1.0.61

package/templates/template_oa/public/src/pages/video/index.jsx

@@ -1,19 +1,87 @@
 import React, { useEffect, useState, useRef } from 'react';
-import {usePagination} from '@/hooks';
+import { useParams, useSearchParams,useNavigate } from 'react-router-dom';
+
+import {usePaginationWithForm} from '@/hooks';
 import {GET_LIST} from '@/services/video';
-import { Table, Input, Button, Form,DatePicker,Pagination } from 'antd';
+import {GET_STAFF_LIST,GET_DEP_LIST} from '@/services/common';
+
+import { Table, Input, Button, Form,Checkbox,Radio } from 'antd';
 import {FormBlockByTitle} from '@/components/Layout/FormBlock';
 import styles from './index.less';
 import PageTitle from '@/pages/components/pageTitle';
+import TotalRecord from '@/pages/components/totalRecord';
+import {ShowErrorAlert,ShowAlert,ShowConfirm} from '@/components/Dialog';
+import ShowToast from '@/components/Toast';
+import Empty from '@/components/Empty';
+import FormRow from '@/components/FormRow';
+import FormTable from '@/components/FormTable';
+import UploadHelper from '@/components/Upload';
+import StaffSelect from '@/components/Select/StaffSelect';
+import DepSelect from  '@/components/Select/DepSelect';
+import ProviderApp from '@/provider/app';
 
 const Page = () => {
+  const providerApp = ProviderApp.useContainer();
+  const navigate= useNavigate();
   const [form] = Form.useForm();
-  const request = usePagination({
+  const [formEdit]= Form.useForm();
+  const [formTable]= Form.useForm();
+  const [staff,setStaffList] = useState(null);
+  const [depList,setDepList] = useState(null);
+
+
+  const [edit,setEdit]= useState(false);
+  const [noData,setNoData]= useState(true);
+  const [formData,setFormData]=useState({
+    name:'cc',
+    age:156,
+    files:[{client_name:'abc.jpg',server_link:'abc.jpg'}],
+    manager:'69379379356ab1b1a1920d9052021900',
+    managerName:'王悦',
+    dep:'816',
+    depName:'平台技术中心',
+    fruit:'西瓜',
+    color:'蓝色'
+  });
+
+  const [tableFormList,setTableFormList]=useState({
+    list:[
+      {id:'1',name:'name1',age:'age1'},
+      {id:'2',name:'name2',age:'age2'},
+      {id:'3',name:'name3',age:'age3'},
+    ]
+  });
+
+  const request = usePaginationWithForm({
     service:GET_LIST,
-    pagination:{pageSize:10}
+    pagination:{pageSize:10},
+    form:form
   })
 
+  const init=async ()=>{
+    let staff =  GET_STAFF_LIST();
+    let ret =  GET_DEP_LIST();
+    staff = await staff;
+    ret = await ret;
+    if(staff&&staff.code==1){
+      setStaffList(staff.info)
+    }
+    if(ret&&ret.code==1){
+      setDepList(ret.info);
+    }
+  }
+  useEffect(()=>{
+    init();
+  },[])
+  useEffect(()=>{
+    if(request?.pagination?.total>0){
+      setNoData(false);
+      console.log('有数据了')
+    }
+  },[request.pagination])
+
   useEffect(()=>{
+    console.log('初次查询')
     request.update();
   },[])
 
@@ -31,10 +99,6 @@ const Page = () => {
     }
   }];
 
-  useEffect(()=>{
-    console.log(request)
-  },[request])
-
   const getDataSource=()=>{
     if(request?.data?.length>0){
       let req=request?.data[request.pagination.current-1]||[];
@@ -43,23 +107,145 @@ const Page = () => {
     return [];
   }
 
+
   const onPageChange=(current,pageSize)=>{
     request.update({pagination:{current,pageSize}})
   }
   const onSearch=()=>{
+    request.update();
+  }
+  const onReset=()=>{
+    request.reset();
+  }
+
+  const onDetail=()=>{
+    navigate('/video/detail')
+  }
+
+  const onAlert= async (type)=>{
+    switch(type){
+      case 'ShowErrorAlert':{ShowErrorAlert('错误啦');}break;
+      case 'ShowAlert':{ShowAlert('提示框');}break;
+      case 'ShowConfirm':{
+        const req= await ShowConfirm({content:'你确定吗？'})
+        if(req){
+          ShowToast('确认')
+        }else{
+          ShowToast('取消')
+        }
+      }break;
+      case 'ShowToast':{
+        ShowToast('toast')
+      }
+    }
+    
+  }
+  const onNoData=()=>{
+    setNoData(true)
+  }
+  const onEdit=()=>{
+    setEdit(true);
+  }
+  const onSave= async ()=>{
+    try{
+      const req= await formEdit.validateFields();
+      if(req){
+        setFormData(req)
+      }
+    }catch(ex){
+      ShowToast(ex);
+      return;
+    }
+    setEdit(false);
+
+  }
+  const onCancel=()=>{
+    formEdit.resetFields();
+    setEdit(false)
+  }
+
+  const createColumn=({formItemName,onAdd,onDel,onCopy})=> {
+    let ret = [
+      {
+        align: 'center',
+        dataIndex: 'name',
+        title:'name',
+        width: 60,
+        render: (text, record, index) => {
+          return (
+            <Form.Item name={[formItemName,index,'name']} >
+              <Input />
+            </Form.Item>
+          );
+        },
+      },
+
+      {
+        align: 'center',
+        dataIndex: 'age',
+        title:'age',
+        width: 60,
+        render: (text, record, index) => {
+          return (
+            <Form.Item name={[formItemName,index,'age']} >
+              <Input />
+            </Form.Item>
+          );
+        },
+      },
+    ];
+    ret.push({
+      align: 'center',
+      dataIndex: 'oper',
+      title: '操作',
+      width: 120,
+      render: (text, record, index) => {
+        return (
+          <div>
+          <Button type='link' style={{marginRight:"12px"}} onClick={onDel.bind(this, record, index)} >
+            删除
+          </Button>
+
+          <Button type='link' style={{marginRight:"12px"}}  onClick={onCopy.bind(this, record, index)}>
+            复制
+          </Button>
+
+          <Button type='link' onClick={onAdd.bind(this, record, index)}>
+            添加
+          </Button>
+          </div>
+          
+        );
+      },
+    });
+  
+    return ret;
+  };
+
+  const onPrintFormTable= async ()=>{
+    
+    try{
+      const req= await formTable.validateFields();
+      console.log(req);
+    }catch(ex){
+      ShowToast(ex);
+      return;
+    }
+  }
+  const onLogout=()=>{
+    providerApp.logout();
   }
-  const onReset=()=>{}
   return (
     <section className={styles.wrap}>
 
       <PageTitle>周边商品维护</PageTitle>
-      <FormBlockByTitle title=''>
+      <FormBlockByTitle title='查询结果'>
         <Form
           form={form}
           layout='inline'
           colon={false}
         >
-          <Form.Item name='search' labelAlign='left' label='关键字'>
+          <Form.Item name='keywords' labelAlign='left' label='关键字'>
             <Input placeholder='产品编码/产品名称/产品型号/部门/单号' />
           </Form.Item>
 
@@ -70,20 +256,136 @@ const Page = () => {
             重置
           </Button>
         </Form>
+        <TotalRecord count={request?.pagination?.total||'-'} right={
+          <>
+            <Button type='primary'className={styles.margin}>导出</Button>
+            <Button onClick={onDetail} className={styles.margin}>查看详情页面</Button>
+            <Button onClick={onNoData} className={styles.margin}>模拟空数据</Button>
+
+          </>
+        } />
+        {
+          noData?<Empty />:
+          <Table 
+            className={styles.table}
+            rowKey='id' 
+            columns={columns}
+            loading={!request?.data?.length>0} 
+            dataSource={getDataSource()} 
+            // pagination={false} 
+            pagination={{
+              current:request?.pagination?.current,
+              pageSize:request?.pagination?.pageSize,
+              onChange:onPageChange,
+              total:request?.pagination?.total
+            }}
+          />
+        }
+      </FormBlockByTitle>
+      
+
+      <FormBlockByTitle title='表单' rightBtns={
+          edit?
+          (<>
+            <Button type='primary' onClick={onSave} className={styles.margin}>保存</Button>
+            <Button onClick={onCancel} className={styles.margin}>取消</Button>
+          </>):(<Button type='primary' onClick={onEdit} className={styles.margin}>编辑</Button>)
+      }>
+        <Form initialValues={formData} form={formEdit}>
+          <FormRow>
+            <FormRow.Col label='姓名' required editmode={edit} txtdata={formData?.name}>
+              <Form.Item name='name'>
+                <Input />
+              </Form.Item>
+            </FormRow.Col>
+            <FormRow.Col label='年龄' editmode={edit} txtdata={formData?.age}>
+              <Form.Item name='age'>
+                <Input />
+              </Form.Item>
+            </FormRow.Col>
+          </FormRow>
+          <FormRow>
+            <FormRow.Col label='负责人' editmode={edit} txtdata={formData?.managerName}>
+              <Form.Item name='manager'>
+                <StaffSelect 
+                  // mode='multiple'
+                  userList={staff}                  
+                />
+              </Form.Item>
+            </FormRow.Col>
+            <FormRow.Col label='部门' editmode={edit} txtdata={formData?.depName}>
+              <Form.Item name='dep'>
+                <DepSelect 
+                  // mode='multiple'
+                  list={depList}
+                />
+              </Form.Item>
+            </FormRow.Col>
+          </FormRow>
+          <FormRow>
+            <FormRow.Col label='水果' editmode={edit}  txtdata={formData?.fruit}>
+                <Form.Item name='fruit'>
+                  <Checkbox.Group options={[
+                    {label:'苹果',value:'苹果'},
+                    {label:'西瓜',value:'西瓜'},
+                    {label:'桔子',value:'桔子'},
+
+                  ]}/>
+                </Form.Item>
+            </FormRow.Col>
+            <FormRow.Col label='颜色' editmode={edit}  txtdata={formData?.color}>
+                <Form.Item name='color'>
+                  <Radio.Group>
+                    <Radio value="红色">红色</Radio>
+                    <Radio value="黄色">黄色</Radio>
+                    <Radio value="蓝色">蓝色</Radio>
+                  </Radio.Group>
+                </Form.Item>
+            </FormRow.Col>
+          </FormRow>
+
+          <FormRow>
+            <FormRow.Col label='附件' editmode={true} >
+              <Form.Item name='files'>
+                <UploadHelper 
+                  disabled={!edit}
+                ></UploadHelper>
+              </Form.Item>
+            </FormRow.Col>
+          </FormRow>
+        </Form>
+      </FormBlockByTitle>
 
-        <Table 
-          className={styles.table}
-          rowKey='id' 
-          columns={columns}
-          loading={!request?.data?.length>0} 
-          dataSource={getDataSource()} pagination={false} />
-        <Pagination 
-          current={request?.pagination?.current} 
-          pageSize={request?.pagination?.pageSize}
-          onChange={onPageChange}
-          total={request?.pagination?.total}
-        />
+      <FormBlockByTitle title='表格中的表单' 
+        rightBtns={
+          <Button type='primary' onClick={onPrintFormTable} className={styles.margin}>打印当前表单值</Button>
+        }>
+        <Form form={formTable} initialValues={{...tableFormList}}>
+          <FormTable
+            Table={Table}
+            initialValue={tableFormList.list}
+            form={formTable}
+            formItemName='list'
+            antTableOptions={{ bordered: true, pagination: false }}
+            newdata={{
+              name: '',
+              age:''
+            }}
+            columns={createColumn}
+            saveLast
+          /> 
+        </Form>
+      </FormBlockByTitle>
+      <FormBlockByTitle title='其它功能'>
+        <Button className={styles.margin} onClick={onAlert.bind(this,'ShowErrorAlert')}>ShowErrorAlert</Button>
+        <Button className={styles.margin} onClick={onAlert.bind(this,'ShowAlert')}>ShowAlert</Button>
+        <Button className={styles.margin} onClick={onAlert.bind(this,'ShowConfirm')}>ShowConfirm</Button>
+        <Button className={styles.margin} onClick={onAlert.bind(this,'ShowToast')}>ShowToast</Button>
+        <Button className={styles.margin} onClick={onLogout}>登出OA</Button>
+        
+        
       </FormBlockByTitle>
+
     </section>
   )
 }

package/templates/template_oa/public/src/pages/video/index.less

@@ -9,4 +9,7 @@
 
 .table{
   margin:12px 0;
+}
+.margin{
+  margin:0 8px;
 }

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

@@ -1,11 +1,8 @@
 import {  useState,useMemo, useEffect } from 'react';
 import {  useSearchParams,useNavigate } from 'react-router-dom';
+import {setLogout} from '@/services';
 
 import { createContainer } from "unstated-next"
-import {useDelay} from '@/hooks';
-import {setJwt,setLogout} from '@/services';
-import {KSSO_LOGIN,LOGIN,LOGOUT} from '@/services/auth';
-import {jumpUrl} from '@/utils';
 
 const useApp=() =>{
   const [search] = useSearchParams();
@@ -14,102 +11,38 @@ const useApp=() =>{
   const [nav,setNavConfig] = useState({visible:true,syncDocumentTitle:false});
   const [user,setUser] = useState(null);
 
-  const delay = useDelay();
 
-  const isLogin=async ()=>{
-    await delay.wait(10);
-    if(!user){
-      try{
-        let userData = localStorage.getItem('user');
-        if(userData){
-          userData= JSON.parse(userData);
-          if(userData){
-            setUser(userData);
-            setJwt(userData.token);
-            return true;
-          }
-        }
-      }catch(ex){
-        return false;
-      }
-    }else{
-      return true;
-    }
+  const setNav=(config)=>{
+    setNavConfig({...nav,...config});
   }
 
-  const kssoLogin=async ()=>{
-    let code = search.get('code');
-    if(code){
-      var redirectUri = location.protocol + '//' + location.host + '/#/login';
-      //ksso auth登录
-      const req = await KSSO_LOGIN({code,redirectUri})
-      if(req?.code==0){
-        const userData = req?.data;
-        setUser(userData);
-        setJwt(userData.token);
-        localStorage.setItem('user',JSON.stringify(userData));
-
-        let redirect = search.get('redirect');
-        if(redirect){
-          jumpUrl(redirect,{replace:true});
-          return true;
-        }
-        navigate('/');
-      }else{
-        return false;
-      }
+  const logout=async ()=>{
+    if(BUILD_ENV=='localdebug'){
+      navigate('/login');
     }else{
-      jumpUrl(`${location.protocol}//${location.host}/static/kssoLogin.html`,{replace:true})
-    }
-    return true;
-  }
-  const login=async (username,password)=>{
-    const req = await LOGIN({username,password});
-    if(req?.code==0){
-      const userData = req?.data;
-      setUser(userData);
-      setJwt(userData.token);
-      localStorage.setItem('user',JSON.stringify(userData));
-
-      let redirect = search.get('redirect');
-      if(redirect){
-        jumpUrl(redirect,{replace:true});
-        return true;
+      let url = window.btoa(location.href);
+      let redirect=`${OA_HOST}/login?url=${url}`;
+      if(BUILD_ENV!='prod'){
+        redirect+='&debug=1';
       }
-      navigate('/');
-    }else{
-      return false;
+      location.href=redirect;
+      
     }
-    return true;
-  }
-  const logout=async ()=>{
-    LOGOUT();
-    setUser(null);
-    setJwt('');
-    localStorage.removeItem('user');
-    navigate('/superAdminLogin');
   }
   setLogout(logout);
 
 
-
-  const setNav=(config)=>{
-    setNavConfig({...nav,...config});
-  }
   const action=useMemo(()=>{
     return {
       loading,
       setLoading,
-      isLogin,
-      login,
       nav,
       setNav,
-      logout,
       setUser,
       user,
-      kssoLogin
+      logout
     }
-  },[loading,nav,setNav,user,setUser,isLogin,kssoLogin,login]);
+  },[loading,nav,setNav,user,setUser,logout]);
 
   return action
 }

package/templates/template_oa/public/src/route.jsx

@@ -4,7 +4,6 @@ import { Routes, Route, Navigate } from 'react-router-dom';
 import { LayoutBasic, Layout } from '@/components/Layout';
 import PageLoading from '@/components/Page/PageLoading';
 
-import Nav from '@/components/Nav';
 import Login from '@/pages/login';
 // import {AuthLogin} from '@/components/Auth';
 
@@ -21,6 +20,9 @@ const delayLoader=(loader)=>{
 
 
 const Video = React.lazy(()=>import('@/pages/video'));
+const VideoDetail = React.lazy(()=>import('@/pages/video/detail'));
+const My = React.lazy(()=>import('@/pages/my'));
+
 
 export const RouteList = (
   <Routes>
@@ -30,11 +32,15 @@ export const RouteList = (
       <Route
         path='/'
         element={
-          <LayoutBasic nav={<Nav />} />
+          <LayoutBasic />
         }
       >
         <Route path='/' element={<Navigate to="/video"></Navigate> } />
         <Route path='/video' element={<Video />} />
+        <Route path='/video/detail' element={<VideoDetail />} />
+        <Route path='/my' element={<My />} />
+
+
 
       </Route>
     </Route>

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

@@ -0,0 +1,7 @@
+import {GET_DEFAULT,API_ROOT,POST_DEFAULT} from './index.js';
+
+
+
+export function GET_LIST(params){
+  return GET_DEFAULT(`${API_ROOT}/cases/list`, params);
+}