cloud-web-corejs 1.0.54-dev.84 → 1.0.54-dev.86

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.
Files changed (13) hide show
  1. package/package.json +1 -1
  2. package/src/components/xform/form-designer/form-widget/dialog/importDialog.vue +2 -2
  3. package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/onCheckboxChange-editor.vue +1 -1
  4. package/src/components/xform/form-designer/setting-panel/property-editor/wfFlag-editor.vue +109 -22
  5. package/src/components/xform/form-render/container-item/data-table-mixin.js +1881 -1
  6. package/src/components/xform/form-render/indexMixin.js +1691 -1
  7. package/src/layout/components/Sidebar/default.vue +2 -0
  8. package/src/layout/components/Sidebar/mixins/pdd.js +50 -0
  9. package/src/store/modules/user.js +302 -1
  10. package/src/utils/pddLog.js +84 -0
  11. package/src/views/user/company_info/dialog.vue +2 -1
  12. package/src/views/user/user/info.vue +21 -62
  13. package/src/views/user/user/infoEdit.vue +25 -12
package/src/views/user/user/info.vue CHANGED
@@ -7,12 +7,12 @@
7
7
  :visible.sync="showDialog"
8
8
  :modal="falseValue"
9
9
  custom-class="dialog-style list-dialog demo-sty_2"
10
- width="1000px"
10
+ width="500px"
11
11
  @close="dialogClose"
12
12
  v-el-drag-dialog
13
13
  v-el-dialog-center
14
14
  >
15
- <div id="containt">
15
+ <div id="containt" style="height: 300px">
16
16
  <div class="detail-wrap">
17
17
  <el-form ref="editForm" :model="user">
18
18
  <div class="d-header clearfix">
@@ -29,7 +29,7 @@
29
29
  </div>
30
30
  </div>
31
31
  <div class="d-cont" style="height: auto">
32
- <div class="d-item">
32
+ <div class="d-item" style="padding-right: 0">
33
33
  <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
34
34
  <table class="table-detail">
35
35
  <tbody>
@@ -38,15 +38,25 @@
38
38
  <em class="f-red">*</em>
39
39
  {{ $t1('登录名') }}
40
40
  </th>
41
- <td>
41
+ <td colspan="3">
42
42
  {{ user.loginAccount }}
43
43
  </td>
44
- <th>{{ $t1('手机') }}</th>
45
- <td>
46
- {{ user.mobile }}
44
+ </tr>
45
+ <tr>
46
+ <th>
47
+ <em class="f-red">*</em>
48
+ {{ $t1('姓名') }}
49
+ </th>
50
+ <td colspan="3">
51
+ <el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
52
+ <el-input size="small" v-model="user.nickName" maxlength="200" lay-verify="required" required=""
53
+ clearable/>
54
+ </el-form-item>
47
55
  </td>
56
+ </tr>
57
+ <tr>
48
58
  <th>{{ $t1('密码') }}</th>
49
- <td>
59
+ <td colspan="3">
50
60
  <el-form-item prop="password" :rules="passRules">
51
61
  <el-input
52
62
  size="small"
@@ -60,8 +70,10 @@
60
70
  />
61
71
  </el-form-item>
62
72
  </td>
73
+ </tr>
74
+ <tr>
63
75
  <th>{{ $t1('确认密码') }}</th>
64
- <td>
76
+ <td colspan="3">
65
77
  <el-form-item prop="rePassword" :rules="pass2Rules">
66
78
  <el-input
67
79
  size="small"
@@ -77,59 +89,6 @@
77
89
  </el-form-item>
78
90
  </td>
79
91
  </tr>
80
- <tr>
81
- <th>
82
- <em class="f-red">*</em>
83
- {{ $t1('姓名') }}
84
- </th>
85
- <td>
86
- <el-form-item prop="nickName" :rules="[{ required: true, trigger: 'blur' }]">
87
- <el-input size="small" v-model="user.nickName" maxlength="200" lay-verify="required" required=""
88
- clearable/>
89
- </el-form-item>
90
- </td>
91
- <th>{{ $t1('性别') }}</th>
92
- <td>
93
- <template v-if="user.gender==1">{{ $t1('男') }}</template>
94
- <template v-if="user.gender==2">{{ $t1('女') }}</template>
95
- </td>
96
- <th>{{ $t1('出生日期') }}</th>
97
- <td>
98
- {{ user.birth }}
99
- </td>
100
- <th>{{ $t1('邮编') }}</th>
101
- <td>
102
- {{user.zipCode}}
103
- </td>
104
- </tr>
105
- <tr>
106
- <th>{{ $t1('地址') }}</th>
107
- <td colspan="3">
108
- {{user.address}}
109
- </td>
110
- <th>{{ $t1('设置') }}</th>
111
- <td colspan="3">
112
- <div class="txt-status" v-if="user.enabled">{{ $t1('启用') }}</div>
113
- <div class="txt-status s-3" v-else>{｛$t1('禁用')｝}</div>
114
- </td>
115
- </tr>
116
- <tr>
117
- <th>{{ $t1('头像') }}</th>
118
- <td colspan="7">
119
- <baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="user.headPhotoUrl"
120
- dataType="medium" :edit="false"></baseUpload>
121
- </td>
122
- </tr>
123
- <tr>
124
- <th>{{ $t1('创建人') }}</th>
125
- <td>{{ user.createBy }}</td>
126
- <th>{{ $t1('创建时间') }}</th>
127
- <td>{{ user.createDate }}</td>
128
- <th>{{ $t1('更新人') }}</th>
129
- <td>{{ user.modifyBy }}</td>
130
- <th>{{ $t1('更新时间') }}</th>
131
- <td>{{ user.modifyDate }}</td>
132
- </tr>
133
92
  </tbody>
