zhouli 部署微服务应用

.gitignore

+*volumes
 *target
 .settings
 *node_modules

README.md

-# 系统概览
+# 系统概览 iBiz4j Spring R7 dev

app_EHRPim/CHANGELOG.md

-## v7.0.0-alpha.2 [2020-5-7]
+## v7.0.0-alpha.8 [2020-6-21]
 
 ### Bug修复
 
-分页导航栏添加图标配置
+修复分页导航视图页面刷新bug
+
+修复表单项更新，实体行为调用不到bug
+
+修复关系界面子界面保存不触发父界面保存
+
+修复表格行编辑切换，app-picker不显示
+
+修复表单样式调整
+
+修复标题工具栏样式遮挡bug
 
-工具栏按钮样式支持
+修复表格行编辑字段格式对齐
 
-模态边距样式调整
+修复日历部件初始化压缩成一行问题
+
+修复下拉多选组件最后一项数据无法删除
 
 ### 功能新增及优化
 
 #### 模板
 
-表格文件上传信息显示
+新增列表，数据视图保存功能
 
-批添加、批删除
+新增面包屑、应用切换器组件
 
-富文本信息模式
+新增支持表单、表格新建默认值（当前时间）
 
-更新默认值
+新增行编辑浮点数精度格式化
+
+优化表格操作列只显示图标时显示tooltip、门户部件标题界面行为tooltip
+
+优化门户部件高度为0时自适应
+
+优化面板和多数据部件数据流向
+
+优化嵌入视图中工具栏消息数量提示样式
+
+优化动态导航视图树样式
+
+#### 基础文件
+
+新增行编辑浮点数精度格式化
+
+优化formitem样式调整，label适配位置
+
+优化文件上传下载参数格式处理
+
+## v7.0.0-alpha.7 [2020-6-11]
+
+### Bug修复
+
+数值代码表多语言
+
+树右键菜单滚动条样式bug
+
+列表面板界面行为bug
+
+多选视图界面逻辑修复
+
+图表刷新bug修复
+
+日历部件选中抛出数据逻辑调整
+
+编辑视图，app-span显示0时不显示
+
+树视图右键界面行为刷新bug
+
+快捷菜单控制台报错bug
+
+门户加载自定义模型错误时，正常显示默认看板
+
+修复雷达图显示异常问题
+
+修复编辑类、分页导航视图带数据标题问题
+
+修复饼图、漏斗图 获取序列参数错误问题
+
+多选视图高度异常bug
+
+### 功能新增及优化
+
+#### 模板
+
+看板和门户布局模板调整，支持门户部件标题栏界面行为组
+
+支持数据选择、地址框、自动完成、下拉列表、标签、选项框列表、单选列表等编辑器导航参数调整
+
+支持树导航栏、表格导航栏、列表导航栏、卡片导航栏、日历导航栏、表单关系界面、数据选择面板、分页导航面板、数据关系栏、界面行为、新建逻辑、编辑逻辑导航参数调整
+
+支持图表无数据时显示暂无数据
+
+支持表格新建默认值
+
+支持日历部件右键菜单
+
+支持表格列触发界面行为
+
+面板布局调整
+
+添加头部菜单
+
+#### 基础文件
+
+门户部件视图的样式
+
+数据选择，地址框，自动完成，下拉列表，标签，选项框列表，单选列表等编辑器导航参数调整
+
+表单项label位置
+
+调整登录页面
+
+穿梭框编辑器支持
+
+添加头部菜单
+
+## v7.0.0-alpha.6 [2020-6-5]
+
+### Bug修复
+
+修复树右键菜单事件传值bug
+
+修复树节点图标样式
+
+修复viewdata和viewparams解析不同步
+
+修复界面行为多主键分隔符由";"改为","
+
+修复多层导航失效
+
+数据选择，自动填充编辑器参数处理，动态代码表编辑器参数
+
+修复富文本国际化bug
+
+修复坐标轴的自定义参数
+
+修复分页面板配置导航参数
+
+修复实体处理逻辑
+
+修复应用级context对象特性丢失的问题
+
+修复新建逻辑
+
+修复动态代码表传递上下文、参数逻辑
+
+### 功能新增及优化
+
+#### 模板
 
-看板视图默认卡片模式，支持无缝模式
+树选择双击
 
-树导航样式调整
+列表快速分组和快速搜索表单
 
-表格样式调整
+数据视图快速分组和快速搜索表单
 
-拖拽样式修改
+日历图例、日历快速分组和批处理工具栏
 
+实体国际化路径调整
+
+面板界面行为支持
+
+列表，数据视图下拉加载
+
+增加图表名称代码表识别、雷达图支持
+
+uaa菜单权限
+
+增加数据看板动态模型数据存库
+
+应用样式调整
 
 #### 基础文件
 
