kn-cli 1.0.97 → 1.0.98

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

@@ -1,4 +1,7 @@
-
+// @ts-ignore
+import JSZip from 'jszip';
+// @ts-ignore
+import moment from 'moment';
 /**
  * 打开一个第三方链接
  * @param {string} link - 链接地址
@@ -68,6 +71,8 @@ export const jumpUrl=(url,options={})=>{
 }
 
 
+
+
 // 关闭页面
 export const closeWindow = () => {
   // @ts-ignore
@@ -79,4 +84,211 @@ export const closeWindow = () => {
       window.close();
     }
   }
-};
+};
+
+
+export const px2rem=(px)=>{
+  px=+px/100+'rem';
+  return px;
+}
+
+/**
+ * 获取字符串字节数（中文字符字节数由编码方式角色，utf-8是3个字节）
+ */
+export const getStrByteLen=(str)=>{
+  if(!str){
+    return 0;
+  }
+  const len=encodeURIComponent(str).replace(/%../g,"a").length;
+  return len;
+}
+
+/**
+ * 下载文件
+ * @param {string} url - 文件地址
+ * @param {string} [filename] - 文件名
+ */
+export const downloadFile = (url,filename)=> {
+  // 使用fetch API获取资源
+  fetch(url)
+    .then(response => {
+      return response.blob();
+    }) // 将响应转换为Blob对象
+    .then(blob => {
+      // 创建一个指向该Blob的URL
+      const blobUrl=window.URL.createObjectURL(blob);
+      // 创建一个<a>标签用于下载
+      const link=document.createElement('a');
+      link.href=blobUrl;
+      link.download=filename||''; // 设置下载文件名，如果没有览器将使用URL的最后一部分作为文件名
+      link.style.display='none';
+      // 触发下载
+      document.body.appendChild(link);
+      link.click();
+
+      // 清理并移除<a>标签
+      document.body.removeChild(link);
+      window.URL.revokeObjectURL(blobUrl);
+    })
+    .catch(error => {
+      console.error('下载资源失败:',error);
+    });
+}
+
+/*
+ * 下载多个文件并打包成zip
+ * @param {Array} urls - 文件地址数组
+ * @param {string} [zipName] - zip文件名
+ */
+export const downloadFilesAsZip = async(urls, zipName) => {
+  const zip=new JSZip();
+
+  await Promise.all(
+    urls.map(async (item) =>(
+      fetch(item?.url)
+        .then(response => response.blob())
+        .then(blob => {
+          const fileName=item?.name;
+          zip.file(fileName,blob);
+        })
+    ))
+  );
+
+  // 生成ZIP Blob对象
+  const zipBlob=await zip.generateAsync({type: 'blob'});
+  // 创建一个指向ZIP Blob的URL
+  const blobUrl=window.URL.createObjectURL(zipBlob);
+  const link=document.createElement('a');
+  link.href=blobUrl;
+  link.download=zipName??'download';
+  link.style.display='none';
+  document.body.appendChild(link);
+  link.click();
+  document.body.removeChild(link);
+  URL.revokeObjectURL(blobUrl);
+}
+
+
+const CONSOLE_CONFIG={
+  'useRouteMenu':false,
+  'ProviderTimelines':true,
+  'Websocket':true,
+  'EventBus':true,
+  'MessageWall':true,
+  'ProviderApp':true
+}
+export const CONSOLE_LOG=(moduleName, txt, ...other)=>{
+  if(!CONSOLE_CONFIG[moduleName]){return;}
+  console.log(`[${moduleName}]${txt}`, ...other)
+}
+CONSOLE_LOG.warn = (moduleName, txt, ...other)=>{
+  if(!CONSOLE_CONFIG[moduleName]){return;}
+  console.warn(`[${moduleName}]${txt}`, ...other)
+}
+CONSOLE_LOG.error = (moduleName, txt, ...other)=>{
+  if(!CONSOLE_CONFIG[moduleName]){return;}
+  console.error(`[${moduleName}]${txt}`, ...other)
+}
+CONSOLE_LOG.info = (moduleName, txt, ...other)=>{
+  if(!CONSOLE_CONFIG[moduleName]){return;}
+  console.info(`[${moduleName}]${txt}`, ...other)
+}
+CONSOLE_LOG.log = (moduleName, txt, ...other)=>{
+  if(!CONSOLE_CONFIG[moduleName]){return;}
+  console.log(`[${moduleName}]${txt}`, ...other)
+}
+
+export const WriteLog=(text)=>{
+  let log = localStorage.getItem('nebulaLog');
+  let logs=[];
+  text = `[${moment().format('MM-DD HH:mm:ss')}]:${text}`;
+  if(log){
+    logs = log.split('\n');
+  }else{
+    log = text;
+  }
+  logs.splice(0,0,text);
+  localStorage.setItem('nebulaLog',logs.join('\n'));
+}
+export const Storage={
+  /**
+   * @param {string} name 
+   * @returns {object|null}
+   */
+  get:(name)=>{
+    let req = localStorage.getItem(name);
+    try{
+      if(req){
+        req = JSON.parse(req);
+        return req;
+      }
+    }catch(ex){
+      return null;
+    }
+  },
+  /**
+   * @param {string} name 
+   * @param {object} item 
+   */
+  set:(name,item)=>{
+    let value='';
+    if(item){
+      value = JSON.stringify(item);
+    }
+    localStorage.setItem(name,value);
+  },
+  clear:(name)=>{
+    localStorage.removeItem(name);
+  }
+}
+export const StorageName={
+  UserListFilterMenu:'userListFilterMenu',
+  AccountConfig:'AccountConfig'
+}
+
+
+
+/**
+ * 给返回Promise的函数增加节流功能
+ * @param {(any)=>Promise} fn 
+ * @param {number} ms - 防抖时间
+ * @returns {Function}
+ */
+export function throttlePromise(fn, ms) {
+  const pendingPromises = new Map();
+  return function(params) {
+      const key = JSON.stringify(params);
+
+      if (pendingPromises.has(key)) {
+          return pendingPromises.get(key);
+      }
+
+      const promise = new Promise((resolve, reject) => {
+          setTimeout(() => {
+              pendingPromises.delete(key);
+              fn(params).then(resolve).catch(reject);
+          }, ms);
+      });
+      pendingPromises.set(key, promise);
+      return promise;
+  };
+}
+
+
+export const delayLoader=(loader,ms=5000)=>{
+  return new Promise(resolve=>{
+    loader.then(req=>{
+      setTimeout(()=>{
+        resolve(req);
+      },ms)
+    })
+  })
+}
+
+export const delay=(ms=1000)=>{
+  return new Promise(resolve=>{
+    setTimeout(()=>{
+      resolve();
+    },ms)
+  })
+}

