@leevan/jtui 2.0.8 → 2.0.11

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.
@@ -67,6 +67,8 @@
67
67
  :style="{width:item.width ? item.width === 'auto' ? item.width : item.width + 'px' : '200px'}"
68
68
  v-model="model[item.modelKey]"
69
69
  :disabled="item.disabled ? item.disabled : false"
70
+ :filterable="item.isCreate ? true : false"
71
+ :allow-create="item.isCreate ? true : false"
70
72
  :multiple="item.multiple === undefined ? false : true"
71
73
  :collapse-tags="item.collapse ===undefined ? false : true"
72
74
  :placeholder="item.placeholder ? item.placeholder : ''">
@@ -1101,9 +1101,15 @@ export default {
1101
1101
  });
1102
1102
  let list = [];
1103
1103
  if (order === "asc" || order === "desc") {
1104
- list = data1.sort((a, b) => {
1105
- return a[property] - b[property];
1106
- });
1104
+ if(/.*[\u4e00-\u9fa5]+.*$/.test(data1[0][property])){
1105
+ list = data1.sort((a, b) => {
1106
+ return a[property].localeCompare(b[property]);
1107
+ });
1108
+ }else{
1109
+ list = data1.sort((a, b) => {
1110
+ return a[property] - b[property];
1111
+ });
1112
+ }
1107
1113
  }
1108
1114
  if (order === "desc") {
1109
1115
  list.reverse();
@@ -1282,7 +1288,7 @@ export default {
1282
1288
  //操作列点击事件派发
1283
1289
  handlerColClick(value, row, rowIndex) {
1284
1290
  //检索
1285
- if(value === 'stcd_search'){
1291
+ if(value.indexOf("search") !== -1){
1286
1292
  this.$set(row, "activeValue", value);
1287
1293
  }
1288
1294
  //刷新
@@ -289,7 +289,7 @@ export function data23() {
289
289
  "enum": [],
290
290
  "children": [
291
291
  {
292
- "isSort": false,
292
+ "isSort": true,
293
293
  "prop": "wxq",
294
294
  "width": 150,
295
295
  "label": "危险区名称",
@@ -307,10 +307,10 @@ export function data23() {
307
307
  "enum": [],
308
308
  "children": [
309
309
  {
310
- "isSort": true,
310
+ "isSort": false,
311
311
  "prop": "shg",
312
312
  "width": 50,
313
- "label": "<span class=red>HTML 标签与筛选</span>",
313
+ "label": "标签与筛选",
314
314
  "type": "String",
315
315
  "align": "left",
316
316
  "enum": [],
@@ -441,30 +441,30 @@ export function data23() {
441
441
  },
442
442
  Result: 89,
443
443
  DataArray: [
444
- {
445
- "xzrdh": "13882885223",
446
- "country": "罗江镇",
447
- "isExpand": '1',
448
- "yjrzw": "社区书记",
449
- "count": "273",
450
- "jcrxm": "杨海燕",
451
- "yjrxm": "何东",
452
- "wxq": "高石社区三组",
453
- "xzrxm": "张朝阳",
454
- "shg": {
455
- enum: [{ label: '测试1', value: 1 }, { label: '测试2', value: 2 }],
456
- selected: 1
457
- },
458
- "xzrzw": "镇长",
459
- "jcrdh": "13408181100",
460
- "id": "2",
461
- "village": {
462
- enum: [{ label: '多选1', value: 1 }, { label: '多选2', value: 2 }, { label: '多选3', value: 3 }],
463
- selected: [1, 2]
464
- },
465
- "yjrdh": "15984498223",
466
- "_XID": "row_4"
467
- },
444
+ // {
445
+ // "xzrdh": "13882885223",
446
+ // "country": "罗江镇",
447
+ // "isExpand": '1',
448
+ // "yjrzw": "社区书记",
449
+ // "count": "273",
450
+ // "jcrxm": "杨海燕",
451
+ // "yjrxm": "何东",
452
+ // "wxq": "高石社区三组",
453
+ // "xzrxm": "张朝阳",
454
+ // "shg": {
455
+ // enum: [{ label: '测试1', value: 1 }, { label: '测试2', value: 2 }],
456
+ // selected: 1
457
+ // },
458
+ // "xzrzw": "镇长",
459
+ // "jcrdh": "13408181100",
460
+ // "id": "2",
461
+ // "village": {
462
+ // enum: [{ label: '多选1', value: 1 }, { label: '多选2', value: 2 }, { label: '多选3', value: 3 }],
463
+ // selected: [1, 2]
464
+ // },
465
+ // "yjrdh": "15984498223",
466
+ // "_XID": "row_4"
467
+ // },
468
468
  {
469
469
  "xzrdh": "13882885223",
470
470
  "country": "罗江镇",