cloud-web-corejs 1.0.54-dev.510 → 1.0.54-dev.513

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 (20) hide show
  1. package/package.json +3 -2
  2. package/src/components/VabUpload/image-viewer.vue +2 -2
  3. package/src/components/VabUpload/mixins.js +1 -1
  4. package/src/components/VabUpload/view.vue +6 -1
  5. package/src/components/base-textarea/index.vue +104 -0
  6. package/src/components/xform/form-designer/designer.js +1 -1655
  7. package/src/components/xform/form-designer/form-widget/components/gantt/index.vue +16 -1
  8. package/src/components/xform/form-designer/form-widget/dialog/importDialogMixin.js +1 -1751
  9. package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js +1 -1626
  10. package/src/components/xform/form-designer/form-widget/field-widget/gantt-widget.vue +2 -0
  11. package/src/components/xform/form-render/indexMixin.js +1 -3444
  12. package/src/components/xform/mixins/defaultHandle.js +1 -334
  13. package/src/components/xform/mixins/scriptHttp.js +1 -172
  14. package/src/components/xform/utils/util.js +1 -1464
  15. package/src/index.js +5 -0
  16. package/src/utils/index.js +1 -6
  17. package/src/utils/vab.js +1 -1
  18. package/src/views/user/position/edit.vue +83 -116
  19. package/src/views/user/position/list.vue +84 -116
  20. package/src/views/user/system_notice/edit.vue +186 -232
package/src/views/user/position/edit.vue CHANGED
@@ -3,127 +3,90 @@
3
3
  <el-form ref="editForm" :model="position">
4
4
  <div class="d-header clearfix">
5
5
  <div class="fl">
6
- <i class="el-icon-info" />
7
- {{ dataId ? $t1("查看岗位") : $t1("新增岗位") }}
6
+ <i class="el-icon-info"/>
7
+ {{ dataId ? $t1('查看岗位') : $t1('新增岗位') }}
8
8
  </div>
9
9
  <div class="fr">
10
- <el-button
11
- type="primary"
12
- plain
13
- class="button-sty"
14
- @click="$baseReload()"
15
- icon="el-icon-refresh-right"
16
- >
17
- {{ $t1("重置") }}
10
+ <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
11
+ {{ $t1('重置') }}
18
12
  </el-button>
19
- <el-button
20
- type="primary"
21
- class="button-sty"
22
- icon="el-icon-check"
23
- @click="saveData"
24
- >{{ $t1("保存") }}
13
+ <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
25
14
  </el-button>
26
15
  </div>
27
16
  </div>
