mooho-base-admin-plus 2.0.21 → 2.0.23

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 (17) hide show
  1. package/package/mooho-base-admin-plus.min.esm.js +60 -69
  2. package/package/mooho-base-admin-plus.min.js +12 -12
  3. package/package.json +1 -1
  4. package/src/components/view/column-edit.vue +4 -4
  5. package/src/components/view/filter-edit.vue +4 -4
  6. package/src/components/view/modal-form-filter.vue +1 -1
  7. package/src/components/view/modal-form-sort.vue +1 -1
  8. package/src/components/view/table-filter.vue +8 -8
  9. package/src/components/view/view-form-draggable.vue +10 -10
  10. package/src/components/view/view-form.vue +10 -10
  11. package/src/components/view/view-table.vue +7 -7
  12. package/src/components/workflow/flow-chart.vue +1 -1
  13. package/src/layouts/basic-layout/menu-side/menu-collapse.vue +1 -1
  14. package/src/mixins/page.js +26 -18
  15. package/src/pages/system/role.vue +2 -2
  16. package/src/pages/system/rolePropertyEdit.vue +2 -2
  17. package/src/pages/system/user.vue +1 -1
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "mooho-base-admin-plus",
3
3
  "description": "MOOHO basic framework for admin by Vue3",
4
- "version": "2.0.21",
4
+ "version": "2.0.23",
5
5
  "author": "jinyifan <jinyifan@mooho.com.cn>",
6
6
  "license": "MIT",
7
7
  "private": false,
package/src/components/view/column-edit.vue CHANGED
@@ -39,7 +39,7 @@
39
39
  </Col>
40
40
  <Col v-bind="grid8" v-if="data.isVirtual == true">
41
41
  <FormItem label="字段类型" key="dataType" prop="dataType">
42
- <Select v-model="data.dataType" :transfer="false">
42
+ <Select v-model="data.dataType" :transfer="true">
43
43
  <Option v-for="item in getEnumList('DataType')" :key="item.id" :value="item.id">{{ item.name }}</Option>
44
44
  </Select>
45
45
  </FormItem>
@@ -51,7 +51,7 @@
51
51
  </Col>
52
52
  <Col v-bind="grid8">
53
53
  <FormItem label="控件类型" key="controlType" prop="controlType">
54
- <Select v-model="data.controlType" :transfer="false" @on-change="controlTypeChange">
54
+ <Select v-model="data.controlType" :transfer="true" @on-change="controlTypeChange">
55
55
  <Option v-for="item in getEnumList('ControlType')" :key="item.id" :value="item.id">{{ item.name }}</Option>
56
56
  </Select>
57
57
  </FormItem>
@@ -266,7 +266,7 @@
266
266
  </Col>
267
267
  <Col v-bind="grid8" v-if="viewType == 'FormView'">
268
268
  <FormItem label="栏目宽度" key="columnWidth" prop="columnWidth">
269
- <Select v-model="data.columnWidth" clearable :transfer="false">
269
+ <Select v-model="data.columnWidth" clearable :transfer="true">
270
270
  <Option v-for="item in getEnumList('ColumnWidth')" :key="item.id" :value="item.id">{{ item.name }}</Option>
271
271
  </Select>
272
272
  </FormItem>
@@ -283,7 +283,7 @@
283
283
  </Col>
284
284
  <Col v-bind="grid8">
285
285
  <FormItem label="显示格式" key="displayFormat" prop="displayFormat">
286
- <Select v-model="data.displayFormat" clearable :transfer="false">
286
+ <Select v-model="data.displayFormat" clearable :transfer="true">
287
287
  <Option v-for="item in getDisplayFormats()" :key="item.id" :value="item.code">{{ item.name }}</Option>
288
288
  </Select>
289
289
  </FormItem>
package/src/components/view/filter-edit.vue CHANGED
@@ -32,7 +32,7 @@
32
32
  </Col>
33
33
  <Col v-bind="grid8" v-if="dataView.isVirtual == true">
34
34
  <FormItem label="字段类型" key="dataType" prop="dataType">