-看板视图默认卡片模式，支持无缝模式
+人员选择标准控件样式调整
+
+应用样式调整
+
+表格EX报错修复
+
+注销
+
+## v7.0.0-alpha.5 [2020-5-28]
+
+### Bug修复
+
+修复处理快速分组模型动态数据部分
+
+修复列表，数据视图默认排序
+
+修复门户部件flex布局
+
+修复表格选择框列样式出现省略号
+
+修复批删除传递参数调整
+
+修复表单上界面行为参数传递bug
+
+修复分页导航、编辑类视图标题
+
+修复界面行为多主键分隔符由";"改为","
+
+修复导航类视图宽度格式
+
+修复图表排序
+
+修复关系界面逻辑
+
+修复401跳登录页清除user和token
+
+修复树导航debug展示位置
+
+修复菜单默认展开
+
+修复快速搜索框bug
+
+### 功能新增及优化
+
+#### 模板
+
+补充单位选择器、部门选择器、人员选择器
+
+面板项支持偏移
+
+应用支持自定义默认端口
+
+门户部件图标和容器样式
+
+表格列头图片和头部样式
+
+表格操作列图标
+
+表格编辑项值规则
+
+增加树选择双击事件
+
+增加图表分组属性计数统计（srfcount）
+
+增加雷达图支持
+
+#### 基础文件
+
+补充单位选择器、部门选择器、人员选择器
+
+修复分页导航、编辑类视图标题
+
+修复界面行为多主键分隔符由";"改为","
+
+修复关系界面逻辑
+
+修复401跳登录页清除user和token
+
+修复树导航debug展示位置
+
+修复菜单默认展开
+
+修复快速搜索框bug
+
+## v7.0.0-alpha.4 [2020-5-21]
+
+### Bug修复
+
+修复表格视图搜索placeholder显示为搜索字段
+
+修复表单嵌表单分页异常
+
+修复门户视图操作栏标题
+
+修复看板部件高度自动撑
+
+修复表单分组，界面行为组不显示
+
+修复表格操作列数据异常
+
+### 功能新增及优化
+
+#### 模板
+
+支持拷贝功能
+
+支持实体甘特图视图
+
+支持面板项隐藏表单项
+
+支持表格列最小宽度和操作列样式支持
+
+支持列表项、面板代码表转化
+
+#### 基础文件
+
+支持列表项、面板代码表转化
+
+修复表单分组，界面行为组不显示
+
+## v7.0.0-alpha.3 [2020-5-14]
+
+### Bug修复
+
+分页导航栏传递srfparentdename和srfparentkey问题
+
+提交流程、启动流程刷新表格数据问题
+
+修复视图自定义导航参数大小写问题
+
+修复批添加功能
+
+修复树部件查询数据集合异常处理
+
+修复图表排序问题
+
+修复富文本国际化切换失效
+
+修复代码表代码项图标和数据
+
+修复数据多项选择视图UI逻辑不匹配
+
+修复列表高度异常
+
+修复树节点上下文
+
+修复表格（视图）高度，滚动条问题
+
+修复表单loaddraft服务仿真主键丢失修复
+
+修复user显示名称逻辑
+
+修复issue地址为正式环境地址
+
+
+### 功能新增及优化
+
+#### 模板
+
+搜索面板布局优化
+
+表格checkbox宽度优化
+
+选择类视图不显示标题
+
+补充树节点关系导航上下文，导航参数上下文
+
+模态时视图样式调整
+
+增加菜单权限
+
+增加快速分组搜索或快速搜索表单功能
+
+增加表格内置工具栏
+
+代码表多选控件分割符从分号转化为逗号
+
+支持表格列最小宽度和操作列样式支持
+
+支持列表项、面板代码表转化
+
+#### 基础文件
+
+登录页面调整
+
+增加数据选择类插件表格呈现插件
+
+## v7.0.0-alpha.2 [2020-5-7]
+
+### Bug修复
+
+分页导航栏添加图标配置
+
+### 功能新增及优化
+
+#### 模板
 
 表格文件上传信息显示
 
-用户名识别
+批添加、批删除
 
-工具栏按钮样式支持
+实体工作流动态视图
+
+实体工作流动态导航表格视图
+
+富文本信息模式
+
+更新默认值
+
+#### 基础文件
+
+表格文件上传信息显示
 
-模态边距样式调整
+实体工作流动态视图
 
+实体工作流动态导航表格视图
 
 ## v7.0.0-alpha.1 [2020-4-29]
 

app_EHRPim/README.md

@@ -117,7 +117,9 @@ $ yarn build
         |─ ─ favicon.ico                        图标
 ​    |─ ─ src                                    工程文件夹
         |─ ─ assets                             静态资源
+        |─ ─ codelist                           动态代码表服务
         |─ ─ components                         基础组件，主要包含编辑器组件和其他全局使用的组件
+        |─ ─ counter                            计数器服务
         |─ ─ engine                             引擎文件，主要封装了内置视图的内置逻辑
         |─ ─ environments                       环境文件
 ​        |─ ─ interface                          接口文件
@@ -150,6 +152,7 @@ $ yarn build
                 |─ ─ YYY-ui-logic-base.ts       应用实体界面处理逻辑文件
                 |─ ─ YYY-ui-logic.ts            自定义应用实体界面处理逻辑文件
         |─ ─ utils                              工具类文件
+        |─ ─ utilservice                        应用功能服务
         |─ ─ widgets                            部件文件夹
             |─ ─ appde                          应用实体名称
 ​                |─ ─  XXX                       部件名称

app_EHRPim/package.json

@@ -18,12 +18,16 @@
     "@fullcalendar/list": "^4.4.0",
     "@fullcalendar/timegrid": "^4.4.0",
     "@fullcalendar/vue": "^4.4.0",