package/templates/template_admin/public/src/utils/rule.js

@@ -161,7 +161,10 @@ export const CUSTOM={
   }
 }
 
+
+
 const list = {
+  KEYWORDS:CUSTOM.INPUT({min:0,max:100,required:false}),
   INPUT: RULE_INPUT,
   INPUT_NR: RULE_INPUT_NR,
   SELECT: RULE_SELECT,

package/templates/template_admin/public/static/kssoLogin.html

@@ -12,7 +12,7 @@
   <title></title>
   <script>
     var url = location.protocol + '//' + location.host+'/#/login';
-    location.replace('https://ksso.kingnet.com/oauth2/auth?client_id=30000655&response_type=code&redirect_uri=' + encodeURIComponent(url));
+    location.replace('https://ksso.kingnet.com/oauth2/auth?client_id=30000716&response_type=code&redirect_uri=' + encodeURIComponent(url));
   </script>
 </head>
 

package/templates/template_admin/webpack.api.js

@@ -5,17 +5,24 @@ const configs = {
   },
   // cicd构建时研发环境
   dev: {
-    API_HOST: 'http://dev-drama-admin-api.skitoon.com',
+    API_HOST: 'https://dev-nebula-api.kingnet.com',
+    DEVICE_HOST: 'wss://dev-nebula-adb.kyhub.cn',
+    ADB_HOST: 'https://dev-nebula-adb.kyhub.cn',
+    WS_HOST: 'wss://dev-nebula-connector.kingnet.com/ws',
   },
   // cicd构建时生产环境
   prod: {
-    API_HOST: 'http://dev-drama-admin-api.skitoon.com',
+    API_HOST: 'https://nebula-api.kingnet.com',
+    DEVICE_HOST: 'wss://nebula-adb.kingnet.com',
+    ADB_HOST: 'https://nebula-adb.kingnet.com',
+    WS_HOST: 'wss://nebula-connector.kingnet.com/ws',
   },
 };
 
