ibizdev提交

app_web/src/locale/lanres/sys-user-role/sys-user-role_en_US.ts

@@ -206,6 +206,64 @@ export default {
 			tip: "Help",
 		},
 	},
+	customviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem5: {
+			caption: "View",
+			tip: "View {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem16: {
+			caption: "其它",
+			tip: "其它",
+		},
+		tbitem21: {
+			caption: "Export Data Model",
+			tip: "导出数据模型",
+		},
+		tbitem23: {
+			caption: "数据导入",
+			tip: "数据导入",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem18: {
+			caption: "Help",
+			tip: "Help",
+		},
+	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",
@@ -272,4 +330,13 @@ export default {
 			tip: "Help",
 		},
 	},
+	sys_roletrees_treeview: {
+		nodes: {
+			root: '默认根节点',
+			create: '实体数据能力',
+			testentity: '实体',
+		},
+		uiactions: {
+		},
+	},
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-user-role/sys-user-role_zh_CN.ts

@@ -205,6 +205,64 @@ export default {
 			tip: '帮助',
 		},
 	},
+	customviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: '新建',
+			tip: '新建',
+		},
+		tbitem4: {
+			caption: '编辑',
+			tip: '编辑',
+		},
+		tbitem5: {
+			caption: '查看',
+			tip: '查看',
+		},
+		tbitem6: {
+			caption: '拷贝',
+			tip: '拷贝',
+		},
+		tbitem7: {
+			caption: '-',
+			tip: '',
+		},
+		tbitem8: {
+			caption: '删除',
+			tip: '删除',
+		},
+		tbitem9: {
+			caption: '-',
+			tip: '',
+		},
+		tbitem13: {
+			caption: '导出',
+			tip: '导出',
+		},
+		tbitem10: {
+			caption: '-',
+			tip: '',
+		},
+		tbitem16: {
+			caption: '其它',
+			tip: '其它',
+		},
+		tbitem21: {
+			caption: '导出数据模型',
+			tip: '导出数据模型',
+		},
+		tbitem23: {
+			caption: '数据导入',
+			tip: '数据导入',
+		},
+		tbitem17: {
+			caption: '-',
+			tip: '',
+		},
+		tbitem18: {
+			caption: '帮助',
+			tip: '帮助',
+		},
+	},
 	editview2toolbar_toolbar: {
 		tbitem3: {
 			caption: '保存',
@@ -271,4 +329,13 @@ export default {
 			tip: '帮助',
 		},
 	},
+	sys_roletrees_treeview: {
+		nodes: {
+			root: '默认根节点',
+			create: '实体数据能力',
+			testentity: '实体',
+		},
+		uiactions: {
+		},
+	},
 };
\ No newline at end of file

app_web/src/pages/uaa/sys-user-rolecustom-view/sys-user-rolecustom-view.less

 .sys-user-rolecustom-view{
     position: relative;
 }
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
 
 

app_web/src/pages/uaa/sys-user-rolecustom-view/sys-user-rolecustom-view.vue

@@ -2,8 +2,14 @@
 import { Component } from 'vue-property-decorator';
 import SYS_USER_ROLECustomViewBase from './sys-user-rolecustom-view-base.vue';
 
+import view_searchform from '@widgets/sys-user-role/default-searchform/default-searchform.vue';
+import view_grid from '@widgets/sys-user-role/main-grid/main-grid.vue';
+import view_treeview from '@widgets/sys-user-role/sys-roletrees-treeview/sys-roletrees-treeview.vue';
 @Component({
     components: {
+        view_searchform, 
+        view_grid, 
+        view_treeview, 
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {

app_web/src/store/modules/view-action/state.ts

@@ -256,6 +256,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '1ee68b6d5d4c5c9413f6874e0ccabc43',
             ],
         },
         {

app_web/src/widgets/sys-user-role/sys-roletrees-treeview/sys-roletrees-treeview-model.ts

+/**
+ * SYS_ROLETrees 部件模型
+ *
+ * @export
+ * @class SYS_ROLETreesModel
+ */
+export default class SYS_ROLETreesModel {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof SYS_ROLETreesModel
+    */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'sys_user_role',
+        prop: 'userroleid',
+      },
+      {
+        name: 'userrolename',
+      },
+      {
+        name: 'roleid',
+      },
+      {
+        name: 'rolename',
+      },
+      {
+        name: 'userid',
+      },
+      {
+        name: 'personname',
+      },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'updatedate',
+      },
+    ]
+  }
+
+
+}
\ No newline at end of file

app_web/src/widgets/sys-user-role/sys-roletrees-treeview/sys-roletrees-treeview.less

+.tree-right-menu {
+    .ivu-divider-horizontal {
+        width: calc(100% - 32px);
+        min-width: calc(100% - 32px);
+        margin: 0 auto;
+    }
+    .ivu-dropdown-item {
+        position: relative;
+        padding-left: 32px;
+        > i {
+            position: absolute;
+            left: 16px;
+            top: 10px;
+        }
+        .ivu-icon-ios-arrow-forward {
+            left: initial;
+            right: 4px;
+        }
+    }
+    .ivu-dropdown {
+        .ivu-select-dropdown {
+            margin: 0;
+        }
+    }
+}
+
+.el-tree .context-menu-component .tree-node{
+    width: calc(100% - 15px);
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+// this is less

app_web/src/widgets/sys-user-role/sys-roletrees-treeview/sys-roletrees-treeview.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import SYS_ROLETreesBase from './sys-roletrees-treeview-base.vue';
+
+ 
+@Component({
+    components: {
+         
+    }
+})
+export default class SYS_ROLETrees extends SYS_ROLETreesBase {
+
+}
+</script>
\ No newline at end of file

ibzuaa-core/src/main/resources/liquibase/h2_table.xml

@@ -94,7 +94,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[SYS_USER_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-43-5">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-44-5">
         <createTable tableName="IBZUSER_ROLE">
                 <column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
@@ -200,10 +200,10 @@
         <!--输出实体[SYS_USER]外键关系 -->
         <!--输出实体[SYS_PSSYSUNIRES]外键关系 -->
         <!--输出实体[SYS_USER_ROLE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-43-12">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-44-12">
        <addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-43-13">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-44-13">
        <addForeignKeyConstraint baseColumnNames="SYS_USERID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_USER_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZUSER" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_PERMISSION]外键关系 -->