+    "vuedraggable": "^2.23.2",
+    "async-validator": "^3.3.0",
     "axios": "^0.19.1",
     "core-js": "^3.4.4",
     "echarts": "^4.6.0",
     "element-ui": "^2.13.0",
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
+    "ibiz-gantt-elastic": "^1.0.17",
+    "ibiz-vue-lib": "^0.1.10",
     "interactjs": "^1.9.4",
     "moment": "^2.24.0",
     "path-to-regexp": "^6.1.0",

app_EHRPim/public/assets/img/QQ.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M511.999 1024a512 512 0 1 0-512-512 512 512 0 0 0 512 512z" fill="#23A0F0" /><path d="M735.765 604.422c-3.55-49.47-36.192-90.932-55.09-112.47a70.383 70.383 0 0 0-15.577-67.003v-1.718c0-97.235-68.028-167.254-153.35-167.55-85.333 0.342-153.35 70.315-153.35 167.55v1.718a70.383 70.383 0 0 0-15.576 67.003c-18.898 21.413-51.54 62.874-55.09 112.47a75.39 75.39 0 0 0 7.554 40.425c7.555 10.308 28.513-2.06 43.406-34.93a210.33 210.33 0 0 0 35.499 67.914c-36.307 8.477-46.729 44.897-34.475 64.853 8.59 14.086 28.445 25.657 62.419 25.657 60.473 0 87.267-16.611 99.18-28.057a16.259 16.259 0 0 1 20.844 0c11.913 11.57 38.684 28.057 99.18 28.057 34.02 0 53.715-11.57 62.419-25.657 12.253-19.922 1.831-56.342-34.475-64.853a211.627 211.627 0 0 0 35.499-67.914c14.893 32.87 35.85 45.124 43.406 34.93a76.493 76.493 0 0 0 7.577-40.425z" fill="#FFFFFF" /></svg>
\ No newline at end of file