35
- <Select v-model="data.dataType" :transfer="false">
35
+ <Select v-model="data.dataType" :transfer="true">
36
36
  <Option v-for="item in getEnumList('DataType')" :key="item.id" :value="item.id">{{ item.name }}</Option>
37
37
  </Select>
38
38
  </FormItem>
@@ -44,14 +44,14 @@
44
44
  </Col>
45
45
  <Col v-bind="grid8" v-if="!dataView.isDataSource">
46
46
  <FormItem label="操作符" key="operator" prop="operator">
47
- <Select v-model="data.operator" :transfer="false">
47
+ <Select v-model="data.operator" :transfer="true">
48
48
  <Option v-for="item in getEnumList('Operator')" :key="item.id" :value="item.id">{{ item.name }}</Option>
49
49
  </Select>
50
50
  </FormItem>
51
51
  </Col>
52
52
  <Col v-bind="grid8">
53
53
  <FormItem label="控件类型" key="controlType" prop="controlType">
54
- <Select v-model="data.controlType" :transfer="false" @on-change="controlTypeChange">
54
+ <Select v-model="data.controlType" :transfer="true" @on-change="controlTypeChange">
55
55
  <Option v-for="item in getEnumList('ControlType')" :key="item.id" :value="item.id">{{ item.name }}</Option>
56
56
  </Select>
57
57
  </FormItem>
@@ -203,7 +203,7 @@
203
203
  </Col>
204
204
  <Col v-bind="grid8">
205
205
  <FormItem label="栏目宽度" key="columnWidth" prop="columnWidth">
206
- <Select v-model="data.columnWidth" :transfer="false">
206
+ <Select v-model="data.columnWidth" :transfer="true">
207
207
  <Option v-for="item in getEnumList('ColumnWidth')" :key="item.id" :value="item.id">{{ item.name }}</Option>
208
208
  </Select>
209
209
  </FormItem>
package/src/components/view/modal-form-filter.vue CHANGED
@@ -43,7 +43,7 @@
43
43
  </Col>
44
44
  <Col>
45
45
  <FormItem :label="$t('Front_Label_Operator')" prop="Operator">
46
- <Select v-model="data.operator" :transfer="false">
46
+ <Select v-model="data.operator" :transfer="true">
47
47
  <Option v-for="item in getEnumList('Operator')" :key="item.value" :value="item.id">{{ item.name }}</Option>
48
48
  </Select>
49
49
  </FormItem>
package/src/components/view/modal-form-sort.vue CHANGED
@@ -42,7 +42,7 @@
42
42
  </Col>
43
43
  <Col>
44
44
  <FormItem :label="$t('Front_Label_Operator')" prop="SortingRule">
45
- <Select v-model="data.rule" :transfer="false">
45
+ <Select v-model="data.rule" :transfer="true">
46
46
  <Option v-for="item in sortingList" :value="item.value" :key="item.value">{{ item.label }}</Option>
47
47
  </Select>
48
48
  </FormItem>
package/src/components/view/table-filter.vue CHANGED
@@ -49,7 +49,7 @@
49
49
  clearable
50
50
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
51
51
  :placeholder="column.description"
52
- :transfer="false"
52
+ :transfer="true"
53
53
  @on-change="selected => onSelectDataChange(column, selected)"
54
54
  >
55
55
  <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -64,7 +64,7 @@
64
64
  @update:model-value="$event => setArrayFilterData(data, column, $event)"
65
65
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
66
66
  :placeholder="column.description"
67
- :transfer="false"
67
+ :transfer="true"
68
68
  @on-change="selected => onSelectDataChange(column, selected)"
69
69
  >
70
70
  <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -79,7 +79,7 @@
79
79
  :clearable="true"
80
80
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
81
81
  :placeholder="column.description"
82
- :transfer="false"
82
+ :transfer="true"
83
83
  @on-change="selected => onSelectDataChange(column, selected)"
84
84
  ></TreeSelect>
85
85
  </template>
@@ -94,7 +94,7 @@
94
94
  :clearable="true"
95
95
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
96
96
  :placeholder="column.description"
97
- :transfer="false"
97
+ :transfer="true"
98
98
  @on-change="selected => onSelectDataChange(column, selected)"
