eoss-ui 0.7.43 → 0.7.45
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/eoss-ui.common.js +43 -37
- package/lib/flow.js +10 -8
- package/lib/index.js +1 -1
- package/lib/main.js +32 -28
- package/lib/theme-chalk/index.css +1 -1
- package/lib/theme-chalk/selector.css +1 -1
- package/package.json +1 -1
- package/packages/flow/src/component/taskUnionExamine.vue +2 -1
- package/packages/main/src/default/userinfo.vue +1 -0
- package/packages/main/src/simplicity/index.vue +2 -2
- package/packages/main/src/simplicity/userinfo.vue +15 -12
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/lib/selector.css +1 -1
- package/packages/theme-chalk/src/selector.scss +25 -2
- package/src/index.js +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
@charset "UTF-8";.es-selector{line-height:normal;position:relative}.es-selector .el-select__tags{max-width:100%;padding-left:4px}.es-selector .el-select__tags>span{padding-top:4px}.es-selector .el-select__tags .el-tag{margin-right:4px;margin-bottom:4px}.es-selector .es-selector-search .el-select__tags{max-width:calc(100% - 71px)}.es-selector .es-selector-tags{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex}.es-selector .es-selector-tags.es-selector-more{padding-right:50px;width:100%}.es-selector .es-selector-tags.es-selector-more .el-tag{display:block}.es-selector .es-selector-tags.es-selector-more .es-tags-more{width:40px;padding:0 4px;position:absolute;top:0;right:6px;text-align:center}.es-selector .es-selector-tags-box{line-height:0}.es-selector .es-pointer .el-input__inner{cursor:pointer}.es-selector-dropdown-item.hover,.es-selector-dropdown-item:hover{background-color:#f5f7fa}.es-selector-popover{padding:0}.es-selector-popover .es-selector-dropdown__list{padding:12px}.es-selector-popover .es-selector-dropdown-item{font-size:14px;padding:0 20px;position:relative;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#606266;height:34px;line-height:34px;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:pointer}.es-selector-popover .es-selector-dropdown-item.es-selected{color:#1890ff}.es-zindex-2{z-index:2}.es-selector-dialog .el-dialog__header{padding:12px 20px 8px}.es-selector-dialog .el-dialog__header .el-dialog__title{font-size:14px}.es-selector-dialog .el-dialog__headerbtn{top:14px;right:16px}.es-selector-dialog .el-dialog__body{padding:4px}
|
|
1
|
+
@charset "UTF-8";.es-selector{line-height:normal;position:relative}.es-selector .el-select__tags{max-width:100%;padding-left:4px}.es-selector .el-select__tags>span{padding-top:4px}.es-selector .el-select__tags .el-tag{margin-right:4px;margin-bottom:4px}.es-selector .es-selector-search .el-select__tags{max-width:calc(100% - 71px);max-height:120px;overflow-y:auto}.es-selector .es-selector-tags{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex}.es-selector .es-selector-tags.es-selector-more{padding-right:50px;width:100%}.es-selector .es-selector-tags.es-selector-more .el-tag{display:block}.es-selector .es-selector-tags.es-selector-more .es-tags-more{width:40px;padding:0 4px;position:absolute;top:0;right:6px;text-align:center}.es-selector .es-selector-tags-box{line-height:0}.es-selector .es-pointer .el-input__inner{cursor:pointer}.es-selector-dropdown-item.hover,.es-selector-dropdown-item:hover{background-color:#f5f7fa}.es-selector-popover{padding:0}.es-selector-popover .es-selector-dropdown__list{padding:12px}.es-selector-popover .es-selector-dropdown-item{font-size:14px;padding:0 20px;position:relative;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#606266;height:34px;line-height:34px;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:pointer}.es-selector-popover .es-selector-dropdown-item.es-selected{color:#1890ff}.es-zindex-2{z-index:2}.es-selector-dialog .el-dialog__header{padding:12px 20px 8px}.es-selector-dialog .el-dialog__header .el-dialog__title{font-size:14px}.es-selector-dialog .el-dialog__headerbtn{top:14px;right:16px}.es-selector-dialog .el-dialog__body{padding:4px}
|
package/package.json
CHANGED
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
: infoList.nextCurrentOrgObj
|
|
35
35
|
"
|
|
36
36
|
:multiple="newMultiple"
|
|
37
|
-
:selectorTags="
|
|
37
|
+
:selectorTags="4"
|
|
38
38
|
:mix="currentMix"
|
|
39
39
|
:isUnionSeal="type == 'unionSeal'"
|
|
40
40
|
:selectUserList="unionSealData || []"
|
|
@@ -72,6 +72,7 @@
|
|
|
72
72
|
:multiple="newMultiple"
|
|
73
73
|
@change="changeSelectUser($event, 'nextOtherOrgObj')"
|
|
74
74
|
:mix="otherMix"
|
|
75
|
+
:selectorTags="4"
|
|
75
76
|
:disableds="otherOrgDisabledObjId"
|
|
76
77
|
:types="
|
|
77
78
|
foreignOrgTabs.length > 0
|
|
@@ -1831,7 +1831,7 @@ export default {
|
|
|
1831
1831
|
}
|
|
1832
1832
|
if (tab.method === 'wujie' && tab.appCode) {
|
|
1833
1833
|
if (arg && arg === 'pageData') {
|
|
1834
|
-
WujieVue.$emit('
|
|
1834
|
+
WujieVue.$emit('pageData', tab);
|
|
1835
1835
|
} else {
|
|
1836
1836
|
window.document
|
|
1837
1837
|
.querySelector(`iframe[name=${tab.appCode}]`)
|
|
@@ -1842,7 +1842,7 @@ export default {
|
|
|
1842
1842
|
if (tab.method === 'router') {
|
|
1843
1843
|
if (arg && arg === 'pageData') {
|
|
1844
1844
|
const bus = this.bus || this.$root.Bus;
|
|
1845
|
-
bus.$emit('
|
|
1845
|
+
bus.$emit('pageData', tab);
|
|
1846
1846
|
} else {
|
|
1847
1847
|
this.$set(this.tabs[i], 'keys', util.uuid());
|
|
1848
1848
|
}
|
|
@@ -50,6 +50,7 @@ export default {
|
|
|
50
50
|
data() {
|
|
51
51
|
return {
|
|
52
52
|
model: this.value,
|
|
53
|
+
defaultValues: JSON.parse(JSON.stringify(this.value)),
|
|
53
54
|
events: {
|
|
54
55
|
oldpassword: {
|
|
55
56
|
change: () => {
|
|
@@ -89,13 +90,14 @@ export default {
|
|
|
89
90
|
},
|
|
90
91
|
computed: {
|
|
91
92
|
formRules() {
|
|
93
|
+
console.log(this.value);
|
|
92
94
|
return {
|
|
93
95
|
idCard: [
|
|
94
96
|
{
|
|
95
97
|
required:
|
|
96
|
-
this.
|
|
97
|
-
this.
|
|
98
|
-
this.
|
|
98
|
+
this.defaultValues.idCard !== null &&
|
|
99
|
+
this.defaultValues.idCard !== undefined &&
|
|
100
|
+
this.defaultValues.idCard !== '',
|
|
99
101
|
message: '请输入身份证号',
|
|
100
102
|
trigger: 'blur'
|
|
101
103
|
},
|
|
@@ -108,9 +110,9 @@ export default {
|
|
|
108
110
|
phone: [
|
|
109
111
|
{
|
|
110
112
|
required:
|
|
111
|
-
this.
|
|
112
|
-
this.
|
|
113
|
-
this.
|
|
113
|
+
this.defaultValues.phone !== null &&
|
|
114
|
+
this.defaultValues.phone !== undefined &&
|
|
115
|
+
this.defaultValues.phone !== '',
|
|
114
116
|
message: '请输入手机号',
|
|
115
117
|
trigger: 'blur'
|
|
116
118
|
},
|
|
@@ -123,9 +125,9 @@ export default {
|
|
|
123
125
|
email: [
|
|
124
126
|
{
|
|
125
127
|
required:
|
|
126
|
-
this.
|
|
127
|
-
this.
|
|
128
|
-
this.
|
|
128
|
+
this.defaultValues.email !== null &&
|
|
129
|
+
this.defaultValues.email !== undefined &&
|
|
130
|
+
this.defaultValues.email !== '',
|
|
129
131
|
message: '请输入邮箱地址',
|
|
130
132
|
trigger: 'blur'
|
|
131
133
|
},
|
|
@@ -138,9 +140,9 @@ export default {
|
|
|
138
140
|
officeTel: [
|
|
139
141
|
{
|
|
140
142
|
required:
|
|
141
|
-
this.
|
|
142
|
-
this.
|
|
143
|
-
this.
|
|
143
|
+
this.defaultValues.officeTel !== null &&
|
|
144
|
+
this.defaultValues.officeTel !== undefined &&
|
|
145
|
+
this.defaultValues.officeTel !== '',
|
|
144
146
|
message: '请输入座机号',
|
|
145
147
|
trigger: 'blur'
|
|
146
148
|
},
|
|
@@ -221,6 +223,7 @@ export default {
|
|
|
221
223
|
label: '身份证号',
|
|
222
224
|
type: 'text',
|
|
223
225
|
disabled: true,
|
|
226
|
+
maxlength: 18,
|
|
224
227
|
col: 6
|
|
225
228
|
},
|
|
226
229
|
{
|