28
- <baseTabs>
29
- <baseTabPane :label="$t1('基本信息')">
30
- <template #default>
31
- <table class="table-detail">
32
- <tbody>
33
- <tr>
34
- <th>
35
- <em class="f-red">*</em>
36
- {{ $t1("岗位名称") }}
37
- </th>
38
- <td>
39
- <el-form-item
40
- prop="name"
41
- :rules="[{ required: true, trigger: 'blur' }]"
42
- >
43
- <el-input
44
- type="text"
45
- autocomplete="off"
46
- v-model="position.name"
47
- clearable
48
- />
49
- </el-form-item>
50
- </td>
51
- <th>
52
- <em class="f-red">*</em>
53
- {{ $t1("岗位编码") }}
54
- </th>
55
- <td>
56
- <template v-if="dataId">
57
- {{ position.code }}
58
- </template>
59
- <el-form-item
60
- v-else
61
- prop="code"
62
- :rules="[{ required: true, trigger: 'blur' }]"
63
- >
64
- <el-input
65
- type="text"
66
- autocomplete="off"
67
- v-model="position.code"
68
- clearable
69
- />
70
- </el-form-item>
71
- </td>
72
- <th>{{ $t1("设置") }}</th>
73
- <td>
74
- <el-checkbox
75
- :label="$t1('是否启用')"
76
- v-model="position.enabled"
77
- ></el-checkbox>
78
- </td>
79
- </tr>
80
- <tr>
81
- <th>{{ $t1("备注") }}</th>
82
- <td colspan="5">
83
- <el-input
84
- type="textarea"
85
- :rows="2"
86
- :placeholder="$t1('请输入内容')"
87
- size="small"
88
- v-model="position.memo"
89
- clearable
90
- ></el-input>
91
- </td>
92
- </tr>
93
- <tr>
94
- <th>{{ $t1("创建人") }}</th>
95
- <td>{{ position._createBy }}</td>
96
- <th>{{ $t1("创建时间") }}</th>
97
- <td>{{ position.createDate }}</td>
98
- <th>{{ $t1("更新人") }}</th>
99
- <td>{{ position._modifyBy }}</td>
100
- <th>{{ $t1("更新时间") }}</th>
101
- <td>{{ position.modifyDate }}</td>
102
- </tr>
103
- </tbody>
104
- </table>
105
- </template>
106
- </baseTabPane>
107
- </baseTabs>
17
+ <div class="d-cont">
18
+ <div class="d-item">
19
+ <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
20
+ <table class="table-detail">
21
+ <tbody>
22
+ <tr>
23
+ <th>
24
+ <em class="f-red">*</em>
25
+ {{ $t1('岗位名称') }}
26
+ </th>
27
+ <td>
28
+ <el-form-item prop="name" :rules="[{ required: true, trigger: 'blur' }]">
29
+ <el-input type="text" autocomplete="off" v-model="position.name" clearable/>
30
+ </el-form-item>
31
+ </td>
32
+ <th>
33
+ <em class="f-red">*</em>
34
+ {{ $t1('岗位编码') }}
35
+ </th>
36
+ <td>
37
+ <template v-if="dataId">
38
+ {{ position.code }}
39
+ </template>
40
+ <el-form-item v-else prop="code" :rules="[{ required: true, trigger: 'blur' }]">
41
+ <el-input type="text" autocomplete="off" v-model="position.code" clearable/>
42
+ </el-form-item>
43
+ </td>
44
+ <th>{{ $t1('设置') }}</th>
45
+ <td>
46
+ <el-checkbox :label="$t1('是否启用')" v-model="position.enabled"></el-checkbox>
47
+ </td>
48
+ </tr>
49
+ <tr>
50
+ <th>{{ $t1('备注') }}</th>
51
+ <td colspan="5">
52
+ <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
53
+ v-model="position.memo"
54
+ clearable></el-input>
55
+ </td>
56
+ </tr>
57
+ <tr>
58
+ <th>{{ $t1('创建人') }}</th>
59
+ <td>{{ position._createBy }}</td>
60
+ <th>{{ $t1('创建时间') }}</th>
61
+ <td>{{ position.createDate }}</td>
62
+ <th>{{ $t1('更新人') }}</th>
63
+ <td>{{ position._modifyBy }}</td>
64
+ <th>{{ $t1('更新时间') }}</th>
65
+ <td>{{ position.modifyDate }}</td>
66
+ </tr>
67
+ </tbody>
68
+ </table>
69
+ </div>
70
+ </div>
108
71
  </el-form>
109
72
  </div>
110
73
  </template>
111
74
 
112
75
  <script>
113
76
  export default {
114
- name: "positionEdit",
77
+ name: 'positionEdit',
115
78
  props: {
116
- _dataId: [String, Number],
79
+ _dataId: [String, Number]
117
80
  },
118
81
  components: {},
119
82
  data() {
120
83
  return {
121
84
  isEdit: false,
122
- tabIndex: "first",
123
- dataId: "",
85
+ tabIndex: 'first',
86
+ dataId: '',
124
87
  position: {
125
- enabled: true,
126
- },
88
+ enabled: true
89
+ }
127
90
  };
128
91
  },