+
 const API_PROXY= {
   '/api/**': {
-    target: 'http://dev-drama-admin-api.skitoon.com',
+    target: 'http://192.168.92.117:8080',
     changeOrigin: true,
     logLevel: 'debug',
     pathRewrite: {
@@ -24,6 +31,7 @@ const API_PROXY= {
   },
 };
 
+// @ts-ignore
 const env = process.env.build_env||'localdebug';
 
 

package/templates/template_admin/public/src/components/layout/centerBody/index.jsx

@@ -1,25 +0,0 @@
-// @ts-ignore
-import React from 'react';
-
-// @ts-ignore
-import styles from './index.less';
-
-/**
- * 居中定位的layout
- * @param {object} props 
- * @param {string} [props.className] - 扩展类样式
- * @param {string} [props.layout='normal'] - 布局样式，xy-center|x-center|y-center
- * @param {JSX.Element|string} [props.children] - 容器内的子组件
- * 
- * @returns {JSX.Element}
- */
-const LayoutCenterBody=(props)=>{
-  const {className,layout='normal'} = props;
-
-  return ( 
-    <section data-layout={layout} className={ className?`${styles.contentBody} ${className}`:styles.contentBody  }>
-      {props.children}
-    </section>
-  )
-}
-export default LayoutCenterBody;

package/templates/template_admin/public/src/components/layout/centerBody/index.less

@@ -1,30 +0,0 @@
-@import '~@/_variable.less';
-
-
-.contentBody{
-  width:100%;
-  height:100%;
-  &[data-layout='xy-center']{
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-  }
-  &[data-layout='x-center']{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-  &[data-layout='y-center']{
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-  }
-}
-
-body[data-debug-layout]{
-  .contentBody{
-    border:1px solid red;
-  }
-}
-

package/templates/template_admin/public/src/components/menu/index.less

@@ -1,19 +0,0 @@
-@import '~@/_variable.less';
-
-
-.nav{
-  width: var(--nav-width);
-  height:100%;
-  background-color: var(--color-primary-dark);
-  transition: all .2s;
-  z-index: var(--z-nav-mobile);
-  overflow-y: auto;
-  &[data-nav-hide='true']{
-    display: none;
-  }
-  &[data-nav-mode='mobile']{
-    position: fixed;
-    z-index: var(--z-nav-mobile);
-    box-shadow: 0 0 20px #444;
-  }
-}

package/templates/template_admin/public/src/components/menu/topMenu/index.jsx

@@ -1,132 +0,0 @@
-// @ts-ignore
-import React, { useState,useEffect, useRef} from 'react';
-// @ts-ignore
-import { useLocation,useNavigate } from 'react-router-dom';
-// @ts-ignore
-import { LogoutOutlined, UserOutlined } from '@ant-design/icons';
-// @ts-ignore
-import { Menu,Dropdown,Badge } from 'antd';
-
-import ProviderApp from '@/provider/app';
-import ProviderMenu from '@/provider/menu';
-
-// @ts-ignore
-import imgAvatar from '@/assets/images/avatar.png';
-// @ts-ignore
-import styles from './index.less';
-
-const TopMenu=()=>{
-  const app = ProviderApp.useContainer();
-  const providerMenu = ProviderMenu.useContainer();
-  const navigate = useNavigate();
-
-  const [menus,setMenus]=useState([]);
-  
-    
-  const translateMenu=(list)=>{
-    if(!list||list.length<=0)return [];
-    let req=list.map(menu=>{
-      const {key,name:label,icon,url,msgCount}=menu;
-
-      let item={
-        key,label,icon,url
-      }
-      if(msgCount&&msgCount>0){
-        item.label=<span>{label}<Badge size='small' count={msgCount} offset={[5,-5]} /></span>
-      }
-      if(menu.children){
-        item.children = translateMenu(menu.children)
-      }
-      return item;
-    })
-    return req;
-  }
-
-
-  const reload= async ()=>{
-    providerMenu.reload();
-  }
-  useEffect(()=>{
-    let menuList = translateMenu(providerMenu.topMenu);
-    menuList.forEach(menu=>{
-      menu.children=null;//顶级菜单这里设计为不需要展示子菜单
-    })
-    setMenus(menuList);
-  },[providerMenu.topMenu]);
-
-  useEffect(()=>{
-    providerMenu.setUserAuth(app.user.authorities||[]);
-  },[app.user])
-  
-  useEffect(()=>{
-    reload();
-  },[])
-
-
-  // 推出登录
-  const onAvatarClick = (key)=>{
-    if(key==='user'){
-      app.updateUserInfo();
-    }
-    else if (key === 'logout') {
-      app.logout();
-    }else if(key=='relogin'){
-      navigate('/superAdminLogin')
-    }
-  }
-  const onHome=()=>{
-    navigate('/');
-  }
-  const onClickMenuItem=(e)=>{
-    const { item, key, keyPath, domEvent } = e;
-    let menu = providerMenu.findMenuData(key);
-    navigate(menu.url);
-  }
-
-
-  return (
-    <section className={styles.topMenu}>
-      <div className={styles.left}>
-        <span className={styles.title} onClick={onHome}>后管系统</span>
-      </div>
-      
-      <div className={styles.center}>
-        {
-          menus&&menus.length>=1&&
-          <Menu 
-            items={menus}
-            mode="horizontal" 
-            onClick={onClickMenuItem}
-            selectedKeys={providerMenu.selectMenus.keys}
-            className={styles.menu}
-          />
-        }
-      </div>
-      <div className={styles.right}>
-        
-        <span className={styles.username}>Hi,{app?.user?.username||''}!</span>
-        <Dropdown menu={{items:[
-            {
-              key:'user',
-              label:<span onClick={onAvatarClick.bind(this,'user')}><UserOutlined />刷新用户权限</span>
-            },
-            {
-              key:'relogin',
-              label:<span onClick={onAvatarClick.bind(this,'relogin')}><UserOutlined />重新登录</span>
-            },
-            {
-              key:'logout',
-              label:<span onClick={onAvatarClick.bind(this,'logout')}><LogoutOutlined />退出登录</span>
-            }
-            
-          ]}}>
-          <img className={styles.avatar} src={imgAvatar}/>
-        </Dropdown>
-        
-      </div>
-      
-    </section>
-  )
-}
-
-export default TopMenu;

package/templates/template_admin/public/src/components/menu/topMenu/index.less

@@ -1,105 +0,0 @@
-@import '~@/_variable.less';
-
-
-.topMenu{
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: var(--topMenu-height);
-  width:100%;
-  z-index:var(--z-top-menu);
-  background-color: var(--color-primary-dark);
-  .left{
-    padding-left: 16px;
-    display: flex;
-    align-items: center;
-    width: var(--nav-width);
-    .logo{
-      cursor: pointer;
-      width: 110px;
-      height: 32px;
-      margin-right: 7px;
-      color:white;
-      display: flex;
-      align-items: center;
-      font-size: 32px;
-    }
-    .title {
-      cursor: pointer;
-      color: #fff;
-      font-size: 16px;
-      padding: 0 55px 0 7px;
-      font-weight: var(--weight-Light);
-    }
-  }
-  .center{
-    height: 100%;
-    display: flex;
-    align-items: center;
-    flex:1;
-  }
-  .right{
-    display: flex;
-    align-items: center;
-    flex:1;
-    justify-content: flex-end;
-    .username{
-      color:white;
-    }
-    .avatar{
-      width: 40px;
-      height: 40px;
-      border-radius: 50%;
-      margin: 0 24px 0 24px;
-    }
-  }   
-
-  .menu:global(.ant-menu){
-    line-height: var(--topMenu-height);
-    background-color: inherit;
-    border-bottom: none;
-    flex:1;
-    // min-width: 100px;
-
-    :global{
-      .ant-menu-item,
-      .ant-menu-item a{
-        color:rgba(104,114,126,1);
-        font-weight: var(--weight-Medium);
-      }
-      .ant-menu-item:hover a,
-      .ant-menu-item:hover,
-      .ant-menu-item-selected a{
-        color: rgba(255,255,255,.8);
-      }
-      .ant-menu-item-selected{
-        color: white;
-      }
-      .ant-menu-item:hover:after,
-      .ant-menu-item-selected:after{
-        border-bottom: 2px solid #fff;
-      }
-      .ant-menu-item{
-        padding: 0 24px;
-      }
-    }
-  }
-}
-.avatarMenu{
-  min-width: 100px;
-  :global(.anticon) {
-    margin-right: 8px;
-  }
-  
-  :global(.ant-dropdown-menu-item) {
-    min-width: 100px;
-  }
-}
-
-.navShow{
-  font-size: 26px;
-  cursor: pointer;
-  &:hover{
-    color: var(--color-text-hover);
-  }
-}

package/templates/template_admin/public/src/pages/demo/detail/index.jsx

@@ -1,27 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-// @ts-ignore
-import { useParams,useNavigate } from 'react-router-dom';
-
-// @ts-ignore
-import {Button} from 'antd';
-
-// @ts-ignore
-import styles from '@/pages/demo/index.less';
-
-
-
-const Detail=()=>{
-  const {id} = useParams();
-  const navigate= useNavigate();
-  const onBack=()=>{
-    window.history.back();
-  }
-  return (
-    <section className={styles.contentWrap}>
-      <p>id:{id}</p>
-      <Button type='primary' onClick={onBack}>返回</Button>
-    </section>
-  )
-}
-
-export default Detail;