app_EHRPim/public/assets/img/logo.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="277px" height="60px" viewBox="0 0 277 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
+    <title>logo</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Apple-TV" transform="translate(-822.000000, -80.000000)" fill-rule="nonzero">
+            <g id="logo" transform="translate(822.000000, 80.000000)">
+                <path d="M84.7587939,33 C84.3400314,33 83.9422129,32.855404 83.5653265,32.5662099 C83.1884404,32.2770158 83,31.9117221 83,31.4703186 C83,30.8006061 83.3517553,30.0547979 84.0552764,29.2328759 C84.7587975,28.4109559 85.4874333,28 86.2412061,28 C86.7437211,28 87.1624774,28.1407903 87.4974874,28.422375 C87.8324974,28.7039598 88,29.1111079 88,29.6438359 C88,30.2983298 87.6566197,31.0213058 86.9698493,31.8127843 C86.2830787,32.6042648 85.5460676,33 84.7587939,33 Z M87,43.1071413 L87,44.8800002 C85.4032842,46.9038197 83.913587,48.4297553 82.5308641,49.4578566 C81.1481411,50.4859558 79.9711982,51 79,51 C77.6501989,51 76.6460938,50.3038162 75.9876542,48.9114271 C75.3292146,47.51904 75,45.9971505 75,44.345713 C75,43.7142826 75.0658429,43.1111916 75.1975308,42.5364271 C75.3292186,41.9616625 75.4855956,41.4880956 75.6666665,41.1157137 C75.8477374,40.7433317 76.1851825,40.1604794 76.6790122,39.3671417 C79.0164725,35.7890278 81.1563689,34 83.0987653,34 C84.1028856,34 84.6049382,34.3804718 84.6049382,35.1414285 C84.6049382,35.6595252 84.2798385,36.4690405 83.6296296,37.5699981 C82.9794205,38.6709579 82.3991795,39.4561863 81.8888887,39.9257136 C80.4567829,41.2857195 79.5226359,42.2328532 79.0864196,42.7671425 C78.6502035,43.3014297 78.4320986,43.9085667 78.4320986,44.5885708 C78.4320986,45.1714317 78.6543186,45.6571409 79.0987654,46.0457134 C79.543212,46.4342859 80.119338,46.62857 80.8271605,46.62857 C81.6008269,46.62857 82.4526703,46.3492873 83.382716,45.7907132 C84.3127617,45.2321392 85.5185111,44.3376253 87,43.1071413 Z M93,51 L93,13 L105.747082,13 C116.805447,13 119.856031,16.3948127 119.856031,23.2391931 C119.856031,27.1815562 118.494163,29.8645533 114.354086,31.0144092 L114.354086,31.2334294 C118.766537,32.3832853 121,35.2853026 121,40.0489914 C121,46.9481268 117.949416,51 106.891051,51 L93,51 Z M101,29 L103.670157,29 C108.853403,29 111,28.1818182 111,24.4727273 C111,20.5454545 108.905759,20 103.670157,20 L101,20 L101,29 Z M101,44 L105.038462,44 C111.211538,44 113,43.1306818 113,39.5 C113,36.1761364 111.269231,35 105.038462,35 L101,35 L101,44 Z M134.5,17 C130.888889,17 130,16.5263158 130,12.9473684 C130,9.36842105 130.888889,9 134.5,9 C138.166667,9 139,9.36842105 139,12.9473684 C139,16.5263158 138.166667,17 134.5,17 Z M130,51 L130,22 L138,22 L138,51 L130,51 Z M147,51 L147,44.3944444 L161.004377,28.5518519 L161.004377,28.2296296 L148.039387,28.2296296 L148.039387,22 L170.851204,22 L170.851204,28.2296296 L156.5186,44.287037 L156.5186,44.6092593 L172,44.6092593 L172,51 L147,51 Z M189.523364,43.7723343 L205,43.7723343 L205,51 L181,51 L181,13 L189.523364,13 L189.523364,43.7723343 Z M225.419162,21 C235.53493,21 239,24.273703 239,30.391771 L239,50.4633274 L231.734531,50.4633274 L230.952096,47.0822898 C229.666667,49.2289803 226.313373,51 221.339321,51 C214.576846,51 211,48.1556351 211,42.1449016 C211,35.4364937 215.303393,33.0214669 223.407186,33.0214669 L230.896208,33.0214669 L230.896208,32.2701252 C230.896208,28.8354204 229.778443,27.4937388 224.469062,27.4937388 C222.289421,27.4937388 220.10978,27.6547406 218.041916,28.0304114 L218.041916,21.4293381 C220.333333,21.1610018 223.239521,21 225.419162,21 Z M222.450704,46 C226.225352,46 228.929577,44.5555556 230,42.5 L230,39 L223.690141,39 C219.633803,39 218,39.6666667 218,42.7222222 C218,45.1111111 219.295775,46 222.450704,46 Z M265.078394,20.4545455 C274.782027,20.4545455 277,26.3454545 277,35.7272727 C277,44.1818182 274.782027,51 265.078394,51 C259.367113,51 257.038241,49.1454545 255.873805,46.3090909 L255.319312,50.4545455 L248,50.4545455 L248,9 L256.040153,9 L256.040153,24.5454545 C257.204589,22.3636364 259.810707,20.4545455 265.078394,20.4545455 Z M262.827731,46 C268.289916,46 269,41.9473684 269,37.0526316 C269,31.8421053 268.180672,28 262.827731,28 C257.420168,28 256,31.3157895 256,37.0526316 C256,42.5263158 257.420168,46 262.827731,46 Z" id="注册iBizLab账号" fill="#333333"></path>
+                <g id="编组" fill="#01B0FF">
+                    <path d="M33,53.9848293 C39.3232242,53.9848293 45.6616122,53.9848293 52,54 C48.6488428,49.9646018 45.2673584,45.9747155 41.8555467,42 C38.9896249,46.0505689 36.0478851,50.0556258 33,53.9848293 L33,53.9848293 Z M45,37.2539103 C48.4335443,41.4270073 51.7721519,45.6757039 55,50 C54.9525316,40.3383733 55,30.6616267 54.9683544,21 C51.9303797,26.5641293 48.7025316,32.052659 45,37.2539103 L45,37.2539103 Z M21,21 C21.2871111,31.3772333 25.5786667,40.9994895 30.4897778,50 C33.0586667,45.7958142 35.5217778,41.5472179 38,37.2838182 C32.4542222,31.7325166 27.0142222,26.0627871 21,21 L21,21 Z M4.24776231,8 C3.99247773,23.2587549 3.8010143,38.5324254 4.37540459,53.7762646 C11.9062995,54.0894942 19.4531498,53.9701686 27,54 C16.9481699,39.9345006 7.4228642,24.8845655 4.24776231,8 L4.24776231,8 Z M13,5 C22.6175691,13.1440536 31.7201818,21.8107202 40.2472548,31 C44.669822,22.4349525 48.8652025,13.7682858 53,5.07258514 C39.6717152,5.04355109 26.3434305,5.1451703 13,5 L13,5 Z M0,0 L59.7331546,0 C60.0637531,19.995 60.123862,40.005 59.7031002,60 L0,60 L0,0 Z" id="Fill-1"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

app_EHRPim/public/assets/img/weixin.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#36ab60" d="M352.814545 385.396364m-33.512727 0a33.512727 33.512727 0 1 0 67.025455 0 33.512727 33.512727 0 1 0-67.025455 0Z"  /><path fill="#36ab60" d="M502.690909 384.465455m-33.512727 0a33.512727 33.512727 0 1 0 67.025454 0 33.512727 33.512727 0 1 0-67.025454 0Z"  /><path fill="#36ab60" d="M576.232727 534.341818m-23.272727 0a23.272727 23.272727 0 1 0 46.545455 0 23.272727 23.272727 0 1 0-46.545455 0Z"  /><path fill="#36ab60" d="M694.458182 536.203636m-23.272727 0a23.272727 23.272727 0 1 0 46.545454 0 23.272727 23.272727 0 1 0-46.545454 0Z"  /><path fill="#36ab60" d="M512 0C229.003636 0 0 229.003636 0 512s229.003636 512 512 512 512-229.003636 512-512S794.996364 0 512 0z m-87.505455 630.225455c-26.996364 0-48.407273-5.585455-75.403636-11.17091l-75.403636 37.236364 21.410909-64.232727c-53.992727-37.236364-85.643636-85.643636-85.643637-145.221818 0-102.4 96.814545-182.458182 215.04-182.458182 105.192727 0 198.283636 64.232727 216.901819 150.807273-6.516364-0.930909-13.963636-0.930909-20.48-0.93091-102.4 0-182.458182 76.334545-182.458182 170.356364 0 15.825455 2.792727 30.72 6.516363 44.683636-7.447273 0-13.963636 0.930909-20.48 0.93091z m314.647273 75.403636l15.825455 53.992727-58.647273-32.581818c-21.410909 5.585455-42.821818 11.170909-64.232727 11.170909-102.4 0-182.458182-69.818182-182.458182-155.461818s80.058182-155.461818 182.458182-155.461818c96.814545 0 182.458182 69.818182 182.458182 155.461818 0 47.476364-31.650909 90.298182-75.403637 122.88z"  /></svg>
\ No newline at end of file

