From 2618364d3eec1adb1dbdb6dd82bd1b30c962d4ba Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 06 5月 2025 13:34:30 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Code/MainForm.cs | 6 +++---
Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt | 2 +-
Weben_CMS专用代码生成器/Code/Templete/Web/Views/NameSpacePath模板.txt | 6 +++---
Weben_CMS专用代码生成器/Code/Templete/Web/index模板.txt | 6 +++---
Weben_CMS专用代码生成器/Code/Templete/Web/Views/NameSpacePath_module模板.txt | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs"
index b318342..307c43b 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs"
@@ -349,15 +349,15 @@
//20銆佺敓鎴� Views\NameSpacePath 鏂囦欢
str_generate = NameSpacePath_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views", $"{param.NameSpacePath}.tsx", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views", $"{param.EntityName}.tsx", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
//21銆佺敓鎴� Views\NameSpacePath_module 鏂囦欢
str_generate = NameSpacePath_module_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views", $"{param.NameSpacePath}.module.scss", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views", $"{param.EntityName}.module.scss", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
//22銆佺敓鎴� Views\NameSpacePath_Config 鏂囦欢
str_generate = NameSpacePath_Config_Generate.CreateText(param);
- tf = TextHelper.Export2File_V2(webRootPath + @"\Views\config", $"{param.NameSpacePath}.module.scss", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
+ tf = TextHelper.Export2File_V2(webRootPath + @"\Views\config", $"{param.EntityName}.module.scss", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
//23銆佺敓鎴� Views\NameSpacePath_Config 鏂囦欢
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/NameSpacePath_module\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/NameSpacePath_module\346\250\241\346\235\277.txt"
index 3ac3897..01b0ce8 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/NameSpacePath_module\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/NameSpacePath_module\346\250\241\346\235\277.txt"
@@ -1,4 +1,4 @@
-.$NameSpacePath$ {
+.$EntityName$ {
background-color: #fff;
border-radius: 5px 5px 0 0;
width: 100%;
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/NameSpacePath\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/NameSpacePath\346\250\241\346\235\277.txt"
index 121761b..17c1073 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/NameSpacePath\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/NameSpacePath\346\250\241\346\235\277.txt"
@@ -7,7 +7,7 @@
SetupContext,
onMounted,
} from 'vue'
-import styles from './$NameSpacePath$.module.scss'
+import styles from './$EntityName$.module.scss'
import Tab from '@/components/Tab/Tab'
import { useProvideModels } from '@/libs/Provider/app'
import { usePermission } from '@/libs/Permission/Permission'
@@ -25,7 +25,7 @@
const nameToLabelMap = [{ name: '$EntityName$', label: '$PageMenuName$' }]
export default defineComponent({
- name: '$NameSpacePath$',
+ name: '$EntityName$',
setup(props, ctx: SetupContext) {
useProvideModels()
@@ -60,7 +60,7 @@
return () => {
return (
- <div class={styles.$NameSpacePath$}>
+ <div class={styles.$EntityName$}>
<Tab data={tabData.value} type="list" onTab={onTabChange}>
{tabData.value.map((widgetInfo) => {
const Widget: any = widgetInfo.component
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
index 86f92e8..ca053ba 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
@@ -12,7 +12,7 @@
import { vPermission } from '@/libs/Permission/Permission'
import {
getWmsEnumData
-} from '@/widgets/$NameSpacePath$/Models/Service/$EntityName$Drawer'
+} from '@/widgets/$EntityName$/Models/Service/$EntityName$Drawer'
import {
ElInput,
ElSelect,
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/index\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/index\346\250\241\346\235\277.txt"
index d8757c5..5419f2d 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/index\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/index\346\250\241\346\235\277.txt"
@@ -1,14 +1,14 @@
-import $NameSpacePath$ from './Views/$NameSpacePath$'
+import $EntityName$ from './Views/$EntityName$'
import Setting from '@/components/Setting/Setting'
import { provider } from '@/provider/index'
import p from '../../assets/svg/p.svg'
export default {
- is: '$NameSpacePath$',
+ is: '$EntityName$',
name: '$PageMenuName$',
category: 'run',
icon: p,
authorizationRequired: false,
- canvasView: provider($NameSpacePath$),
+ canvasView: provider($EntityName$),
settingsView: Setting,
}
--
Gitblit v1.9.3