Mosher 发布系统代码 [后台服务，演示应用]

88237a6d · ibizdev · 3b8e4f03 · 88237a6d · 88237a6d · 88237a6d
--- a/app_Web/public/assets/json/view-config.json
+++ b/app_Web/public/assets/json/view-config.json
@@ -847,6 +847,14 @@
        "viewname": "IBIZHardwareEditView",
        "viewtag": "e30db3af513fb7b7bf44a8744ed5f7a4"
    },
+    "ibizbookupdatedefaultgridview": {
+        "title": "图书表格视图（更新默认值）",
+        "caption": "图书",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Sample",
+        "viewname": "IBIZBOOKUpdateDefaultGridView",
+        "viewtag": "e53fed4d0b4dd614057f426b02115b41"
+    },
    "ibizordersf4editview": {
        "title": "订单编辑视图",
        "caption": "订单",

--- a/app_Web/src/locale/lang/en-US.ts
+++ b/app_Web/src/locale/lang/en-US.ts
@@ -188,7 +188,7 @@ export default {
                menuitem58: "行编辑",
                menuitem73: "表格内置功能",
                menuitem74: "行编辑",
-                menuitem75: "更新默认值",
+                menuitem75: "新建默认值",
                menuitem14: "树视图",
                menuitem60: "静态节点",
                menuitem61: "动态节点（代码表）",

--- a/app_Web/src/locale/lang/zh-CN.ts
+++ b/app_Web/src/locale/lang/zh-CN.ts
@@ -188,7 +188,7 @@ export default {
                menuitem58: "行编辑",
                menuitem73: "表格内置功能",
                menuitem74: "行编辑",
-                menuitem75: "更新默认值",
+                menuitem75: "新建默认值",
                menuitem14: "树视图",
                menuitem60: "静态节点",
                menuitem61: "动态节点（代码表）",

--- a/app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts
+++ b/app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts
@@ -21,6 +21,10 @@ export default {
 			caption: "图书",
      		title: "图书表格视图（行编辑）",
 		},
+		updatedefaultgridview: {
+			caption: "图书",
+      		title: "图书表格视图（更新默认值）",
+		},
 		internalfuncgridview: {
 			caption: "图书",
      		title: "表格内置功能",
@@ -91,6 +95,19 @@ export default {
 		uiactions: {
 		},
 	},
+	updatedefault_grid: {
+		columns: {
+			ibizbookname: "图书名称",
+			author: "图书作者",
+			type: "图书类型",
+			press: "图书出版社",
+			price: "图书价格",
+			updatedate: "更新时间",
+		},
+		nodata:"",
+		uiactions: {
+		},
+	},
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
@@ -282,4 +299,6 @@ export default {
 			tip: "数据导入",
 		},
 	},
+	updatedefaultgridviewtoolbar_toolbar: {
+	},
 };
\ No newline at end of file
--- a/app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts
+++ b/app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts
@@ -20,6 +20,10 @@ export default {
 			caption: "图书",
      		title: "图书表格视图（行编辑）",
 		},
+		updatedefaultgridview: {
+			caption: "图书",
+      		title: "图书表格视图（更新默认值）",
+		},
 		internalfuncgridview: {
 			caption: "图书",
      		title: "表格内置功能",
@@ -90,6 +94,19 @@ export default {
 		uiactions: {
 		},
 	},
+	updatedefault_grid: {
+		columns: {
+			ibizbookname: "图书名称",
+			author: "图书作者",
+			type: "图书类型",
+			press: "图书出版社",
+			price: "图书价格",
+			updatedate: "更新时间",
+		},
+		nodata:"",
+		uiactions: {
+		},
+	},
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
@@ -281,4 +298,6 @@ export default {
 			tip: "数据导入",
 		},
 	},
+	updatedefaultgridviewtoolbar_toolbar: {
+	},
 };
\ No newline at end of file
--- a/app_Web/src/mock/app/main-menu-appmenu/main-menu-appmenu.ts
+++ b/app_Web/src/mock/app/main-menu-appmenu/main-menu-appmenu.ts
@@ -467,10 +467,10 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
 		{
 	id: '994E0B40-015E-41C2-AFE0-5817BFF2AD07',
 	name: 'menuitem75',
-	text: '更新默认值',
+	text: '新建默认值',
 	type: 'MENUITEM',
 	counterid: '',
-	tooltip: '更新默认值',
+	tooltip: '新建默认值',
 	expanded: false,
 	separator: false,
 	hidden: false,

--- a/app_Web/src/mock/viewconfig/viewconfig.ts
+++ b/app_Web/src/mock/viewconfig/viewconfig.ts
@@ -855,6 +855,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
            "viewname": "IBIZHardwareEditView",
            "viewtag": "e30db3af513fb7b7bf44a8744ed5f7a4"
        },
+        "ibizbookupdatedefaultgridview": {
+            "title": "图书表格视图（更新默认值）",
+            "caption": "图书",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Sample",
+            "viewname": "IBIZBOOKUpdateDefaultGridView",
+            "viewtag": "e53fed4d0b4dd614057f426b02115b41"
+        },
        "ibizordersf4editview": {
            "title": "订单编辑视图",
            "caption": "订单",

--- a/app_Web/src/uiservice/ibizbook/ibizbook-ui-service-base.ts
+++ b/app_Web/src/uiservice/ibizbook/ibizbook-ui-service-base.ts
@@ -98,6 +98,7 @@ export default class IBIZBOOKUIServiceBase extends UIService {
    public initViewMap(){
        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'ibizbooks',component:'ibizbookedit-view'});
        this.allViewMap.set(':',{viewname:'roweditgridview',srfappde:'ibizbooks',component:'ibizbookrow-edit-grid-view'});
+        this.allViewMap.set(':',{viewname:'updatedefaultgridview',srfappde:'ibizbooks',component:'ibizbookupdate-default-grid-view'});
        this.allViewMap.set(':',{viewname:'internalfuncgridview',srfappde:'ibizbooks',component:'ibizbookinternal-func-grid-view'});
        this.allViewMap.set(':',{viewname:'newdefaultvaluegridview',srfappde:'ibizbooks',component:'ibizbooknew-default-value-grid-view'});
    }

--- a/app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-model.ts
+++ b/app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-model.ts
@@ -496,10 +496,10 @@ export default class MainMenuModel {
 		{
 	id: '994E0B40-015E-41C2-AFE0-5817BFF2AD07',
 	name: 'menuitem75',
-	text: '更新默认值',
+	text: '新建默认值',
 	type: 'MENUITEM',
 	counterid: '',
-	tooltip: '更新默认值',
+	tooltip: '新建默认值',
 	expanded: false,
 	separator: false,
 	hidden: false,

--- a/app_Web/src/widgets/ibizbook/main-form/main-form-base.vue
+++ b/app_Web/src/widgets/ibizbook/main-form/main-form-base.vue
@@ -682,7 +682,7 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
        srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        ibizbookname: new FormItemModel({ caption: '图书名称', detailType: 'FORMITEM', name: 'ibizbookname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        ibizbookname: new FormItemModel({ caption: '图书名称', detailType: 'FORMITEM', name: 'ibizbookname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
 , 
        createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 

--- a/app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue
@@ -880,8 +880,8 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书出版社 值不能为空', trigger: 'blur' },
        ],
        ibizbookname: [
-             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书名称 值不能为空', trigger: 'change' },
-            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书名称 值不能为空', trigger: 'blur' },
+             { required: true, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书名称 值不能为空', trigger: 'change' },
+            { required: true, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书名称 值不能为空', trigger: 'blur' },
        ],
        price: [
             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书价格 值不能为空', trigger: 'change' },

--- a/app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue
+++ b/app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue
@@ -850,8 +850,8 @@ export default class RowEditBase extends Vue implements ControlInterface {
            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书出版社 值不能为空', trigger: 'blur' },
        ],
        ibizbookname: [
-             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书名称 值不能为空', trigger: 'change' },
-            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书名称 值不能为空', trigger: 'blur' },
+             { required: true, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书名称 值不能为空', trigger: 'change' },
+            { required: true, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书名称 值不能为空', trigger: 'blur' },
        ],
        price: [
             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图书价格 值不能为空', trigger: 'change' },

--- a/demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZOrderImport.java
+++ b/demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZOrderImport.java
@@ -8,10 +8,10 @@ import java.util.List;
 public interface IBIZOrderImport {
    @Mappings({
        @Mapping(target = "ibizorderid", source = "ibizorderid"),
+        @Mapping(target = "ibizordername", source = "ibizordername"),
        @Mapping(target = "ordertype", source = "ordertype"),
        @Mapping(target = "ordertime", source = "ordertime"),
        @Mapping(target = "orderuid", source = "orderuid"),
-        @Mapping(target = "ibizordername", source = "ibizordername"),
    })
    @BeanMapping(ignoreByDefault = true)
    IBIZOrder toDomain(IBIZOrder entity);

--- a/demo-core/src/main/resources/liquibase/h2_table.xml
+++ b/demo-core/src/main/resources/liquibase/h2_table.xml
@@ -28,7 +28,7 @@


    <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-23-2">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-49-2">
        <createTable tableName="T_IBIZBOOK">
                <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                </column>

--- a/demo-core/src/main/resources/permission/systemResource.json
+++ b/demo-core/src/main/resources/permission/systemResource.json
@@ -302,7 +302,7 @@
            {
               "appid":"Web",
               "appname":"演示应用",
-               "appmenu":[{"menuid":"MainMenu", "menuname":"MainMenu", "menuitem":[{ "id":"menuitem1" , "name":"工作台" },{ "id":"menuitem3" , "name":"控件" , "items":[{ "id":"menuitem6" , "name":"默认数据类型" },{ "id":"menuitem7" , "name":"默认编辑器类型" },{ "id":"menuitem15" , "name":"基础表单项" },{ "id":"menuitem72" , "name":"编辑器扩展" }]},{ "id":"menuitem4" , "name":"部件" , "items":[{ "id":"menuitem12" , "name":"编辑表单" , "items":[{ "id":"menuitem47" , "name":"默认值" },{ "id":"menuitem48" , "name":"输入提示" },{ "id":"menuitem49" , "name":"辅助输入" },{ "id":"menuitem50" , "name":"自动填充" },{ "id":"menuitem51" , "name":"超链接" },{ "id":"menuitem52" , "name":"值重置" },{ "id":"menuitem55" , "name":"动态显示" },{ "id":"menuitem53" , "name":"动态启用" },{ "id":"menuitem54" , "name":"动态空输入" },{ "id":"menuitem56" , "name":"表单项更新" }]},{ "id":"menuitem16" , "name":"搜索表单" },{ "id":"menuitem13" , "name":"表格" , "items":[{ "id":"menuitem57" , "name":"禁用排序" },{ "id":"menuitem59" , "name":"行操作" },{ "id":"menuitem58" , "name":"行编辑" },{ "id":"menuitem73" , "name":"表格内置功能" },{ "id":"menuitem74" , "name":"行编辑" },{ "id":"menuitem75" , "name":"更新默认值" }]},{ "id":"menuitem14" , "name":"树视图" , "items":[{ "id":"menuitem60" , "name":"静态节点" },{ "id":"menuitem61" , "name":"动态节点（代码表）" },{ "id":"menuitem62" , "name":"动态节点（实体）" },{ "id":"menuitem63" , "name":"右键操作" },{ "id":"menuitem64" , "name":"动态参数过滤" }]},{ "id":"menuitem37" , "name":"图表" , "items":[{ "id":"menuitem38" , "name":"柱状图" },{ "id":"menuitem39" , "name":"折线图" },{ "id":"menuitem40" , "name":"饼图" },{ "id":"menuitem41" , "name":"区域图" },{ "id":"menuitem42" , "name":"雷达图" },{ "id":"menuitem43" , "name":"仪表盘" },{ "id":"menuitem44" , "name":"K线图" }]},{ "id":"menuitem17" , "name":"向导" },{ "id":"menuitem18" , "name":"界面行为" , "items":[{ "id":"menuitem65" , "name":"前端界面行为" },{ "id":"menuitem66" , "name":"后台界面行为" }]}]},{ "id":"menuitem5" , "name":"视图" , "items":[{ "id":"menuitem9" , "name":"列表视图" , "items":[{ "id":"menuitem19" , "name":"常规表格视图" },{ "id":"menuitem21" , "name":"左右表格视图" },{ "id":"menuitem20" , "name":"嵌入表格视图" }]},{ "id":"menuitem8" , "name":"编辑视图" , "items":[{ "id":"menuitem22" , "name":"常规编辑视图" },{ "id":"menuitem23" , "name":"左右编辑视图" },{ "id":"menuitem24" , "name":"分页编辑视图" },{ "id":"menuitem25" , "name":"嵌入编辑视图" }]},{ "id":"menuitem26" , "name":"选择视图" , "items":[{ "id":"menuitem27" , "name":"单选视图" },{ "id":"menuitem28" , "name":"多选视图" },{ "id":"menuitem29" , "name":"树形选择视图" },{ "id":"menuitem30" , "name":"左右单选视图" },{ "id":"menuitem31" , "name":"左右多选视图" }]},{ "id":"menuitem10" , "name":"导航视图" , "items":[{ "id":"menuitem32" , "name":"常规导航视图" },{ "id":"menuitem33" , "name":"分页导航视图" },{ "id":"menuitem34" , "name":"嵌入导航视图" }]},{ "id":"menuitem11" , "name":"其他视图" , "items":[{ "id":"menuitem35" , "name":"图表视图" },{ "id":"menuitem36" , "name":"报表视图" }]}]},{ "id":"menuitem69" , "name":"工作流" },{ "id":"menuitem2" , "name":"更多" , "items":[{ "id":"menuitem46" , "name":"数据导出导入" },{ "id":"menuitem45" , "name":"数据打印" },{ "id":"menuitem67" , "name":"索引实体" },{ "id":"menuitem68" , "name":"继承实体" },{ "id":"menuitem70" , "name":"主状态" },{ "id":"menuitem71" , "name":"多表单" }]}] }]
+               "appmenu":[{"menuid":"MainMenu", "menuname":"MainMenu", "menuitem":[{ "id":"menuitem1" , "name":"工作台" },{ "id":"menuitem3" , "name":"控件" , "items":[{ "id":"menuitem6" , "name":"默认数据类型" },{ "id":"menuitem7" , "name":"默认编辑器类型" },{ "id":"menuitem15" , "name":"基础表单项" },{ "id":"menuitem72" , "name":"编辑器扩展" }]},{ "id":"menuitem4" , "name":"部件" , "items":[{ "id":"menuitem12" , "name":"编辑表单" , "items":[{ "id":"menuitem47" , "name":"默认值" },{ "id":"menuitem48" , "name":"输入提示" },{ "id":"menuitem49" , "name":"辅助输入" },{ "id":"menuitem50" , "name":"自动填充" },{ "id":"menuitem51" , "name":"超链接" },{ "id":"menuitem52" , "name":"值重置" },{ "id":"menuitem55" , "name":"动态显示" },{ "id":"menuitem53" , "name":"动态启用" },{ "id":"menuitem54" , "name":"动态空输入" },{ "id":"menuitem56" , "name":"表单项更新" }]},{ "id":"menuitem16" , "name":"搜索表单" },{ "id":"menuitem13" , "name":"表格" , "items":[{ "id":"menuitem57" , "name":"禁用排序" },{ "id":"menuitem59" , "name":"行操作" },{ "id":"menuitem58" , "name":"行编辑" },{ "id":"menuitem73" , "name":"表格内置功能" },{ "id":"menuitem74" , "name":"行编辑" },{ "id":"menuitem75" , "name":"新建默认值" }]},{ "id":"menuitem14" , "name":"树视图" , "items":[{ "id":"menuitem60" , "name":"静态节点" },{ "id":"menuitem61" , "name":"动态节点（代码表）" },{ "id":"menuitem62" , "name":"动态节点（实体）" },{ "id":"menuitem63" , "name":"右键操作" },{ "id":"menuitem64" , "name":"动态参数过滤" }]},{ "id":"menuitem37" , "name":"图表" , "items":[{ "id":"menuitem38" , "name":"柱状图" },{ "id":"menuitem39" , "name":"折线图" },{ "id":"menuitem40" , "name":"饼图" },{ "id":"menuitem41" , "name":"区域图" },{ "id":"menuitem42" , "name":"雷达图" },{ "id":"menuitem43" , "name":"仪表盘" },{ "id":"menuitem44" , "name":"K线图" }]},{ "id":"menuitem17" , "name":"向导" },{ "id":"menuitem18" , "name":"界面行为" , "items":[{ "id":"menuitem65" , "name":"前端界面行为" },{ "id":"menuitem66" , "name":"后台界面行为" }]}]},{ "id":"menuitem5" , "name":"视图" , "items":[{ "id":"menuitem9" , "name":"列表视图" , "items":[{ "id":"menuitem19" , "name":"常规表格视图" },{ "id":"menuitem21" , "name":"左右表格视图" },{ "id":"menuitem20" , "name":"嵌入表格视图" }]},{ "id":"menuitem8" , "name":"编辑视图" , "items":[{ "id":"menuitem22" , "name":"常规编辑视图" },{ "id":"menuitem23" , "name":"左右编辑视图" },{ "id":"menuitem24" , "name":"分页编辑视图" },{ "id":"menuitem25" , "name":"嵌入编辑视图" }]},{ "id":"menuitem26" , "name":"选择视图" , "items":[{ "id":"menuitem27" , "name":"单选视图" },{ "id":"menuitem28" , "name":"多选视图" },{ "id":"menuitem29" , "name":"树形选择视图" },{ "id":"menuitem30" , "name":"左右单选视图" },{ "id":"menuitem31" , "name":"左右多选视图" }]},{ "id":"menuitem10" , "name":"导航视图" , "items":[{ "id":"menuitem32" , "name":"常规导航视图" },{ "id":"menuitem33" , "name":"分页导航视图" },{ "id":"menuitem34" , "name":"嵌入导航视图" }]},{ "id":"menuitem11" , "name":"其他视图" , "items":[{ "id":"menuitem35" , "name":"图表视图" },{ "id":"menuitem36" , "name":"报表视图" }]}]},{ "id":"menuitem69" , "name":"工作流" },{ "id":"menuitem2" , "name":"更多" , "items":[{ "id":"menuitem46" , "name":"数据导出导入" },{ "id":"menuitem45" , "name":"数据打印" },{ "id":"menuitem67" , "name":"索引实体" },{ "id":"menuitem68" , "name":"继承实体" },{ "id":"menuitem70" , "name":"主状态" },{ "id":"menuitem71" , "name":"多表单" }]}] }]
            }
            ]
    }
--- a/demo-core/src/main/resources/sysmodel/DemoSys.json
+++ b/demo-core/src/main/resources/sysmodel/DemoSys.json
@@ -181,7 +181,7 @@
    "field_logic_name":"图书名称",
    "entity_name":"IBIZBOOK",
    "field_type":"TEXT",
-    "nullable":1,
+    "nullable":0,
    "physical_field":1,
    "data_type":"VARCHAR",
    "data_length":200,

--- a/demo-provider/demo-provider-demoapi/src/main/java/cn/ibizlab/demoapi/dto/IBIZBOOKDTO.java
+++ b/demo-provider/demo-provider-demoapi/src/main/java/cn/ibizlab/demoapi/dto/IBIZBOOKDTO.java
@@ -44,6 +44,7 @@ public class IBIZBOOKDTO extends DTOBase implements Serializable {
     */
    @JSONField(name = "ibizbookname")
    @JsonProperty("ibizbookname")
+    @NotBlank(message = "[图书名称]不允许为空!")
    @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
    private String ibizbookname;