app_EHRPim/public/assets/json/portlet-data.json

 [
 {"type":"appde",
-"appCodeName":"ORMORG",
+"appCodeName":"OrmOrg",
 "appName":"组织管理",
 "portletCodeName": "OrmPNumList",
 "portletName": "组织人数",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"LIST","componentName":"ormorg-orm-pnum-list-portlet"},
+"portletTYpe":"LIST","componentName":"orm-org-orm-pnum-list-portlet"},
 {"type":"appde",
-"appCodeName":"ORMORG",
+"appCodeName":"OrmOrg",
 "appName":"组织管理",
 "portletCodeName": "OrgBar",
 "portletName": "组织分布",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"ormorg-org-bar-portlet"},
+"portletTYpe":"CHART","componentName":"orm-org-org-bar-portlet"},
 {"type":"appde",
-"appCodeName":"PIMVOCATIONAL",
+"appCodeName":"PimVocational",
 "appName":"证书信息",
 "portletCodeName": "OrgVocNumList",
 "portletName": "职业资格",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"LIST","componentName":"pimvocational-org-voc-num-list-portlet"},
+"portletTYpe":"LIST","componentName":"pim-vocational-org-voc-num-list-portlet"},
 {"type":"appde",
-"appCodeName":"PIMOUTPUT",
+"appCodeName":"PimOutput",
 "appName":"产值表",
 "portletCodeName": "OrgOutPutLine",
 "portletName": "月均产值",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"pimoutput-org-out-put-line-portlet"},
+"portletTYpe":"CHART","componentName":"pim-output-org-out-put-line-portlet"},
 {"type":"appde",
-"appCodeName":"PIMPERSON",
+"appCodeName":"PimPerson",
 "appName":"人员信息",
 "portletCodeName": "OrgPersonAgeFunnel",
 "portletName": "年龄分布",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"pimperson-org-person-age-funnel-portlet"},
+"portletTYpe":"CHART","componentName":"pim-person-org-person-age-funnel-portlet"},
 {"type":"appde",
-"appCodeName":"PIMPERSON",
+"appCodeName":"PimPerson",
 "appName":"人员信息",
 "portletCodeName": "OrgPersonOrgTypePie",
 "portletName": "机关与项目人员",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"pimperson-org-person-org-type-pie-portlet"},
+"portletTYpe":"CHART","componentName":"pim-person-org-person-org-type-pie-portlet"},
 {"type":"app",
-"appCodeName":"PIMEDUCATION",
+"appCodeName":"PimEducation",
 "appName":"教育信息",
 "portletCodeName": "OrgEduPie",
 "portletName": "学历分布",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"app-pimeducation-org-edu-pie-portlet"},
+"portletTYpe":"CHART","componentName":"app-pim-education-org-edu-pie-portlet"},
 {"type":"app",
-"appCodeName":"PIMPERSON",
+"appCodeName":"PimPerson",
 "appName":"人员信息",
 "portletCodeName": "OrgPersonAgeFunnel",
 "portletName": "年龄分布",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"app-pimperson-org-person-age-funnel-portlet"},
+"portletTYpe":"CHART","componentName":"app-pim-person-org-person-age-funnel-portlet"},
 {"type":"app",
-"appCodeName":"PIMOUTPUT",
+"appCodeName":"PimOutput",
 "appName":"产值表",
 "portletCodeName": "OrgOutPutLine",
 "portletName": "月均产值",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"app-pimoutput-org-out-put-line-portlet"},
+"portletTYpe":"CHART","componentName":"app-pim-output-org-out-put-line-portlet"},
 {"type":"app",
-"appCodeName":"PIMPERSON",
+"appCodeName":"PimPerson",
 "appName":"人员信息",
 "portletCodeName": "OrgPersonOrgTypePie",
 "portletName": "机关与项目人员",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"app-pimperson-org-person-org-type-pie-portlet"},
+"portletTYpe":"CHART","componentName":"app-pim-person-org-person-org-type-pie-portlet"},
 {"type":"app",
-"appCodeName":"ORMORG",
+"appCodeName":"OrmOrg",
 "appName":"组织管理",
 "portletCodeName": "OrmPNumList",
 "portletName": "组织人数",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"LIST","componentName":"app-ormorg-orm-pnum-list-portlet"},
+"portletTYpe":"LIST","componentName":"app-orm-org-orm-pnum-list-portlet"},
 {"type":"app",
-"appCodeName":"ORMORG",
+"appCodeName":"OrmOrg",
 "appName":"组织管理",
 "portletCodeName": "OrgBar",
 "portletName": "组织分布",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"app-ormorg-org-bar-portlet"},