134
93
  </table>
135
94
  </div>
package/src/views/user/user/infoEdit.vue CHANGED
@@ -10,8 +10,7 @@
10
10
  <el-button type="primary" plain class="button-sty" @click="reloadContent" icon="el-icon-refresh-right">
11
11
  {{ $t1('重置') }}
12
12
  </el-button>
13
- <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
14
- </el-button>
13
+ <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{$t1('保存')}}</el-button>
15
14
  </div>
16
15
  </div>
17
16
  <div class="d-cont">
@@ -25,11 +24,23 @@
25
24
  {{ $t1('登录名') }}
26
25
  </th>
27
26
  <td>
28
- {{ user.loginAccount }}
27
+ <el-form-item prop="loginAccount" :rules="[{ required: true, trigger: 'blur' }]">
28
+ <template v-if="dataId">
29
+ <el-input size="small" v-model="user.loginAccount" maxlength="255" autocomplete="off"
30
+ lay-verify="required" required="" :readonly="true"/>
31
+ </template>
32
+ <template v-else>
33
+ <el-input size="small" v-model="user.loginAccount" maxlength="255" autocomplete="off"
34
+ lay-verify="required" required="" clearable/>
35
+ </template>
36
+ </el-form-item>
29
37
  </td>
30
38
  <th>{{ $t1('手机') }}</th>
31
39
  <td>
32
- {{ user.mobile }}
40
+ <el-form-item prop="mobile" :rules="[{ required: false, trigger: 'blur' }]">
41
+ <el-input size="small" v-model="user.mobile" type="text" maxlength="255" autocomplete="off"
42
+ lay-verify="required|phone" clearable/>
43
+ </el-form-item>
33
44
  </td>
34
45
  <th>{{ $t1('密码') }}</th>
35
46
  <td>
@@ -68,34 +79,36 @@
68
79
  </td>
69
80
  <th>{{ $t1('性别') }}</th>
70
81
  <td>
71
- <template v-if="user.gender==1">{{ $t1('男') }}</template>
72
- <template v-if="user.gender==2">{{ $t1('女') }}</template>
82
+ <el-radio-group v-model="user.gender">
83
+ <el-radio :label="1">{{ $t1('男') }}</el-radio>
84
+ <el-radio :label="2">{{ $t1('女') }}</el-radio>
85
+ </el-radio-group>
73
86
  </td>
74
87
  <th>{{ $t1('出生日期') }}</th>
75
88
  <td>
76
- {{ user.birth }}
89
+ <el-date-picker size="small" v-model="user.birth" type="date" placeholder="选择日期"
90
+ value-format="yyyy-MM-dd" clearable/>
77
91
  </td>
78
92
  <th>{{ $t1('邮编') }}</th>
79
93
  <td>
80
- ｛｛user.zipCode｝｝
94
+ <el-input size="small" id="zipCode" v-model="user.zipCode" name="zipCode" maxlength="255" clearable/>
81
95
  </td>
82
96
  </tr>
83
97
  <tr>
84
98
  <th>{{ $t1('地址') }}</th>
85
99
  <td colspan="3">
86
- ｛｛user.address｝｝
100
+ <el-input size="small" v-model="user.address" class="b" maxlength="255" clearable/>
87
101
  </td>
88
102
  <th>{{ $t1('设置') }}</th>
89
103
  <td colspan="3">
90
- <div class="txt-status" v-if="user.enabled">{{ $t1('启用') }}</div>
91
- <div class="txt-status s-3" v-else>{｛$t1('禁用')｝}</div>
104
+ <el-checkbox :label="$t1('是否启用')" v-model="user.enabled"></el-checkbox>
92
105
  </td>
93
106
  </tr>
94
107
  <tr>
95
108
  <th>{{ $t1('头像') }}</th>
96
109
  <td colspan="7">
97
110
  <baseUpload :limit="1" accept="image/png, image/jpeg" multi="false" :file.sync="user.headPhotoUrl"
98
- dataType="medium" :edit="false"></baseUpload>
111
+ dataType="medium"></baseUpload>
99
112
  </td>
100
113
  </tr>
101
114
  <tr>