kn-cli 1.0.126 → 1.0.128

package/build/webpack.config.js

@@ -178,7 +178,7 @@ if(process.env.build_env == 'localdebug'){
 
 const rules= [
   {
-    test: /\.js[x]?$/,
+    test: /\.[m]?js[x]?$/,
     exclude: /node_modules/,
     use: LOADER_JS,
   },
@@ -289,7 +289,7 @@ if(CLI_CONFIG.rules){
   if(CLI_CONFIG.rules.compileNpmPackage){
     let JS_LIST= CLI_CONFIG.rules.compileNpmPackage.join('|');
     rules.push({
-      test: /\.js[x]?$/,
+      test: /\.[m]?js[x]?$/,
       include: new RegExp(`(${JS_LIST})`),
       use: LOADER_JS
     },)
@@ -521,9 +521,9 @@ const config={
   output: output,
   resolve: {
     modules: [
+      'node_modules',
       path.resolve(dirname,'node_modules'),
       path.resolve(webpackPath, 'node_modules'),
-      'node_modules',
     ],
     extensions: ['.jsx', '.js', '.json','.mjs'],
     alias: {

package/package.json

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

package/templates/template_admin/dev.sh

@@ -5,7 +5,8 @@ fi
 
 . ./shellUtil.sh
 
-node_version="v16.18.0"
+# 如果要使用webpack调试，改为16.18.0
+node_version="v20.19.0"
 
 
 build(){

package/templates/template_admin/package.json

@@ -11,7 +11,7 @@
     "antd": "~4.24.8",
     "axios": "~1.1.3",
     "jszip": "~3.10.1",
-    "kn-hooks": "~0.0.35",
+    "kn-hooks": "~1.0.2",
     "moment": "~2.29.4",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",

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

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

package/templates/template_admin/public/src/{_reset.less → _reset.module.less}

@@ -1,6 +1,6 @@
 
-@import '~@/assets/iconfont/iconfont.less';
-@import './_variable.less';
+@import '~@/assets/iconfont/iconfont.module.less';
+@import './_variable.module.less';
 
 :global {
   html{

package/templates/template_admin/public/src/components/antd/tooltip/detail/index.jsx

@@ -5,7 +5,7 @@ import {  Modal } from "@/components/antd";
 // @ts-ignore
 import Popup from "@/components/popup";
 import { LayoutLanguage } from "@/components/layout/provider";
-import styles from './index.less';
+import styles from './index.module.less';
 import { useEffect } from "react";
 
 /**

package/templates/template_admin/public/src/components/antd/tooltip/detail/{index.less → index.module.less}

@@ -1,4 +1,4 @@
-@import '~@/_mixin.less';
+@import '~@/_mixin.module.less';
 
 .content{
   width: 100%;

package/templates/template_admin/public/src/components/antd/tooltip/index.jsx

@@ -1,6 +1,6 @@
 
 import React from "react";
-import styles from './index.less';
+import styles from './index.module.less';
 import { AntdTooltip } from "@/components/antd";
 import { useState } from "react";
 import { useEffect } from "react";

package/templates/template_admin/public/src/components/antd/tooltip/{index.less → index.module.less}

@@ -1,4 +1,4 @@
-@import '~@/_mixin.less';
+@import '~@/_mixin.module.less';
 
 .moreWrap{
   display: flex;

package/templates/template_admin/public/src/components/auth/index.jsx

@@ -7,7 +7,7 @@ import ProviderApp from '@/provider/app';
 
 import {useLoading} from '@/hooks/index';
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 import { AUTH_DEBUG_OPEN } from '@/config';
 import Page403 from '@/pages/error/403';
 

package/templates/template_admin/public/src/components/badge/index.jsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, useState } from "react";
 
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 
 const Badge=(props)=>{

package/templates/template_admin/public/src/components/debug/index.jsx

@@ -5,7 +5,7 @@ import ReactJson from 'react-json-view'
 // @ts-ignore
 import {Tooltip} from '@/components/antd';
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 /**
  * 测试调试时用于点击对象后显示数据用

package/templates/template_admin/public/src/components/empty/index.jsx

@@ -1,7 +1,7 @@
 // @ts-ignore
 import React from "react";
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 // @ts-ignore
 import imgEmpty from '@/assets/images/noData.png';
 // @ts-ignore

package/templates/template_admin/public/src/components/iconFont/index.jsx

@@ -1,7 +1,7 @@
 // @ts-ignore
 import React from "react";
 // @ts-ignore
-import styles from'./index.less';
+import styles from'./index.module.less';
 
 /**
  * iconFont图标

package/templates/template_admin/public/src/components/image/index.jsx

@@ -3,7 +3,7 @@ import React, { useState } from 'react';
 import { Image } from '@/components/antd';
 import ShowPreview from './preview';
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 // @ts-ignore
 import imgFail from '@/assets/images/loadFail.png';
 

package/templates/template_admin/public/src/components/image/preview.jsx

@@ -4,7 +4,7 @@ import { Image,Button,Space } from '@/components/antd';
 import { CloseOutlined } from '@ant-design/icons';
 import Popup from '@/components/popup';
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 const ModalPreview = (props) => {
   const { destory,data=[] } = props;

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

@@ -6,7 +6,7 @@ import {Outlet} from 'react-router-dom';
 import TopBar from '@/components/topMenu/topBar';
 
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 /**
  * 登录后的页面主体框架，定义导航栏、路由主体部分位置

package/templates/template_admin/public/src/components/layout/basic/{index.less → index.module.less}

@@ -1,5 +1,5 @@
-@import '~@/_variable.less';
-@import '~@/_mixin.less';
+@import '~@/_variable.module.less';
+@import '~@/_mixin.module.less';
 
 .layout{
   position: relative;

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

@@ -8,7 +8,7 @@ import LayoutBasic from './basic/index';
 import {LayoutLanguage} from './provider';
 
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 import { popupList } from '@/components/popup';
 

package/templates/template_admin/public/src/components/layout/{index.less → index.module.less}

@@ -1,5 +1,5 @@
-@import '~@/_variable.less';
-@import '~@/_mixin.less';
+@import '~@/_variable.module.less';
+@import '~@/_mixin.module.less';
 
 .absoluteLayout {
   width: 100%;

package/templates/template_admin/public/src/components/leftMenu/index.jsx

@@ -11,7 +11,7 @@ import {useLoading} from '@/hooks/index';
 import ProviderMenu from '@/provider/menu';
 
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 
 

package/templates/template_admin/public/src/components/leftMenu/{index.less → index.module.less}

@@ -1,6 +1,6 @@
-@import '~@/_variable.less';
+@import '~@/_variable.module.less';
 
-@import '~@/_mixin.less';
+@import '~@/_mixin.module.less';
 
 
 .nav{

package/templates/template_admin/public/src/components/link/index.jsx

@@ -4,7 +4,7 @@ import React  from 'react';
 import { openLink } from '@/utils';
 
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 /**
  * 超链接组件

package/templates/template_admin/public/src/components/link/{index.less → index.module.less}

@@ -1,4 +1,4 @@
-@import '~@/_variable.less';
+@import '~@/_variable.module.less';
 
 
 .linkWrap{

package/templates/template_admin/public/src/components/menuIcon/index.jsx

@@ -1,7 +1,7 @@
 
 import React,{  useState, useEffect } from 'react';
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 const MenuIcon=(props)=>{
   

package/templates/template_admin/public/src/components/page/pageLoading/index.jsx

@@ -9,7 +9,7 @@ import Popup from '@/components/popup';
 import imgLoading from '@/assets/images/loading.svg';
 
 // @ts-ignore
-import CSS from './index.less';
+import CSS from './index.module.less';
 
 /**
  * 页面Loading状态

package/templates/template_admin/public/src/components/popup/index.jsx

@@ -4,7 +4,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 styles;
 
 export const popupList={

package/templates/template_admin/public/src/components/table/column.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 // @ts-ignore
-import styles from './column.less';
+import styles from './column.module.less';
 import {DebugTableItem} from '@/components/debug';
 
 

package/templates/template_admin/public/src/components/table/index.jsx

@@ -2,7 +2,7 @@ import React,{useCallback} from 'react';
 // @ts-ignore
 import { Table } from '@/components/antd';
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 import Column from './column';
 
 export const SCROLL_CONFIG={x:'max-content',y:550} 

package/templates/template_admin/public/src/components/text/index.jsx

@@ -3,7 +3,7 @@ import React, { useEffect, useState, useRef } from 'react';
 import { Tooltip } from '@/components/antd';
 import { getStrByteLen } from '@/utils';
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 /**
  * 获取字符串末尾字节数的字符串、所在位置

package/templates/template_admin/public/src/components/toast/index.jsx

@@ -7,7 +7,7 @@ import ReactDOM from 'react-dom';
 import Popup from '@/components/popup';
 
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 const toastList=[];
 const runNext=()=>{

package/templates/template_admin/public/src/components/toast/{index.less → index.module.less}

@@ -1,4 +1,4 @@
-@import '~@/_variable.less';
+@import '~@/_variable.module.less';
 
 .wrap{
   position: fixed;

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

@@ -11,7 +11,7 @@ import TopBar from './topBar';
 import {DEBUG_ENV} from '@/config';
 
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 const TopSlogan=()=>{
   const navigate = useNavigate();

package/templates/template_admin/public/src/components/topMenu/{index.less → index.module.less}

@@ -1,5 +1,5 @@
-@import '~@/_variable.less';
-@import '~@/_mixin.less';
+@import '~@/_variable.module.less';
+@import '~@/_mixin.module.less';
 
 @menuWidth:70px;
 @openMenuWidth:128px;

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

@@ -11,7 +11,7 @@ import imgUser from '@/assets/images/icon-user.png';
 import ProviderApp from '@/provider/app';
 
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 
 const TopBar=()=>{

package/templates/template_admin/public/src/components/topMenu/topBar/{index.less → index.module.less}

@@ -1,4 +1,4 @@
-@import '~@/_mixin.less';
+@import '~@/_mixin.module.less';
 
 .toggle{
   width: 24px;

package/templates/template_admin/public/src/components/video/index.jsx

@@ -3,7 +3,7 @@ import ShowPreview from './preview';
 // @ts-ignore
 import moment from 'moment';
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 // @ts-ignore
 import imgFail from '@/assets/images/loadFail.png'; 
 

package/templates/template_admin/public/src/components/video/preview.jsx

@@ -3,7 +3,7 @@ import ReactDom from 'react-dom';
 import { CloseOutlined } from '@ant-design/icons';
 import Popup from '@/components/popup';
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 const ModalPreview = (props) => {
   const { destory, src } = props;

package/templates/template_admin/public/src/index.jsx

@@ -1,7 +1,7 @@
 // @ts-ignore
 import React from 'react';
 import './_antd.less';
-import './_reset.less';
+import './_reset.module.less';
 import RouteList from './route';
 // @ts-ignore
 import moment from 'moment';

package/templates/template_admin/public/src/pages/auth/user/create/index.jsx

@@ -17,7 +17,7 @@ import {
 } from '@/services/demo';
 
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 const AuthUserCreate = () => {
   return (

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

@@ -3,7 +3,7 @@ import React from 'react';
 import { useNavigate } from 'react-router-dom';
 import _TitleBar from './titleBar';
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 
 

package/templates/template_admin/public/src/pages/components/layout/{index.less → index.module.less}

@@ -1,4 +1,4 @@
-@import '~@/_mixin.less';
+@import '~@/_mixin.module.less';
 
 .layout{
   position: relative;

package/templates/template_admin/public/src/pages/components/layout/titleBar/index.jsx

@@ -5,7 +5,7 @@ import { useNavigate } from 'react-router-dom';
 // @ts-ignore
 import imgArrow from '@/assets/images/arrow.png';
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 const TitleBar = (props) => {
   const { optionLeft, optionRight,label,showBack,className='' } = props;

package/templates/template_admin/public/src/pages/components/layout/titleBar/{index.less → index.module.less}

@@ -1,4 +1,4 @@
-@import '~@/_mixin.less';
+@import '~@/_mixin.module.less';
 
 
 .title {

package/templates/template_admin/public/src/pages/error/permission.jsx

@@ -7,7 +7,7 @@ import { Button } from "@/components/antd";
 // @ts-ignore
 import { px2rem } from '@/utils';
 // @ts-ignore
-import styles from './permission.less';
+import styles from './permission.module.less';
 
 /**
  * permission页面

package/templates/template_admin/public/src/pages/home.jsx

@@ -14,7 +14,7 @@ import { AuthShow } from '@/components/auth';
 
 import {useMessageStatus} from '@/dictionary';
 // @ts-ignore
-import styles from './home.less';
+import styles from './home.module.less';
 
 const Home = () => {
 

package/templates/template_admin/public/src/pages/login/index.jsx

@@ -7,7 +7,7 @@ import ruler from '@/utils/rule';
 // @ts-ignore
 import {Button,Tabs,Form,Input} from '@/components/antd';
 // @ts-ignore
-import styles from './index.less';
+import styles from './index.module.less';
 
 import {jumpUrl} from '@/utils';
 // @ts-ignore

package/templates/template_admin/public/src/pages/login/{index.less → index.module.less}

@@ -1,4 +1,4 @@
-@import  '~@/_mixin.less';
+@import  '~@/_mixin.module.less';
 
 @keyframes rotate {
   from {

package/templates/template_admin/public/src/pages/pageTemplate.jsx

@@ -3,7 +3,7 @@ import React from 'react';
 import {Layout,SearchBar,TitleBar,Content,Panel} from './components/layout'
 
 // @ts-ignore
-import styles from './home.less';
+import styles from './home.module.less';
 
 const PageTemplate = (props) => {
   const {name} = props;

package/templates/template_admin/renamejstojsx.js

@@ -0,0 +1,45 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+// --- 配置区 ---
+// 将这里的 'public/src' 修改为你实际的源码目录
+const TARGET_DIR = './public/src'; 
+
+// 获取绝对路径
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const rootPath = path.resolve(__dirname, TARGET_DIR);
+
+const FILE_LIST=[
+  'dictionary/index.js',
+  'pages/bullet/gdtAssets/audienceManage/targetTemplate/dxbTemplate/weiChatPcMarket/components/index.js',
+  'pages/bullet/kuaiShou/creativeTag/create/index.js',
+  'pages/bullet/material/word/wordManagement/create/index.js',
+  'utils/version.js',
+  'pages/components/select/userState/index.js',
+  'pages/bullet/material/word/wordManagement/index.js',
+  'pages/components/select/userZero/index.js',
+  'pages/bullet/selfLandingPage/landingPage/htmlModal/index.js',
+  'pages/dashboard/components/batchGlobalModal/formItemsConfig.js',
+  'pages/equipment/tag/create/index.js'
+]
+
+let count = 0;
+FILE_LIST.forEach(file=>{
+  const filePath = rootPath+'/'+file;
+  console.log(`🚀 开始处理: ${filePath}`);
+  const stats = fs.statSync(filePath);
+  if (stats.isFile()) {
+      const newFilePath = filePath.replace(/\.js$/, '.jsx');
+      // 执行重命名
+      try {
+        // fs.renameSync(filePath, newFilePath);
+        console.log(`✅ Renamed: ${file} -> ${path.basename(newFilePath)}`);
+        count++;
+      } catch (err) {
+        console.error(`❌ Failed: ${file}`, err);
+      }
+  }
+})
+
+console.log(`\n✨ 完成！共重命名了 ${count} 个文件。`);

package/templates/template_admin/renameless.js

@@ -0,0 +1,53 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+// --- 配置区 ---
+// 将这里的 'public/src' 修改为你实际的源码目录
+const TARGET_DIR = './public/src'; 
+
+// 获取绝对路径
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const rootPath = path.resolve(__dirname, TARGET_DIR);
+
+let count = 0;
+
+/**
+ * 递归遍历并重命名
+ * @param {string} dir 
+ */
+function walk(dir) {
+  const files = fs.readdirSync(dir);
+
+  files.forEach((file) => {
+    const filePath = path.join(dir, file);
+    const stats = fs.statSync(filePath);
+
+    if (stats.isDirectory()) {
+      // 递归进入子目录
+      walk(filePath);
+    } else if (stats.isFile()) {
+      // 匹配逻辑：以 .less 结尾，但不是以 .module.less 结尾
+      if (file.endsWith('.less') && !file.endsWith('.module.less')) {
+        const newFilePath = filePath.replace(/\.less$/, '.module.less');
+        
+        // 执行重命名
+        try {
+          fs.renameSync(filePath, newFilePath);
+          console.log(`✅ Renamed: ${file} -> ${path.basename(newFilePath)}`);
+          count++;
+        } catch (err) {
+          console.error(`❌ Failed: ${file}`, err);
+        }
+      }
+    }
+  });
+}
+
+console.log(`🚀 开始处理目录: ${rootPath}`);
+if (fs.existsSync(rootPath)) {
+  walk(rootPath);
+  console.log(`\n✨ 完成！共重命名了 ${count} 个文件。`);
+} else {
+  console.error(`❌ 错误：目录 ${rootPath} 不存在，请检查配置。`);
+}

package/templates/template_admin/webpack.api.js

@@ -21,36 +21,76 @@ const configs = {
 
 
 const API_PROXY= {
-  '/api/**': {
-    target: 'http://192.168.92.117:8080',
+  '/uatapi':{
+    target:'https://uat-zeus.kingnet.com/',
     changeOrigin: true,
-    logLevel: 'debug',
+    logLevel: 'error',
     pathRewrite: {
-      '^/api': '/', // rewrite path
+      '^/uatapi': '', // rewrite path
     },
   },
-  '/devapi/**':{
+  '/devapi':{
     target:'https://dev-zeus.kingnet.com/',
     changeOrigin: true,
-    logLevel: 'debug',
+    logLevel: 'error',
     pathRewrite: {
-      '^/devapi': '/', // rewrite path
+      '^/devapi': '', // rewrite path
     },
   },
-  '/preapi/**': {
+  '/preapi': {
     target:'https://pre-zeus.kingnet.com/',
     changeOrigin: true,
-    logLevel: 'debug',
+    logLevel: 'error',
     pathRewrite: {
-      '^/preapi': '/', // rewrite path
-    },
+      '^/preapi': '', // rewrite path
+    }
   },
-  '/prodapi/**': {
+  '/prodapi': {
     target:'https://zeus.kingnet.com/',
     changeOrigin: true,
-    logLevel: 'debug',
+    logLevel: 'error',
+    pathRewrite: {
+      '^/prodapi': '', // rewrite path
+    },
+  },
+  '/report-api': {
+    target: 'http://192.168.100.22:8085/api-report',
+    changeOrigin: true,
+    logLevel: 'error',
+    pathRewrite: {
+      '^/report-api': '', // rewrite path
+    },
+  },
+  '/uat-report-api': {
+    target: 'https://uat-zeus.kingnet.com/api-report',
+    changeOrigin: true,
+    logLevel: 'error',
+    pathRewrite: {
+      '^/uat-report-api': '', // rewrite path
+    },
+  },
+  '/dev-report-api': {
+    target: 'https://dev-zeus.kingnet.com/api-report',
+    changeOrigin: true,
+    logLevel: 'error',
+    pathRewrite: {
+      '^/dev-report-api': '', // rewrite path
+    },
+  },
+  '/prod-report-api': {
+    target: 'https://zeus.kingnet.com/api-report',
+    changeOrigin: true,
+    logLevel: 'error',
+    pathRewrite: {
+      '^/prod-report-api': '', // rewrite path
+    },
+  },
+  '/pre-report-api': {
+    target: 'https://pre-zeus.kingnet.com/api-report',
+    changeOrigin: true,
+    logLevel: 'error',
     pathRewrite: {
-      '^/prodapi': '/', // rewrite path
+      '^/pre-report-api': '', // rewrite path
     },
   },
 };