129
92
  created() {
@@ -140,49 +103,53 @@ export default {
140
103
  url: USER_PREFIX + `/position/get`,
141
104
  method: `post`,
142
105
  data: {
143
- id: this.dataId,
106
+ id: this.dataId
144
107
  },
145
108
  isLoading: true,
146
109
  modalStrictly: true,
147
- success: (res) => {
110
+ success: res => {
148
111
  this.position = res.objx || {};
149
- },
112
+ }
150
113
  });
114
+ } else {
115
+ this.position = {
116
+ enabled: true
117
+ };
151
118
  }
152
119
  },
153
120
  saveData() {
154
- this.$refs.editForm.$baseValidate((valid) => {
121
+ this.$refs.editForm.$baseValidate(valid => {
155
122
  if (valid) {
156
- this.$baseConfirm(this.$t1("您确定要保存吗？")).then(() => {
123
+ this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
157
124
  var url = USER_PREFIX + (this.isEdit ? `/position/update` : `/position/save`);
158
125
  this.$http({
159
126
  url: url,
160
127
  method: `post`,
161
128
  data: this.position,
162
129
  isLoading: true,
163
- success: (res) => {
130
+ success: res => {
164
131
  this.$message({
165
132
  message: res.content,
166
- type: "success",
133
+ type: 'success',
167
134
  duration: 500,
168
- onClose: (t) => {
135
+ onClose: t => {
169
136
  if (this.isEdit) {
170
137
  this.$baseReload();
171
138
  } else {
172
139
  this.$baseReload({
173
140
  updateParam: {
174
- _dataId: res.objx,
175
- },
141
+ _dataId: res.objx
142
+ }
176
143
  });
177
144
  }
178
- },
145
+ }
179
146
  });
180
- },
147
+ }
181
148
  });
182
149
  });
183
150
  }
184
151
  });
185
- },
186
- },
152
+ }
153
+ }
187
154
  };
188
155
  </script>
package/src/views/user/position/list.vue CHANGED
@@ -2,62 +2,43 @@
2
2
  <div id="containt">
3
3
  <el-tabs v-model="activeName" class="tab-box">
4
4
  <el-tab-pane :label="$t1('常规')" name="first">
5
- <editView
6
- v-if="showEdit"
7
- visible-key="showEdit"
8
- :_dataId.sync="dataId"
9
- :parent-target="_self"
10
- @reload="$reloadHandle"
11
- ></editView>
5
+ <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
6
+ @reload="$reloadHandle"></editView>
12
7
  </el-tab-pane>
13
8
  <el-tab-pane :label="$t1('列表')" name="second">
14
9
  <div class="grid-height">
15
- <vxe-grid
16
- ref="table-m1"
17
- v-bind="vxeOption"
18
- @resizable-change="$vxeTableUtil.onColumnWitchChange"
19
- @custom="$vxeTableUtil.customHandle"
20
- >
10
+ <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
11
+ @custom="$vxeTableUtil.customHandle">
21
12
  <template #form>
22
- <tableForm
23
- :formData.sync="formData"
24
- @searchEvent="searchEvent"
25
- @resetEvent="resetEvent"
26
- >
27
- <template #buttonLeft>
28
- <vxe-button
29
- status="primary"
30
- class="button-sty"
31
- icon="el-icon-plus"
32
- @click="openEditDialog"
33
- >
34
- {{ $t1("新增") }}
13
+ <div class="clearfix screen-btns">
14
+ <div class="fl">
15
+ <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
16
+ {{ $t1('新增') }}
35
17
  </vxe-button>
36
- <base-table-export
37
- :option="{ title: $t1('岗位导出'), targetRef: 'table-m1' }"
38
- :parent-target="_self"
39
- />
40
- </template>
41
- <template #buttonRight>
42
- <vxe-button
43
- icon="el-icon-brush"
44
- class="button-sty"
45
- @click="resetEvent"
46
- type="text"
47
- status="primary"
48
- plain
49
- >{{ $t1("重置") }}
18
+ <base-table-export :option="{ title: $t1('岗位导出'), targetRef: 'table-m1'}" :parent-target="_self"/>
19
+ </div>
20
+ <div class="fr">
21
+ <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
22
+ plain>{{ $t1('重置') }}
50
23
  </vxe-button>
