增加表单页面中“脚本”面板的组件和脚本类型关联

See merge request o2oa/o2oa!5277

(cherry picked from commit ec5fdaa8)

a9f89a3a 表单页面编辑器脚本面板，增加新组件的script
69bc609d 增加表单页面中“脚本”面板的组件和脚本类型关联

公文编辑器，增加转换word后是否在首页显示页码的配置

See merge request o2oa/o2oa!5275

(cherry picked from commit c9b03657)

公文编辑器，增加转换word后是否在首页显示页码的配置

See merge request o2oa/o2oa!5272

(cherry picked from commit 45291c96)

o2.loadHtml方法的options参数增加baseUrl属性，标志是否根据html位置重新定位资源链接，默认为false。

See merge request o2oa/o2oa!5268

(cherry picked from commit e108efe7)

增加this.data数组类型的add兼容方法。IE浏览器不能使用add、del方法处理数组类型的值，只能对this.data下的数组类型值进行整体操作（修...

See merge request o2oa/o2oa!5263

增加this.data数组类型的add兼容方法。IE浏览器不能使用add、del方法处理数组类型的值，只能对this.data下的数组类型值进行整体操作（修改、创建、删除）。但任可以局部操作数组中的对象类型的数据。


(cherry picked from commit 5158cf35)

Merge branch 'fix/Attendance' into 'wrdp'

See merge request o2oa/o2oa!5260

Merge of fix/Attendance 整理考勤审批一致性，考勤审批关闭时不能再审批 to wrdp

See merge request o2oa/o2oa!5258

(cherry picked from commit 5cfaa328)

478e8f8d 考勤修改

'接口调用要去掉static'

See merge request o2oa/o2oa!5257

(cherry picked from commit 8a684c1e)

Merge branch 'feature/elementui_select' into 'wrdp'

See merge request o2oa/o2oa!5254

Feature/elementui select

See merge request o2oa/o2oa!5252

(cherry picked from commit 797c6ccd)

931758ff 增加VUE-Element组件 修改设计端实现方式
716e1222 增加VUE-Element组件 select
bb5c1c21 增加ElementUI组件 select

Update base.js

See merge request o2oa/o2oa!5247

(cherry picked from commit 55754cce)

Merge branch 'fix/copyto' into 'wrdp'

See merge request o2oa/o2oa!5242

修复正文编辑器，抄送多句号的问题

See merge request o2oa/o2oa!5240

(cherry picked from commit a22617e5)

3179dbb0 修复正文编辑器，抄送多句号的问题
af3d65e3 修复正文编辑器，抄送多句号的问题

Merge branch 'fix/Attance_process' into 'wrdp'

See merge request o2oa/o2oa!5239

Merge of fix/Attance_process 修复考勤申诉设置报错的问题 to wrdp

See merge request o2oa/o2oa!5236

(cherry picked from commit ca0defc9)

f4294899 修复考勤申诉设置报错的问题

考勤-服务端：修改预打卡计算方法

See merge request o2oa/o2oa!5233

考勤-服务端：修改预打卡计算方法

See merge request o2oa/o2oa!5218

(cherry picked from commit f23e3eac)

16c8eed7 考勤-服务端：修改预打卡计算方法
0fdaf8ba 考勤-服务端：修改直接使用sql语句为jpa
f9b42ce4 考勤-前端：我的出勤率统计添加年月份选择查询

流程导入同版本重名不用重命名

See merge request o2oa/o2oa!5231

(cherry picked from commit 56a074f2)

Merge branch 'fix/wsdl20210903' into 'wrdp'

See merge request o2oa/o2oa!5229

WebserviceClient增加raw方法解决飞哥调用webservice问题

See merge request o2oa/o2oa!5223

(cherry picked from commit 48db6890)

ce8bb381 'WebserviceClient增加raw方法'
9a9f43ae Update WebservicesClient.java

增加已完成工作的snap功能

See merge request o2oa/o2oa!5227

(cherry picked from commit f7fbf874)

Merge branch 'fix/datatable_style' into 'wrdp'

See merge request o2oa/o2oa!5222

Merge of fix/datatable_style 修复数据表格通用样式优先于单元格样式的问题 to wrdp

See merge request o2oa/o2oa!5219

(cherry picked from commit 0d2bafb9)

e52d269e 修复数据表格通用样式优先于单元格样式的问题

Merge branch 'fix/CMS.number' into 'wrdp'

See merge request o2oa/o2oa!5217

Merge of fix/CMS.number 内容管理的数字组件允许空字符 to wrdp

See merge request o2oa/o2oa!5215

(cherry picked from commit e371bff3)

e0e2fa18 内容管理的数字组件允许空字符
406456af 内容管理的数字组件允许空字符

Merge branch '默认不尝试根据姓名查找身份并把配置文件添加到前台配置列表中' into 'wrdp'

See merge request o2oa/o2oa!5214

[人员组织]默认不尝试根据姓名查找身份并把配置文件添加到前台配置列表中

See merge request o2oa/o2oa!5201

(cherry picked from commit b745b84b)

871feeec 默认不尝试根据姓名查找身份并把配置文件添加到前台配置列表中

Merge branch 'fix/修复搜索切词报错升级tika到1.27' into 'wrdp'

See merge request o2oa/o2oa!5212

[统一搜索]修复搜索切词报错升级tika到1.27  不合并到java8

See merge request o2oa/o2oa!5196

(cherry picked from commit b61185de)

bcff8e41 修复搜索切词报错升级tika到1.27

Merge branch 'fix/禁用api的时候同时禁用源代码访问' into 'wrdp'

See merge request o2oa/o2oa!5211

[平台]禁用api访问的时候同时禁用源代码访问

See merge request o2oa/o2oa!5160

(cherry picked from commit d888dec3)

e2df1710 禁用api访问的时候同时禁用源代码访问

Merge branch 'fix/增加外部附件配置general用户' into 'wrdp'

See merge request o2oa/o2oa!5209