+"portletTYpe":"CHART","componentName":"app-orm-org-org-bar-portlet"},
 {"type":"app",
-"appCodeName":"PIMVOCATIONAL",
+"appCodeName":"PimVocational",
 "appName":"证书信息",
 "portletCodeName": "OrgVocNumList",
 "portletName": "职业资格",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"LIST","componentName":"app-pimvocational-org-voc-num-list-portlet"},
+"portletTYpe":"LIST","componentName":"app-pim-vocational-org-voc-num-list-portlet"},
 {"type":"app",
-"appCodeName":"PIMTITLE",
+"appCodeName":"PimTitle",
 "appName":"职称信息",
 "portletCodeName": "OrgTitleBar",
 "portletName": "职称分布",
 "groupCodeName":"Ungroup",
 "groupName":"（未分类）",
-"portletTYpe":"CHART","componentName":"app-pimtitle-org-title-bar-portlet"}
+"portletTYpe":"CHART","componentName":"app-pim-title-org-title-bar-portlet"}
 ]
\ No newline at end of file

app_EHRPim/src/app-register.ts

@@ -28,7 +28,6 @@ import AppCheckboxList from './components/app-checkbox-list/app-checkbox-list.vu
 import AppRadioGroup from './components/app-radio-group/app-radio-group.vue'
 import AppEmbedPicker from './components/app-embed-picker/app-embed-picker.vue'
 import AppTreePicker from './components/app-tree-picker/app-tree-picker.vue'
-import AppRichTextEditor from './components/app-rich-text-editor/app-rich-text-editor.vue'
 import AppFileUpload from './components/app-file-upload/app-file-upload.vue'
 import AppImageUpload from './components/app-image-upload/app-image-upload.vue'
 import PropertyLayout from './components/property-layout/property-layout.vue'
@@ -53,7 +52,6 @@ import AppRate from './components/app-rate/app-rate.vue'
 import AppSwitch from './components/app-switch/app-switch.vue'
 import AppSlider from './components/app-slider/app-slider.vue'
 import AppStepper from './components/app-stepper/app-stepper.vue'
-import AppPortalDesign from './components/app-portal-design/app-portal-design.vue'
 import DatePickerRange from './components/date-picker-range/date-picker-range.vue'
 import AppRangeDate from './components/app-range-date/app-range-date.vue'
 import AppActionBar from './components/app-actionbar/app-actionbar.vue'
@@ -61,14 +59,23 @@ import AppOrgSector from  './components/app-orgsector/app-orgsector.vue'
 import AppBuild from './components/app-build/app-build.vue'
 import AppStudioAction from './components/app-studioaction/app-studioaction.vue'
 import AppDebugActions from './components/app-debug-actions/app-debug-actions.vue'
-import AppHeaderMenus from './components/app-header-menus/app-header-menus.vue'
+import AppTopMenus from './components/app-top-menus/app-top-menus.vue'
 import AppColumnLink from './components/app-column-link/app-column-link.vue'
-import AppDataUploadView from './components/app-data-upload/app-data-upload.vue'
 import DropDownListDynamic from './components/dropdown-list-dynamic/dropdown-list-dynamic.vue'
 import AppImagePreview from './components/app-image-preview/app-image-preview.vue'
 import AppFormatData from './components/app-format-data/app-format-data.vue'
 import AppUploadFileInfo from './components/app-upload-file-info/app-upload-file-info.vue'
 import ContextMenu from './components/context-menu/context-menu'