51
- <vxe-button
52
- status="warning"
53
- icon="el-icon-search"
54
- class="button-sty"
55
- @click="searchEvent"
56
- >
57
- {{ $t1("搜索") }}
24
+ <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
25
+ {{ $t1('搜索') }}
58
26
  </vxe-button>
59
- </template>
60
- </tableForm>
27
+ </div>
28
+ </div>
29
+ <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
30
+ @submit="searchEvent" @reset="searchEvent">
31
+ <vxe-form-item :title="$t1('岗位名称')+':'" field="name">
32
+ <template v-slot>
33
+ <el-input v-model="formData.name" size="small" clearable/>
34
+ </template>
35
+ </vxe-form-item>
36
+ <!-- <vxe-form-item :title="$t1('岗位编码')+':'" field="code">
37
+ <template v-slot>
38
+ <el-input v-model="formData.code" size="small" clearable/>
39
+ </template>
40
+ </vxe-form-item> -->
41
+ </vxe-form>
61
42
  </template>
62
43
  </vxe-grid>
63
44
  </div>
@@ -67,18 +48,18 @@
67
48
  </template>
68
49
 
69
50
  <script>
70
- import editView from "./edit.vue";
71
- import tableForm from "@base/components/table/tableForm.vue";
51
+ import editView from './edit.vue';
52
+
72
53
  export default {
73
- name: "position:list",
74
- components: { tableForm, editView },
54
+ name: 'position:list',
55
+ components: {editView},
75
56
  data() {
76
57
  return {
77
- activeName: "second",
58
+ activeName: 'second',
78
59
  dataId: 0,
79
60
  showEdit: false,
80
61
  vxeOption: {},
81
- formData: {},
62
+ formData: {}
82
63
  };
83
64
  },
84
65
  mounted() {
@@ -86,85 +67,85 @@ export default {
86
67
  },
87
68
  methods: {
88
69
  searchEvent() {
89
- this.$refs["table-m1"].commitProxy("reload");
70
+ this.$refs['table-m1'].commitProxy('reload');
90
71
  },
91
72
  resetEvent() {
92
73
  this.formData = {};
93
- this.$refs["table-m1"].commitProxy("reload");
74
+ this.$refs['table-m1'].commitProxy('reload');
94
75
  },
95
76
  openEditDialog(id) {
96
- this.dataId = !id || typeof id == "object" ? 0 : id;
97
- this.activeName = "first";
98
- this.$openEditView("showEdit");
77
+ this.dataId = !id || typeof id == 'object' ? 0 : id;
78
+ this.activeName = 'first';
79
+ this.$openEditView('showEdit');
99
80
  },
100
81
  initTableList() {
101
82
  let that = this;
102
83
  let tableOption = {
103
84
  vue: this,
104
- tableRef: "table-m1",
105
- tableName: "basic_position_list-m2",
106
- path: USER_PREFIX + "/position/listCurrentPage",
85
+ tableRef: 'table-m1',
86
+ tableName: 'basic_position_list-m2',
87
+ path: USER_PREFIX + '/position/listCurrentPage',
107
88
  param: () => {
108
89
  return this.formData;
109
90
  },
110
91
  columns: [
111
- { type: "checkbox", width: 48, resizable: false, fixed: "left" },
92
+ {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
112
93
  {
113
- title: this.$t1("岗位名称"),
114
- field: "name",
94
+ title: this.$t1('岗位名称'),
95
+ field: 'name',
115
96
  width: 150,
116
- fixed: "left",
97
+ fixed: 'left'
117
98
  },
118
99
  /* {
119
100
  field: 'code',
120
101
  title: this.$t1('岗位编码'),
121
102
  width: 250
122
103
  }, */
123
- { title: this.$t1("所属组织"), field: "companyName", width: 150 },
104
+ {title: this.$t1('所属组织'), field: 'companyName', width: 150},
124
105
  {
125
- field: "enabled",
126
- title: this.$t1("是否启用"),
106
+ field: 'enabled',
107
+ title: this.$t1('是否启用'),
127
108
  width: 150,
128
109
  slots: {
129
- default: ({ row }) => {
110
+ default: ({row}) => {
130
111
  if (row.enabled) {
131
112
  return [
132
113
  <div class="txt-status">
133
- <span>{this.$t1("启用")}</span>
134
- </div>,
114
+ <span>{this.$t1('启用')}</span>
115
+ </div>
135
116
  ];
136
117
  } else {
137
118
  return [
138
119
  <div class="txt-status disable">
139
- <span>{this.$t1("禁用")}</span>
140
- </div>,
120
+ <span>{this.$t1('禁用')}</span>
121
+ </div>
141
122
  ];
142
123
  }
143
- },
144
- },
124
+ }
125
+ }
145
126
  },
146
127
  {
147
- field: "createDate",
148
- title: this.$t1("创建时间"),
149
- width: 150,
128
+ field: 'createDate',
129
+ title: this.$t1('创建时间'),
130
+ width: 150
150
131
  },
151
132
  {
152
- field: "_createBy",
153
- title: this.$t1("创建人"),
154
- width: 150,
133
+ field: '_createBy',
134
+ title: this.$t1('创建人'),
135
+ width: 150
155
136
  },
156
137
  {
157
- field: "_modifyBy",
158
- title: this.$t1("更新人"),
159
- width: 150,
138
+ field: '_modifyBy',
139
+ title: this.$t1('更新人'),
140
+ width: 150
160
141
  },
161
142
  {
162
143
  width: 47,
163
- fixed: "right",
164
- title: "",
144
+ fixed: 'right',
145
+ title: '',
165
146
  sortable: false,
166
147
  slots: {
167
- default: ({ row }) => {
148
+ default: ({row}) => {
168
149
  return [
169
150
  <div>
170
151
  <a
@@ -174,32 +155,19 @@ export default {
174
155
  this.openEditDialog(row.id);
175
156
  }}
176
157
  >
177
- <el-tooltip
178
- enterable={false}
179
- effect="dark"
180
- content={this.$t1("查看")}
181
- placement="top"
182
- popper-class="tooltip-skin"
183
- >
184
- <i class="el-icon-edit" />
158
+ <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
159
+ popper-class="tooltip-skin">
160
+ <i class="el-icon-edit"/>
185
161
  </el-tooltip>
186
162
  </a>
187
- </div>,
163
+ </div>
188
164
  ];
189
- },
190
- },
191
- },
192
- ],
193
- searchColumns: [
194
- {
195
- title: this.$t1("岗位名称"),
196
- field: "name",
197
- type: "input",
198
- common: true,
199
- },
200
- ],
165
+ }
166
+ }
167
+ }
168
+ ]
201
169
  };
202
- this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
170
+ this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
203
171
  this.vxeOption = opts;
204
172
  });
205
173
  },
@@ -207,14 +175,14 @@ export default {
207
175
  let that = this;
208
176
  that.$excelImport({
209
177
  prefix: USER_PREFIX,
210
- excel: USER_PREFIX + "/excelTemplate/position/position.xlsx",
178
+ excel: USER_PREFIX + '/excelTemplate/position/position.xlsx',
211
179
  multi: false,
212
- saveUrl: USER_PREFIX + "/position/save",
180
+ saveUrl: USER_PREFIX + '/position/save',
213
181
  callback: () => {
214
182
  that.searchEvent();
215
- },
183
+ }
216
184
  });
217
- },
218
- },
185
+ }
186
+ }
219
187
  };
220
188
  </script>