99
99
  ></TreeSelect>
100
100
  </template>
@@ -106,7 +106,7 @@
106
106
  clearable
107
107
  :style="{ width: column.controlWidth == null ? '40%' : column.controlWidth + 'px' }"
108
108
  :placeholder="column.description"
109
- :transfer="false"
109
+ :transfer="true"
110
110
  @on-change="selected => onSelectDataChange(column, selected)"
111
111
  >
112
112
  <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -134,7 +134,7 @@
134
134
  filterable
135
135
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
136
136
  :placeholder="column.description"
137
- :transfer="false"
137
+ :transfer="true"
138
138
  @on-change="selected => onSelectDataChange(column, selected)"
139
139
  >
140
140
  <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -167,7 +167,7 @@
167
167
  :type="column.controlType.toLowerCase()"
168
168
  :model-value="parseFilterData(data, column)"
169
169
  :placeholder="column.description"
170
- :transfer="false"
170
+ :transfer="true"
171
171
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
172
172
  @on-change="
173
173
  time => {
@@ -184,7 +184,7 @@
184
184
  :model-value="parseFilterData(data, column)"
185
185
  @update:model-value="$event => setFilterData(data, column, $event)"
186
186
  :placeholder="column.description"
187
- :transfer="false"
187
+ :transfer="true"
188
188
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
189
189
  @on-change="onDataChange(column)"
190
190
  ></TimePicker>
package/src/components/view/view-form-draggable.vue CHANGED
@@ -90,7 +90,7 @@
90
90
  clearable
91
91
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
92
92
  :placeholder="column.description"
93
- :transfer="false"
93
+ :transfer="true"
94
94
  @on-change="onDataChange(column)"
95
95
  >
96
96
  <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -105,7 +105,7 @@
105
105
  clearable
106
106
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
107
107
  :placeholder="column.description"
108
- :transfer="false"
108
+ :transfer="true"
109
109
  @on-change="onDataChange(column)"
110
110
  >
111
111
  <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -120,7 +120,7 @@
120
120
  :clearable="true"
121
121
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
122
122
  :placeholder="column.description"
123
- :transfer="false"
123
+ :transfer="true"
124
124
  ></TreeSelect>
125
125
  </template>
126
126
  <template v-else-if="column.controlType === 'MultiTreeSelect'">
@@ -134,7 +134,7 @@
134
134
  :clearable="true"
135
135
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
136
136
  :placeholder="column.description"
137
- :transfer="false"
137
+ :transfer="true"
138
138
  ></TreeSelect>
139
139
  </template>
140
140
  <template v-else-if="column.controlType === 'SelectWithOther'">
@@ -145,7 +145,7 @@
145
145
  clearable
146
146
  :style="{ width: column.controlWidth == null ? '40%' : column.controlWidth + 'px' }"
147
147
  :placeholder="column.description"
148
- :transfer="false"
148
+ :transfer="true"
149
149
  @on-change="onDataChange(column)"
150
150
  >
151
151
  <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -173,7 +173,7 @@
173
173
  @on-clear="() => loadOption(data, column)"
174
174
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
175
175
  :placeholder="column.description"
176
- :transfer="false"
176
+ :transfer="true"
177
177
  @on-change="selected => onDataChange(column, selected)">
178
178
  <Option v-for="item in getDataSource(data, column)"
179
179
  :key="item.id"
@@ -189,7 +189,7 @@
189
189
  filterable
190
190
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
191
191
  :placeholder="column.description"
192
- :transfer="false"
192
+ :transfer="true"
193
193
  @on-change="onDataChange(column)"
194
194
  >
195
195
  <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -228,7 +228,7 @@
228
228
  :model-value="parseData(data, column.code)"
229
229
  :readonly="column.isReadonly"
230
230
  :placeholder="column.description"
231
- :transfer="false"
231
+ :transfer="true"
232
232
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
233
233
  @on-change="
234
234
  time => {
@@ -245,7 +245,7 @@
245
245
  @update:model-value="$event => setArrayData(data, column.code, $event)"
246
246
  :readonly="column.isReadonly"
247
247
  :placeholder="column.description"
248
- :transfer="false"
248
+ :transfer="true"
249
249
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
250
250
  @on-change="onDataChange(column)"
251
251
  ></DatePicker>
@@ -257,7 +257,7 @@
257
257
  @update:model-value="$event => setData(data, column.code, $event)"
258
258
  :readonly="column.isReadonly"
259
259
  :placeholder="column.description"
260
- :transfer="false"
260
+ :transfer="true"
261
261
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
262
262
  @on-change="
263
263
  time => {
package/src/components/view/view-form.vue CHANGED
@@ -137,7 +137,7 @@
137
137
  'min-width': column.controlWidth == null ? null : column.controlWidth + 'px'
138
138
  }"
139
139
  :placeholder="column.description"
140
- :transfer="false"
140
+ :transfer="true"
141
141
  @on-change="selected => onSelectDataChange(column, selected)"
142
142
  >
143
143
  <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -152,7 +152,7 @@
152
152
  :clearable="true"
153
153
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
154
154
  :placeholder="column.description"
155
- :transfer="false"
155
+ :transfer="true"
156
156
  @on-change="selected => onSelectDataChange(column, selected)"
157
157
  >
158
158
  <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -167,7 +167,7 @@
167
167
  :clearable="true"
168
168
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
169
169
  :placeholder="column.description"
170
- :transfer="false"
170
+ :transfer="true"
171
171
  @on-change="selected => onSelectDataChange(column, selected)"
172
172
  ></TreeSelect>
173
173
  </template>
@@ -182,7 +182,7 @@
182
182
  :clearable="true"
183
183
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
184
184
  :placeholder="column.description"
185
- :transfer="false"
185
+ :transfer="true"
186
186
  @on-change="selected => onSelectDataChange(column, selected)"
187
187
  ></TreeSelect>
188
188
  </template>
@@ -195,7 +195,7 @@
195
195
  @on-clear="() => loadOption(data, column)"
196
196
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
197
197
  :placeholder="column.description"
198
- :transfer="false"
198
+ :transfer="true"
199
199
  @on-change="(selected) => onDataChange(column, selected)">
200
200
  <Option v-for="item in getDataSource(data, column)"
201
201
  :key="item.id"
@@ -211,7 +211,7 @@
211
211
  filterable
212
212
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
213
213
  :placeholder="column.description"
214
- :transfer="false"
214
+ :transfer="true"
215
215
  @on-change="selected => onSelectDataChange(column, selected)"
216
216
  >
217
217
  <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -252,7 +252,7 @@
252
252
  :clearable="true"
253
253
  :style="{ width: column.controlWidth == null ? '40%' : column.controlWidth + 'px' }"
254
254
  :placeholder="column.description"
255
- :transfer="false"
255
+ :transfer="true"
256
256
  @on-change="selected => onSelectDataChange(column, selected)"
257
257
  >
258
258
  <Option v-for="item in getDataSource(data, column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -278,7 +278,7 @@
278
278
  :model-value="parseDateTimeData(data, column.code)"
279
279
  :readonly="readonly || column.isReadonly"
280
280
  :placeholder="column.description"
281
- :transfer="false"
281
+ :transfer="true"
282
282
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
283
283
  @on-change="
284
284
  time => {
@@ -295,7 +295,7 @@
295
295
  @update:model-value="$event => setArrayData(data, column.code, $event)"
296
296
  :readonly="readonly || column.isReadonly"
297
297
  :placeholder="column.description"
298
- :transfer="false"
298
+ :transfer="true"
299
299
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
300
300
  @on-change="onDataChange(column)"
301
301
  ></DatePicker>
@@ -306,7 +306,7 @@
306
306
  :model-value="parseData(data, column.code)"
307
307
  :readonly="readonly || column.isReadonly"
308
308
  :placeholder="column.description"
309
- :transfer="false"
309
+ :transfer="true"
310
310
  :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
311
311
  @on-change="
312
312
  time => {
package/src/components/view/view-table.vue CHANGED
@@ -178,7 +178,7 @@
178
178
  clearable
179
179
  :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
180
180
  :placeholder="column.description"
181
- :transfer="false"
181
+ :transfer="true"
182
182
  @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
183
183
  >
184
184
  <Option v-for="item in getDataSource(rowData(row, index), column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -194,7 +194,7 @@
194
194
  clearable
195
195
  :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
196
196
  :placeholder="column.description"
197
- :transfer="false"
197
+ :transfer="true"
198
198
  @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
199
199
  >
200
200
  <Option v-for="item in getDataSource(rowData(row, index), column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -210,7 +210,7 @@
210
210
  filterable
211
211
  :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
212
212
  :placeholder="column.description"
213
- :transfer="false"
213
+ :transfer="true"
214
214
  @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
215
215
  >
216
216
  <Option v-for="item in getDataSource(rowData(row, index), column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -264,7 +264,7 @@
264
264
  : column.controlWidth - 8 + 'px'
265
265
  }"
266
266
  :placeholder="column.description"
267
- :transfer="false"
267
+ :transfer="true"
268
268
  @on-change="selected => onSelectDataChange(rowData(row, index), column, selected)"
269
269
  >
270
270
  <Option v-for="item in getDataSource(rowData(row, index), column)" :key="item.id" :value="item.id">{{ item.name }}</Option>
@@ -296,7 +296,7 @@
296
296
  :readonly="isReadonly(rowData(row, index), column)"
297
297
  :placeholder="column.description"
298
298
  :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
299
- :transfer="false"
299
+ :transfer="true"
300
300
  @on-change="
301
301
  time => {
302
302
  setData(rowData(row, index), column.code, time);
@@ -314,7 +314,7 @@
314
314
  :readonly="isReadonly(rowData(row, index), column)"
315
315
  :placeholder="column.description"
316
316
  :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
317
- :transfer="false"
317
+ :transfer="true"
318
318
  @on-change="onDataChange(rowData(row, index), column)"
319
319
  ></DatePicker>
320
320
  </template>
@@ -326,7 +326,7 @@
326
326
  :readonly="isReadonly(rowData(row, index), column)"
327
327
  :placeholder="column.description"
328
328
  :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
329
- :transfer="false"
329
+ :transfer="true"
330
330
  @on-change="
331
331
  time => {
332
332
  setData(rowData(row, index), column.code, time);
package/src/components/workflow/flow-chart.vue CHANGED
@@ -336,7 +336,7 @@
336
336
  </template>
337
337
  <template #column="{ data, code }">
338
338
  <template v-if="code == 'rejectActivityPid'">
339
- <Select v-model="data[code]" clearable placeholder="退回发起人" :transfer="false" v-if="activities">
339
+ <Select v-model="data[code]" clearable placeholder="退回发起人" :transfer="true" v-if="activities">
340
340
  <Option
341
341
  v-for="item in activities.filter(item => {
342
342
  return (
package/src/layouts/basic-layout/menu-side/menu-collapse.vue CHANGED
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <Dropdown :transfer="false" boundaries-element="viewport" placement="right-start" :class="dropdownClasses">
2
+ <Dropdown :transfer="true" boundaries-element="viewport" placement="right-start" :class="dropdownClasses">
3
3
  <li :class="menuItemClasses" v-if="topLevel">
4
4
  <i-menu-side-title :menu="menu" hide-title collapse />
5
5
  </li>
package/src/mixins/page.js CHANGED
@@ -436,8 +436,13 @@ export default {
436
436
  text[i] == '!' ||
437
437
  text[i] == '|' ||
438
438
  text[i] == '&' ||
439
- text[i] == '='
439
+ text[i] == '=' ||
440
+ i == text.length - 1
440
441
  ) {
442
+ if (i == text.length - 1) {
443
+ expression += text[i];
444
+ }
445
+
441
446
  if (!!(expression || '').trim()) {
442
447
  if (!isNaN(expression) || expression.substr(0, 1) == "'" || expression.substr(0, 1) == '"' || expression == 'null') {
443
448
  result += expression;
@@ -446,7 +451,7 @@ export default {
446
451
 
447
452
  if (data == null) {
448
453
  result += expression;
449
- } else if (isNaN(data)) {
454
+ } else if (isNaN(data) || data.toString().length > 16) {
450
455
  result += "'" + String(data) + "'";
451
456
  } else {
452
457
  result += String(data);
@@ -455,27 +460,30 @@ export default {
455
460
 
456
461
  expression = '';
457
462
  }
458
- result += text[i];
463
+
464
+ if (i != text.length - 1) {
465
+ result += text[i];
466
+ }
459
467
  } else {
460
468
  expression += text[i];
461
469
  }
462
470
  }
463
471
 
464
- if (!!(expression || '').trim()) {
465
- if (!isNaN(expression) || expression.substr(0, 1) == "'" || expression.substr(0, 1) == '"' || expression == 'null') {
466
- result += expression;
467
- } else {
468
- let data = this.parseData(model, expression);
469
-
470
- if (data == null) {
471
- result += 'null';
472
- } else if (isNaN(data)) {
473
- result += "'" + String(data) + "'";
474
- } else {
475
- result += String(data);
476
- }
477
- }
478
- }
472
+ // if (!!(expression || '').trim()) {
473
+ // if (!isNaN(expression) || expression.substr(0, 1) == "'" || expression.substr(0, 1) == '"' || expression == 'null') {
474
+ // result += expression;
475
+ // } else {
476
+ // let data = this.parseData(model, expression);
477
+
478
+ // if (data == null) {
479
+ // result += 'null';
480
+ // } else if (isNaN(data) || data > 1416732604056469504) {
481
+ // result += "'" + String(data) + "'";
482
+ // } else {
483
+ // result += String(data);
484
+ // }
485
+ // }
486
+ // }
479
487
 
480
488
  let data = null;
481
489
  try {
package/src/pages/system/role.vue CHANGED
@@ -31,7 +31,7 @@
31
31
  <Input type="number" size="small" number v-model="row.propertyValue" />
32
32
  </template>
33
33
  <template v-else-if="row.controlType === 'Select'">
34
- <Select size="small" v-model="row.propertyValue" clearable :transfer="false">
34
+ <Select size="small" v-model="row.propertyValue" clearable :transfer="true">
35
35
  <Option v-for="item in row._dataSource" :key="item.id" :value="item.id">{{ item.name }}</Option>
36
36
  </Select>
37
37
  </template>
@@ -46,7 +46,7 @@
46
46
  "
47
47
  :multiple="true"
48
48
  clearable
49
- :transfer="false"
49
+ :transfer="true"
50
50
  >
51
51
  <Option v-for="item in row._dataSource" :key="item.id" :value="item.id">{{ item.name }}</Option>
52
52
  </Select>
package/src/pages/system/rolePropertyEdit.vue CHANGED
@@ -22,14 +22,14 @@
22
22
  </Col>
23
23
  <Col v-bind="grid8">
24
24
  <FormItem :label="$t('Front_Label_Data_Type')" prop="dataType">
25
- <Select v-model="data.dataType" :transfer="false">
25
+ <Select v-model="data.dataType" :transfer="true">
26
26
  <Option v-for="item in getEnumList('DataType')" :key="item.id" :value="item.id">{{ item.name }}</Option>
27
27
  </Select>
28
28
  </FormItem>
29
29
  </Col>
30
30
  <Col v-bind="grid8">
31
31
  <FormItem label="控件类型" prop="ControlType">
32
- <Select v-model="data.controlType" :transfer="false">
32
+ <Select v-model="data.controlType" :transfer="true">
33
33
  <Option key="TextInput" value="TextInput">单行文本框</Option>
34
34
  <Option key="NumberInput" value="NumberInput">数字输入框</Option>
35
35
  <Option key="Check" value="Check">勾选</Option>
package/src/pages/system/user.vue CHANGED
@@ -35,7 +35,7 @@
35
35
  <Input type="number" size="small" number v-model="row.propertyValue" />
36
36
  </template>
37
37
  <template v-else-if="row.controlType === 'Select'">
38
- <Select size="small" v-model="row.propertyValue" clearable :transfer="false">
38
+ <Select size="small" v-model="row.propertyValue" clearable :transfer="true">
39
39
  <Option v-for="item in row._dataSource" :key="item.id" :value="item.id">{{ item.name }}</Option>
40
40
  </Select>
41
41
  </template>