+import AppColumnFormat from './components/app-column-format/app-column-format.vue'
+import AppQuickGroup from './components/app-quick-group/app-quick-group.vue'
+import AppOrgSelect from './components/app-org-select/app-org-select.vue'
+import AppDepartmentSelect from './components/app-department-select/app-department-select.vue'
+import IBizGroupSelect from './components/ibiz-group-select/ibiz-group-select.vue'
+import IBizGroupPicker from './components/ibiz-group-picker/ibiz-group-picker.vue'
+import AppWFApproval from './components/app-wf-approval/app-wf-approval.vue'
+import Breadcrumb from './components/app-breadcrumb/app-breadcrumb.vue'
+import AppTransfer from './components/app-transfer/app-transfer.vue'
+import ContextMenuDrag from './components/context-menu-drag/context-menu-drag.vue'
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -106,7 +113,7 @@ export const AppComponents = {
         v.component('app-radio-group',AppRadioGroup);
         v.component('app-embed-picker', AppEmbedPicker);
         v.component('app-tree-picker', AppTreePicker);
-        v.component('app-rich-text-editor',AppRichTextEditor);
+        v.component('app-rich-text-editor', () => import('./components/app-rich-text-editor/app-rich-text-editor.vue'));
         v.component('app-file-upload',AppFileUpload);
         v.component('app-image-upload',AppImageUpload);
         v.component('property-layout',PropertyLayout);
@@ -131,7 +138,7 @@ export const AppComponents = {
         v.component('app-switch', AppSwitch);
         v.component('app-slider', AppSlider);
         v.component('app-stepper', AppStepper);
-        v.component('app-portal-design',AppPortalDesign);
+        v.component('app-portal-design', () => import('./components/app-portal-design/app-portal-design.vue'));
         v.component('date-picker-range',DatePickerRange);
         v.component('app-range-date', AppRangeDate);
         v.component('app-actionbar', AppActionBar);
@@ -139,13 +146,23 @@ export const AppComponents = {
         v.component('app-build', AppBuild);
         v.component('app-studioaction', AppStudioAction);
         v.component('app-debug-actions', AppDebugActions);
-        v.component('app-header-menus', AppHeaderMenus);
+        v.component('app-top-menus', AppTopMenus);
         v.component('app-column-link', AppColumnLink);
-        v.component('app-data-upload', AppDataUploadView);
+        v.component('app-data-upload', () => import('./components/app-data-upload/app-data-upload.vue'));
         v.component('dropdown-list-dynamic', DropDownListDynamic);
         v.component('app-image-preview', AppImagePreview);
         v.component('app-format-data', AppFormatData);
         v.component('app-upload-file-info', AppUploadFileInfo);
         v.component('context-menu',ContextMenu);
+        v.component('app-column-format',AppColumnFormat);
+        v.component('app-quick-group',AppQuickGroup);
+        v.component('app-org-select',AppOrgSelect);
+        v.component('app-department-select',AppDepartmentSelect);
+        v.component('ibiz-group-select',IBizGroupSelect);
+        v.component('ibiz-group-picker',IBizGroupPicker);
+        v.component('app-wf-approval',AppWFApproval);
+        v.component('app-breadcrumb',Breadcrumb);
+        v.component('app-transfer',AppTransfer);
+        v.component('context-menu-drag',ContextMenuDrag);
     },
 };
\ No newline at end of file

app_EHRPim/src/codelist/ehr-code-list0001.ts

+import CodeItemService from '@service/code-item/code-item-service';
+/**
+ * 代码表--籍贯（户籍所在地）
+ *
+ * @export
+ * @class EhrCodeList0001
+ */
+export default class EhrCodeList0001 {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof EhrCodeList0001
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof EhrCodeList0001
+     */
+    public expirationTime:any;
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof EhrCodeList0001
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof EhrCodeList0001
+     */
+    public codelistModel:any = {
+        codelistid:"EhrCodeList0001"
+    };
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0001
+     */
+    public userParamNames:any ={
+        codelistid:"E3905F82-CCC9-4894-93D8-4AFBE40BEEF0"
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0001
+     */
+    public queryParamNames:any ={
+        sort: 'ordervalue,asc'
+    }
+
+    /**
+     * 代码项应用实体服务对象
+     *
+     * @type {CodeItemService}
+     * @memberof EhrCodeList0001
+     */
+    public codeitemService: CodeItemService = new CodeItemService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof EhrCodeList0001
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.codeitemvalue});
+            Object.assign(itemdata,{value:item.codeitemvalue});
+            Object.assign(itemdata,{text:item.codeitemname});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EhrCodeList0001
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.codeitemService.FetchCurCL(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof EhrCodeList0001
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_EHRPim/src/codelist/ehr-code-list0014.ts

+import PersonStateMgrService from '@service/person-state-mgr/person-state-mgr-service';
+/**
+ * 代码表--员工状态
+ *
+ * @export
+ * @class EhrCodeList0014
+ */
+export default class EhrCodeList0014 {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof EhrCodeList0014
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof EhrCodeList0014
+     */
+    public expirationTime:any;
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof EhrCodeList0014
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof EhrCodeList0014
+     */
+    public codelistModel:any = {
+        codelistid:"EhrCodeList0014"
+    };
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0014
+     */
+    public userParamNames:any ={
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0014
+     */
+    public queryParamNames:any ={
+        sort: 'orderno,asc'
+    }
+
+    /**
+     * 员工状态管理应用实体服务对象
+     *
+     * @type {PersonStateMgrService}
+     * @memberof EhrCodeList0014
+     */
+    public personstatemgrService: PersonStateMgrService = new PersonStateMgrService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof EhrCodeList0014
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.personstatecode});
+            Object.assign(itemdata,{value:item.personstatecode});
+            Object.assign(itemdata,{text:item.personstatemgrname});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EhrCodeList0014
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.personstatemgrService.FetchDefault(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof EhrCodeList0014
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_EHRPim/src/codelist/ehr-code-list0018.ts

+import CodeItemService from '@service/code-item/code-item-service';
+/**
+ * 代码表--血型
+ *
+ * @export
+ * @class EhrCodeList0018
+ */
+export default class EhrCodeList0018 {
+
+    /**
+     * 是否启用缓存
+     *
+     * @type boolean
+     * @memberof EhrCodeList0018
+     */
+    public isEnableCache:boolean = true;
+
+    /**
+     * 过期时间
+     *
+     * @type any
+     * @memberof EhrCodeList0018
+     */
+    public expirationTime:any;
+
+    /**
+     * 缓存超长时长
+     *
+     * @type any
+     * @memberof EhrCodeList0018
+     */
+    public cacheTimeout:any = -1;
+
+    /**
+     * 代码表模型对象
+     *
+     * @type any
+     * @memberof EhrCodeList0018
+     */
+    public codelistModel:any = {
+        codelistid:"EhrCodeList0018"
+    };
+
+    /**
+     * 自定义参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0018
+     */
+    public userParamNames:any ={
+        codelistid:"2AAC77E1-C58A-4C53-95DB-350783975A21"
+    }
+
+    /**
+     * 查询参数集合
+     *
+     * @type any
+     * @memberof EhrCodeList0018
+     */
+    public queryParamNames:any ={
+        sort: 'ordervalue,asc'
+    }
+
+    /**
+     * 代码项应用实体服务对象
+     *
+     * @type {CodeItemService}
+     * @memberof EhrCodeList0018
+     */
+    public codeitemService: CodeItemService = new CodeItemService();
+
+
+    /**
+     * 处理数据
+     *
+     * @public
+     * @param {any[]} items
+     * @returns {any[]}
+     * @memberof EhrCodeList0018
+     */
+    public doItems(items: any[]): any[] {
+        let _items: any[] = [];
+        items.forEach((item: any) => {
+            let itemdata:any = {};
+            Object.assign(itemdata,{id:item.codeitemvalue});
+            Object.assign(itemdata,{value:item.codeitemvalue});
+            Object.assign(itemdata,{text:item.codeitemname});
+            
+            _items.push(itemdata);
+        });
+        return _items;
+    }
+
+    /**
+     * 获取数据项
+     *
+     * @param {*} context
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EhrCodeList0018
+     */
+    public getItems(context: any={}, data: any={}, isloading?: boolean): Promise<any> {
+        return new Promise((resolve, reject) => {
+            data = this.handleQueryParam(data);
+            const promise: Promise<any> = this.codeitemService.FetchCurCL(context, data, isloading);
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data =  response.data;
+                    resolve(this.doItems(data));
+                } else {
+                    resolve([]);
+                }
+            }).catch((response: any) => {
+                console.error(response);
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 处理查询参数
+     * @param data 传入data
+     * @memberof EhrCodeList0018
+     */
+    public handleQueryParam(data:any){
+        let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
+        if(this.userParamNames && Object.keys(this.userParamNames).length >0){
+            Object.keys(this.userParamNames).forEach((name: string) => {
+                if (!name) {
+                    return;
+                }
+                let value: string | null = this.userParamNames[name];
+                if (value && value.startsWith('%') && value.endsWith('%')) {
+                    const key = value.substring(1, value.length - 1);
+                    if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
+                        value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
+                    } else {
+                        value = null;
+                    }
+                }
+                Object.assign(tempData, { [name]: value });
+            });
+        }
+        Object.assign(tempData,{page: 0, size: 1000});
+        if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
+            Object.assign(tempData,this.queryParamNames);
+        }
+        return tempData;
+    }
+}

app_EHRPim/src/components/app-breadcrumb/app-breadcrumb.less

+
+.el-breadcrumb__inner,
+.el-breadcrumb__inner a {
+  font-weight: 400 !important;
+}
+
+.app-breadcrumb.el-breadcrumb {
+  display: inline-block;
+  font-size: 14px;
+  line-height: 50px;
+  margin-left: 8px;
+
+  .no-redirect {
+    color: #97a8be;
+    cursor: text;
+    .curselected{
+      color: #2196F3;
+      font-weight: bold;
+    }
+    .app-breadcrumb-selected{
+      cursor: pointer;
+    }
+  }
+}
\ No newline at end of file

app_EHRPim/src/components/app-column-format/app-column-format.less

+.app-column-format{
+    display: inline-block;
+}
\ No newline at end of file

app_EHRPim/src/components/app-column-link/app-column-link.vue

@@ -279,8 +279,8 @@ export default class AppColumnLink extends Vue {
             return false;
         }
         // 合并表单参数
-        arg.param = JSON.parse(JSON.stringify(this.viewparams));
-        arg.context = JSON.parse(JSON.stringify(this.context));
+        arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
+        arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
         return true;
     }
 

app_EHRPim/src/components/app-dashboard-design/app-dashboard-design-service.ts

@@ -65,14 +65,21 @@ export default class AppDashboardDesignService {
     public loadPortletList(context: any, viewparams: any): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             Http.getInstance().get('./assets/json/portlet-data.json').then((response: any) => {
-                if (response && response.status === 200 && response.data && Array.isArray(response.data)) {
-                    const datas: any[] = this.filterData(response.data, viewparams.appdeName);
+                if (response && response.status === 200 && response.data) {
+                    let result:Array<any> = [];
+                    if(typeof(response.data)=='string'){
+                        const index:number = response.data.lastIndexOf(",");
+                        result = JSON.parse((response.data).slice(0,index)+']');
+                    }else{
+                        result = response.data;
+                    }
+                    const datas: any[] = this.filterData(result, viewparams.appdeName);
                     const list = this.prepareList(datas);
                     const groups = this.prepareGroup(datas);
                     resolve({data: datas, result: list.reverse(), groups: groups});
                 }
             }).catch((response: any) => {
-                console.log(response.status);
+                console.log(response);
             });
         });
     }

app_EHRPim/src/components/app-form/app-form.less

@@ -15,7 +15,7 @@
               overflow: auto;
               > .ivu-tabs-tabpane {
                   height: 100%;
-                  overflow: auto;
+                  overflow: initial;
               }
           }
       }

app_EHRPim/src/components/app-org-select/app-org-select.less

+.app-org-select {
+    width: 100%;
+}
\ No newline at end of file