mooho-base-admin-plus 2.2.13 → 2.3.0

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 (12) hide show
  1. package/history.md +2 -0
  2. package/package/mooho-base-admin-plus.min.esm.js +174 -120
  3. package/package/mooho-base-admin-plus.min.js +9 -9
  4. package/package/style.css +1 -1
  5. package/package.json +1 -1
  6. package/src/components/view/column-edit.vue +26 -0
  7. package/src/components/view/modal-table.vue +7 -0
  8. package/src/components/view/table-filter.vue +17 -4
  9. package/src/components/view/view-form-draggable.vue +3 -3
  10. package/src/components/view/view-form.vue +3 -3
  11. package/src/components/view/view-table.vue +24 -13
  12. package/src/styles/css/default.css +6 -0
package/package/mooho-base-admin-plus.min.esm.js CHANGED
@@ -37128,7 +37128,7 @@ const _sfc_main$w = {
37128
37128
  column.triggers = [];
37129
37129
  });
37130
37130
  this.columns.filter((column) => {
37131
- return !column.isStaticItem && !!(column.source || "").trim() && !!(column.param || "").trim() && !column.dataType.startsWith("Enum:");
37131
+ return !column.isStaticItem && !!(column.source || "").trim() && !!(column.param || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:"));
37132
37132
  }).forEach((column) => {
37133
37133
  let param = JSON.parse(column.param);
37134
37134
  for (let key in param) {
@@ -37333,7 +37333,7 @@ const _sfc_main$w = {
37333
37333
  }
37334
37334
  if (sender == null || sender.triggers && sender.triggers !== []) {
37335
37335
  this.columns.forEach(function(column) {
37336
- if (!column.isStaticItem && !!(column.source || "").trim() && !column.dataType.startsWith("Enum:") && (sender == null || sender.triggers.some((item) => {
37336
+ if (!column.isStaticItem && !!(column.source || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:")) && (sender == null || sender.triggers.some((item) => {
37337
37337
  return item.code == column.code;
37338
37338
  }))) {
37339
37339
  column.needRefresh = true;
@@ -37352,7 +37352,7 @@ const _sfc_main$w = {
37352
37352
  column.triggers.forEach((item) => {
37353
37353
  item.needClear = true;
37354
37354
  });
37355
- } else if (column.needRefresh && !!(column.source || "").trim() && !column.dataType.startsWith("Enum:")) {
37355
+ } else if (column.needRefresh && !!(column.source || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:"))) {
37356
37356
  let param = this.getParam(this.data, column);
37357
37357
  if (column.controlType === "Select" || column.controlType === "MultiSelect" || column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect" || column.controlType === "SelectWithOther" || column.controlType === "ComboSelect" || column.controlType === "Radio" || column.controlType === "CheckGroup") {
37358
37358
  if (param != null) {
@@ -38425,7 +38425,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
38425
38425
  return openBlock(), createElementBlock("div", null, [
38426
38426
  createVNode$1(_component_Modal, {
38427
38427
  modelValue: $data.opened,
38428
- "onUpdate:modelValue": _cache[59] || (_cache[59] = ($event) => $data.opened = $event),
38428
+ "onUpdate:modelValue": _cache[61] || (_cache[61] = ($event) => $data.opened = $event),
38429
38429
  scrollable: "",
38430
38430
  "mask-closable": _ctx.layout.maskClosable,
38431
38431
  draggable: _ctx.layout.draggable,
@@ -38472,7 +38472,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
38472
38472
  "label-colon": "\uFF1A",
38473
38473
  class: "ivu-mt",
38474
38474
  rules: $data.rules,
38475
- onSubmit: _cache[58] || (_cache[58] = withModifiers(() => {
38475
+ onSubmit: _cache[60] || (_cache[60] = withModifiers(() => {
38476
38476
  }, ["prevent"]))
38477
38477
  }, {
38478
38478
  default: withCtx(() => [
@@ -39139,6 +39139,46 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39139
39139
  ]),
39140
39140
  _: 1
39141
39141
  }, 16),
39142
+ $props.viewType == "TableView" && $data.data.controlType == "Label" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 20 }, _ctx.grid8)), {
39143
+ default: withCtx(() => [
39144
+ createVNode$1(_component_FormItem, {
39145
+ label: "\u5F3A\u5236\u5355\u884C",
39146
+ key: "is_fixed",
39147
+ prop: "isSingleLine"
39148
+ }, {
39149
+ default: withCtx(() => [
39150
+ createVNode$1(_component_Switch, {
39151
+ "model-value": !!$data.data.isSingleLine,
39152
+ "onUpdate:modelValue": _cache[35] || (_cache[35] = ($event) => {
39153
+ $data.data.isSingleLine = $event;
39154
+ })
39155
+ }, null, 8, ["model-value"])
39156
+ ]),
39157
+ _: 1
39158
+ })
39159
+ ]),
39160
+ _: 1
39161
+ }, 16)) : createCommentVNode("v-if", true),
39162
+ $props.viewType == "TableView" && $data.data.controlType == "Label" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 21 }, _ctx.grid8)), {
39163
+ default: withCtx(() => [
39164
+ createVNode$1(_component_FormItem, {
39165
+ label: "\u56FA\u5B9A\u5728\u6700\u524D",
39166
+ key: "isFixed",
39167
+ prop: "isFixed"
39168
+ }, {
39169
+ default: withCtx(() => [
39170
+ createVNode$1(_component_Switch, {
39171
+ "model-value": !!$data.data.isFixed,
39172
+ "onUpdate:modelValue": _cache[36] || (_cache[36] = ($event) => {
39173
+ $data.data.isFixed = $event;
39174
+ })
39175
+ }, null, 8, ["model-value"])
39176
+ ]),
39177
+ _: 1
39178
+ })
39179
+ ]),
39180
+ _: 1
39181
+ }, 16)) : createCommentVNode("v-if", true),
39142
39182
  createVNode$1(_component_Col, normalizeProps(guardReactiveProps(_ctx.grid8)), {
39143
39183
  default: withCtx(() => [
39144
39184
  createVNode$1(_component_FormItem, {
@@ -39150,14 +39190,14 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39150
39190
  $options.showCheck($data.data.requiredJson) ? (openBlock(), createBlock(_component_Switch, {
39151
39191
  key: 0,
39152
39192
  "model-value": !!$data.data.isRequired,
39153
- "onUpdate:modelValue": _cache[35] || (_cache[35] = ($event) => {
39193
+ "onUpdate:modelValue": _cache[37] || (_cache[37] = ($event) => {
39154
39194
  $data.data.isRequired = $event;
39155
39195
  }),
39156
- onOnChange: _cache[36] || (_cache[36] = ($event) => $options.checkChange("requiredJson", "isRequired"))
39196
+ onOnChange: _cache[38] || (_cache[38] = ($event) => $options.checkChange("requiredJson", "isRequired"))
39157
39197
  }, null, 8, ["model-value"])) : createCommentVNode("v-if", true),
39158
39198
  createVNode$1(_component_Button, {
39159
39199
  style: { "margin-left": "8px" },
39160
- onClick: _cache[37] || (_cache[37] = ($event) => _ctx.$refs.conditionEdit.open($data.data, "requiredJson", "isRequired", $data.data.dataView.model)),
39200
+ onClick: _cache[39] || (_cache[39] = ($event) => _ctx.$refs.conditionEdit.open($data.data, "requiredJson", "isRequired", $data.data.dataView.model)),
39161
39201
  type: "primary",
39162
39202
  size: "small",
39163
39203
  icon: "ios-settings"
@@ -39173,7 +39213,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39173
39213
  ]),
39174
39214
  _: 1
39175
39215
  }, 16),
39176
- $props.viewType == "TableView" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 20 }, _ctx.grid8)), {
39216
+ $props.viewType == "TableView" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 22 }, _ctx.grid8)), {
39177
39217
  default: withCtx(() => [
39178
39218
  createVNode$1(_component_FormItem, {
39179
39219
  label: "\u7981\u7528\u6392\u5E8F",
@@ -39183,7 +39223,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39183
39223
  default: withCtx(() => [
39184
39224
  createVNode$1(_component_Switch, {
39185
39225
  "model-value": !!$data.data.sortDisable,
39186
- "onUpdate:modelValue": _cache[38] || (_cache[38] = ($event) => {
39226
+ "onUpdate:modelValue": _cache[40] || (_cache[40] = ($event) => {
39187
39227
  $data.data.sortDisable = $event;
39188
39228
  })
39189
39229
  }, null, 8, ["model-value"])
@@ -39204,7 +39244,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39204
39244
  createVNode$1(_component_Input, {
39205
39245
  type: "text",
39206
39246
  modelValue: $data.data.defaultValue,
39207
- "onUpdate:modelValue": _cache[39] || (_cache[39] = ($event) => $data.data.defaultValue = $event),
39247
+ "onUpdate:modelValue": _cache[41] || (_cache[41] = ($event) => $data.data.defaultValue = $event),
39208
39248
  maxlength: "200",
39209
39249
  style: { "width": "150px" }
39210
39250
  }, null, 8, ["modelValue"]),
@@ -39262,7 +39302,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39262
39302
  ]),
39263
39303
  _: 1
39264
39304
  }, 16),
39265
- $data.data.controlType != "Description" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 21 }, _ctx.grid8)), {
39305
+ $data.data.controlType != "Description" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 23 }, _ctx.grid8)), {
39266
39306
  default: withCtx(() => [
39267
39307
  createVNode$1(_component_FormItem, {
39268
39308
  label: "\u63CF\u8FF0",
@@ -39273,7 +39313,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39273
39313
  createVNode$1(_component_Input, {
39274
39314
  type: "text",
39275
39315
  modelValue: $data.data.description,
39276
- "onUpdate:modelValue": _cache[40] || (_cache[40] = ($event) => $data.data.description = $event),
39316
+ "onUpdate:modelValue": _cache[42] || (_cache[42] = ($event) => $data.data.description = $event),
39277
39317
  maxlength: "200"
39278
39318
  }, null, 8, ["modelValue"])
39279
39319
  ]),
@@ -39282,7 +39322,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39282
39322
  ]),
39283
39323
  _: 1
39284
39324
  }, 16)) : createCommentVNode("v-if", true),
39285
- $data.data.controlType == "Description" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 22 }, _ctx.grid24)), {
39325
+ $data.data.controlType == "Description" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 24 }, _ctx.grid24)), {
39286
39326
  default: withCtx(() => [
39287
39327
  createVNode$1(_component_FormItem, {
39288
39328
  label: "\u63CF\u8FF0",
@@ -39294,7 +39334,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39294
39334
  type: "textarea",
39295
39335
  rows: 5,
39296
39336
  modelValue: $data.data.description,
39297
- "onUpdate:modelValue": _cache[41] || (_cache[41] = ($event) => $data.data.description = $event)
39337
+ "onUpdate:modelValue": _cache[43] || (_cache[43] = ($event) => $data.data.description = $event)
39298
39338
  }, null, 8, ["modelValue"])
39299
39339
  ]),
39300
39340
  _: 1
@@ -39302,7 +39342,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39302
39342
  ]),
39303
39343
  _: 1
39304
39344
  }, 16)) : createCommentVNode("v-if", true),
39305
- $data.data.controlType == "TextInput" || $data.data.controlType == "TextArea" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 23 }, _ctx.grid8)), {
39345
+ $data.data.controlType == "TextInput" || $data.data.controlType == "TextArea" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 25 }, _ctx.grid8)), {
39306
39346
  default: withCtx(() => [
39307
39347
  createVNode$1(_component_FormItem, {
39308
39348
  label: "\u6700\u5927\u5B57\u7B26\u6570\u91CF",
@@ -39315,7 +39355,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39315
39355
  style: { "width": "100px" },
39316
39356
  number: "",
39317
39357
  modelValue: $data.data.maxLength,
39318
- "onUpdate:modelValue": _cache[42] || (_cache[42] = ($event) => $data.data.maxLength = $event)
39358
+ "onUpdate:modelValue": _cache[44] || (_cache[44] = ($event) => $data.data.maxLength = $event)
39319
39359
  }, null, 8, ["modelValue"])
39320
39360
  ]),
39321
39361
  _: 1
@@ -39323,7 +39363,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39323
39363
  ]),
39324
39364
  _: 1
39325
39365
  }, 16)) : createCommentVNode("v-if", true),
39326
- $data.data.controlType == "Attachment" || $data.data.controlType == "Image" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 24 }, _ctx.grid8)), {
39366
+ $data.data.controlType == "Attachment" || $data.data.controlType == "Image" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 26 }, _ctx.grid8)), {
39327
39367
  default: withCtx(() => [
39328
39368
  createVNode$1(_component_FormItem, {
39329
39369
  label: "\u6700\u5927\u6587\u4EF6\u6570\u91CF",
@@ -39336,7 +39376,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39336
39376
  style: { "width": "100px" },
39337
39377
  number: "",
39338
39378
  modelValue: $data.data.maxLength,
39339
- "onUpdate:modelValue": _cache[43] || (_cache[43] = ($event) => $data.data.maxLength = $event)
39379
+ "onUpdate:modelValue": _cache[45] || (_cache[45] = ($event) => $data.data.maxLength = $event)
39340
39380
  }, null, 8, ["modelValue"])
39341
39381
  ]),
39342
39382
  _: 1
@@ -39344,7 +39384,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39344
39384
  ]),
39345
39385
  _: 1
39346
39386
  }, 16)) : createCommentVNode("v-if", true),
39347
- $data.data.controlType == "NumberInput" || $data.data.controlType == "Slider" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 25 }, _ctx.grid8)), {
39387
+ $data.data.controlType == "NumberInput" || $data.data.controlType == "Slider" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 27 }, _ctx.grid8)), {
39348
39388
  default: withCtx(() => [
39349
39389
  createVNode$1(_component_FormItem, { label: "\u8F93\u5165\u8303\u56F4" }, {
39350
39390
  default: withCtx(() => [
@@ -39353,7 +39393,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39353
39393
  style: { "width": "60px" },
39354
39394
  number: "",
39355
39395
  modelValue: $data.data.minValue,
39356
- "onUpdate:modelValue": _cache[44] || (_cache[44] = ($event) => $data.data.minValue = $event)
39396
+ "onUpdate:modelValue": _cache[46] || (_cache[46] = ($event) => $data.data.minValue = $event)
39357
39397
  }, null, 8, ["modelValue"]),
39358
39398
  createTextVNode(" - "),
39359
39399
  createVNode$1(_component_Input, {
@@ -39361,7 +39401,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39361
39401
  style: { "width": "60px" },
39362
39402
  number: "",
39363
39403
  modelValue: $data.data.maxValue,
39364
- "onUpdate:modelValue": _cache[45] || (_cache[45] = ($event) => $data.data.maxValue = $event)
39404
+ "onUpdate:modelValue": _cache[47] || (_cache[47] = ($event) => $data.data.maxValue = $event)
39365
39405
  }, null, 8, ["modelValue"])
39366
39406
  ]),
39367
39407
  _: 1
@@ -39382,7 +39422,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39382
39422
  style: { "width": "100px" },
39383
39423
  number: "",
39384
39424
  modelValue: $data.data.digit,
39385
- "onUpdate:modelValue": _cache[46] || (_cache[46] = ($event) => $data.data.digit = $event)
39425
+ "onUpdate:modelValue": _cache[48] || (_cache[48] = ($event) => $data.data.digit = $event)
39386
39426
  }, null, 8, ["modelValue"])
39387
39427
  ]),
39388
39428
  _: 1
@@ -39400,7 +39440,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39400
39440
  default: withCtx(() => [
39401
39441
  createVNode$1(_component_Switch, {
39402
39442
  "model-value": !!$data.data.fixedDigit,
39403
- "onUpdate:modelValue": _cache[47] || (_cache[47] = ($event) => {
39443
+ "onUpdate:modelValue": _cache[49] || (_cache[49] = ($event) => {
39404
39444
  $data.data.fixedDigit = $event;
39405
39445
  })
39406
39446
  }, null, 8, ["model-value"])
@@ -39410,7 +39450,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39410
39450
  ]),
39411
39451
  _: 1
39412
39452
  }, 16),
39413
- $props.viewType == "FormView" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 26 }, _ctx.grid8)), {
39453
+ $props.viewType == "FormView" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 28 }, _ctx.grid8)), {
39414
39454
  default: withCtx(() => [
39415
39455
  createVNode$1(_component_FormItem, {
39416
39456
  label: "\u5F3A\u5236\u6362\u884C",
@@ -39420,7 +39460,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39420
39460
  default: withCtx(() => [
39421
39461
  createVNode$1(_component_Switch, {
39422
39462
  "model-value": !!$data.data.newLine,
39423
- "onUpdate:modelValue": _cache[48] || (_cache[48] = ($event) => {
39463
+ "onUpdate:modelValue": _cache[50] || (_cache[50] = ($event) => {
39424
39464
  $data.data.newLine = $event;
39425
39465
  })
39426
39466
  }, null, 8, ["model-value"])
@@ -39430,7 +39470,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39430
39470
  ]),
39431
39471
  _: 1
39432
39472
  }, 16)) : createCommentVNode("v-if", true),
39433
- $props.viewType == "TableView" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 27 }, _ctx.grid8)), {
39473
+ $props.viewType == "TableView" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 29 }, _ctx.grid8)), {
39434
39474
  default: withCtx(() => [
39435
39475
  createVNode$1(_component_FormItem, {
39436
39476
  label: "\u7236\u5355\u5143\u683C\u4EE3\u7801",
@@ -39441,7 +39481,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39441
39481
  createVNode$1(_component_Input, {
39442
39482
  type: "text",
39443
39483
  modelValue: $data.data.parentCode,
39444
- "onUpdate:modelValue": _cache[49] || (_cache[49] = ($event) => $data.data.parentCode = $event),
39484
+ "onUpdate:modelValue": _cache[51] || (_cache[51] = ($event) => $data.data.parentCode = $event),
39445
39485
  maxlength: "200"
39446
39486
  }, null, 8, ["modelValue"])
39447
39487
  ]),
@@ -39450,7 +39490,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39450
39490
  ]),
39451
39491
  _: 1
39452
39492
  }, 16)) : createCommentVNode("v-if", true),
39453
- $props.viewType == "TableView" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 28 }, _ctx.grid8)), {
39493
+ $props.viewType == "TableView" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 30 }, _ctx.grid8)), {
39454
39494
  default: withCtx(() => [
39455
39495
  createVNode$1(_component_FormItem, {
39456
39496
  label: "\u5408\u5E76\u5355\u5143\u683C",
@@ -39460,7 +39500,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39460
39500
  default: withCtx(() => [
39461
39501
  createVNode$1(_component_Switch, {
39462
39502
  "model-value": !!$data.data.mergeSame,
39463
- "onUpdate:modelValue": _cache[50] || (_cache[50] = ($event) => {
39503
+ "onUpdate:modelValue": _cache[52] || (_cache[52] = ($event) => {
39464
39504
  $data.data.mergeSame = $event;
39465
39505
  })
39466
39506
  }, null, 8, ["model-value"])
@@ -39470,7 +39510,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39470
39510
  ]),
39471
39511
  _: 1
39472
39512
  }, 16)) : createCommentVNode("v-if", true),
39473
- $props.viewType == "FormView" && $data.data.controlType == "Attachment" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 29 }, _ctx.grid8)), {
39513
+ $props.viewType == "FormView" && $data.data.controlType == "Attachment" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 31 }, _ctx.grid8)), {
39474
39514
  default: withCtx(() => [
39475
39515
  createVNode$1(_component_FormItem, {
39476
39516
  label: "\u62D6\u62FD\u4E0A\u4F20",
@@ -39480,7 +39520,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39480
39520
  default: withCtx(() => [
39481
39521
  createVNode$1(_component_Switch, {
39482
39522
  "model-value": !!$data.data.mergeSame,
39483
- "onUpdate:modelValue": _cache[51] || (_cache[51] = ($event) => {
39523
+ "onUpdate:modelValue": _cache[53] || (_cache[53] = ($event) => {
39484
39524
  $data.data.mergeSame = $event;
39485
39525
  })
39486
39526
  }, null, 8, ["model-value"])
@@ -39490,7 +39530,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39490
39530
  ]),
39491
39531
  _: 1
39492
39532
  }, 16)) : createCommentVNode("v-if", true),
39493
- $data.data.controlType == "TextInput" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 30 }, _ctx.grid8)), {
39533
+ $data.data.controlType == "TextInput" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 32 }, _ctx.grid8)), {
39494
39534
  default: withCtx(() => [
39495
39535
  createVNode$1(_component_FormItem, {
39496
39536
  label: "\u9A8C\u8BC1\u8868\u8FBE\u5F0F",
@@ -39501,7 +39541,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39501
39541
  createVNode$1(_component_Input, {
39502
39542
  type: "text",
39503
39543
  modelValue: $data.data.pattern,
39504
- "onUpdate:modelValue": _cache[52] || (_cache[52] = ($event) => $data.data.pattern = $event),
39544
+ "onUpdate:modelValue": _cache[54] || (_cache[54] = ($event) => $data.data.pattern = $event),
39505
39545
  maxlength: "100"
39506
39546
  }, null, 8, ["modelValue"])
39507
39547
  ]),
@@ -39510,7 +39550,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39510
39550
  ]),
39511
39551
  _: 1
39512
39552
  }, 16)) : createCommentVNode("v-if", true),
39513
- $data.data.controlType == "SelectWithOther" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 31 }, _ctx.grid8)), {
39553
+ $data.data.controlType == "SelectWithOther" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 33 }, _ctx.grid8)), {
39514
39554
  default: withCtx(() => [
39515
39555
  createVNode$1(_component_FormItem, {
39516
39556
  label: "\u5176\u4ED6\u6587\u672C",
@@ -39521,7 +39561,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39521
39561
  createVNode$1(_component_Input, {
39522
39562
  type: "text",
39523
39563
  modelValue: $data.data.pattern,
39524
- "onUpdate:modelValue": _cache[53] || (_cache[53] = ($event) => $data.data.pattern = $event),
39564
+ "onUpdate:modelValue": _cache[55] || (_cache[55] = ($event) => $data.data.pattern = $event),
39525
39565
  maxlength: "100"
39526
39566
  }, null, 8, ["modelValue"])
39527
39567
  ]),
@@ -39530,7 +39570,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39530
39570
  ]),
39531
39571
  _: 1
39532
39572
  }, 16)) : createCommentVNode("v-if", true),
39533
- $data.data.controlType == "Attachment" || $data.data.controlType == "Image" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 32 }, _ctx.grid8)), {
39573
+ $data.data.controlType == "Attachment" || $data.data.controlType == "Image" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 34 }, _ctx.grid8)), {
39534
39574
  default: withCtx(() => [
39535
39575
  createVNode$1(_component_FormItem, {
39536
39576
  label: "\u63A5\u53D7\u7684\u6587\u4EF6\u7C7B\u578B",
@@ -39541,7 +39581,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39541
39581
  createVNode$1(_component_Input, {
39542
39582
  type: "text",
39543
39583
  modelValue: $data.data.pattern,
39544
- "onUpdate:modelValue": _cache[54] || (_cache[54] = ($event) => $data.data.pattern = $event),
39584
+ "onUpdate:modelValue": _cache[56] || (_cache[56] = ($event) => $data.data.pattern = $event),
39545
39585
  maxlength: "100"
39546
39586
  }, null, 8, ["modelValue"])
39547
39587
  ]),
@@ -39550,7 +39590,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39550
39590
  ]),
39551
39591
  _: 1
39552
39592
  }, 16)) : createCommentVNode("v-if", true),
39553
- $props.viewType == "FormView" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 33 }, _ctx.grid8)), {
39593
+ $props.viewType == "FormView" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 35 }, _ctx.grid8)), {
39554
39594
  default: withCtx(() => [
39555
39595
  createVNode$1(_component_FormItem, {
39556
39596
  label: "\u9009\u9879\u5361\u5E8F\u53F7",
@@ -39563,7 +39603,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39563
39603
  style: { "width": "100px" },
39564
39604
  number: "",
39565
39605
  modelValue: $data.data.tabIndex,
39566
- "onUpdate:modelValue": _cache[55] || (_cache[55] = ($event) => $data.data.tabIndex = $event)
39606
+ "onUpdate:modelValue": _cache[57] || (_cache[57] = ($event) => $data.data.tabIndex = $event)
39567
39607
  }, null, 8, ["modelValue"])
39568
39608
  ]),
39569
39609
  _: 1
@@ -39582,7 +39622,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39582
39622
  createVNode$1(_component_Input, {
39583
39623
  type: "text",
39584
39624
  modelValue: $data.data.calculate,
39585
- "onUpdate:modelValue": _cache[56] || (_cache[56] = ($event) => $data.data.calculate = $event),
39625
+ "onUpdate:modelValue": _cache[58] || (_cache[58] = ($event) => $data.data.calculate = $event),
39586
39626
  maxlength: "500"
39587
39627
  }, null, 8, ["modelValue"])
39588
39628
  ]),
@@ -39591,7 +39631,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39591
39631
  ]),
39592
39632
  _: 1
39593
39633
  }, 16),
39594
- $props.viewType == "FormView" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 34 }, _ctx.grid24)), {
39634
+ $props.viewType == "FormView" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 36 }, _ctx.grid24)), {
39595
39635
  default: withCtx(() => [
39596
39636
  createVNode$1(_component_FormItem, {
39597
39637
  label: "\u6587\u5B57\u63D0\u793A",
@@ -39603,7 +39643,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39603
39643
  type: "textarea",
39604
39644
  autosize: true,
39605
39645
  modelValue: $data.data.tooltip,
39606
- "onUpdate:modelValue": _cache[57] || (_cache[57] = ($event) => $data.data.tooltip = $event),
39646
+ "onUpdate:modelValue": _cache[59] || (_cache[59] = ($event) => $data.data.tooltip = $event),
39607
39647
  maxlength: "500"
39608
39648
  }, null, 8, ["modelValue"])
39609
39649
  ]),
@@ -39624,7 +39664,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39624
39664
  }, 8, ["modelValue", "mask-closable", "draggable"]),
39625
39665
  createVNode$1(_component_Modal, {
39626
39666
  modelValue: $data.paramOpened,
39627
- "onUpdate:modelValue": _cache[61] || (_cache[61] = ($event) => $data.paramOpened = $event),
39667
+ "onUpdate:modelValue": _cache[63] || (_cache[63] = ($event) => $data.paramOpened = $event),
39628
39668
  scrollable: "",
39629
39669
  "mask-closable": _ctx.layout.maskClosable,
39630
39670
  draggable: _ctx.layout.draggable,
@@ -39646,7 +39686,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39646
39686
  type: "primary",
39647
39687
  ghost: "",
39648
39688
  "custom-icon": "fa fa-plus",
39649
- onClick: _cache[60] || (_cache[60] = ($event) => $options.paramEdit())
39689
+ onClick: _cache[62] || (_cache[62] = ($event) => $options.paramEdit())
39650
39690
  }, {
39651
39691
  default: withCtx(() => [
39652
39692
  createTextVNode(toDisplayString$1(_ctx.$t("Front_Btn_Add")), 1)
@@ -39715,7 +39755,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39715
39755
  }, 8, ["modelValue", "mask-closable", "draggable"]),
39716
39756
  createVNode$1(_component_Modal, {
39717
39757
  modelValue: $data.paramItemOpened,
39718
- "onUpdate:modelValue": _cache[68] || (_cache[68] = ($event) => $data.paramItemOpened = $event),
39758
+ "onUpdate:modelValue": _cache[70] || (_cache[70] = ($event) => $data.paramItemOpened = $event),
39719
39759
  scrollable: "",
39720
39760
  "mask-closable": _ctx.layout.maskClosable,
39721
39761
  draggable: _ctx.layout.draggable,
@@ -39759,7 +39799,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39759
39799
  "label-position": "top",
39760
39800
  "label-colon": "\uFF1A",
39761
39801
  class: "ivu-mt",
39762
- onSubmit: _cache[67] || (_cache[67] = withModifiers(() => {
39802
+ onSubmit: _cache[69] || (_cache[69] = withModifiers(() => {
39763
39803
  }, ["prevent"]))
39764
39804
  }, {
39765
39805
  default: withCtx(() => [
@@ -39779,12 +39819,12 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39779
39819
  createVNode$1(_component_Input, {
39780
39820
  type: "text",
39781
39821
  modelValue: $data.paramData.code,
39782
- "onUpdate:modelValue": _cache[63] || (_cache[63] = ($event) => $data.paramData.code = $event)
39822
+ "onUpdate:modelValue": _cache[65] || (_cache[65] = ($event) => $data.paramData.code = $event)
39783
39823
  }, {
39784
39824
  prepend: withCtx(() => [
39785
39825
  createVNode$1(_component_Button, {
39786
39826
  "custom-icon": "fa fa-search",
39787
- onClick: _cache[62] || (_cache[62] = ($event) => $options.openColumnSelect($data.paramData, "code"))
39827
+ onClick: _cache[64] || (_cache[64] = ($event) => $options.openColumnSelect($data.paramData, "code"))
39788
39828
  })
39789
39829
  ]),
39790
39830
  _: 1
@@ -39805,7 +39845,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39805
39845
  default: withCtx(() => [
39806
39846
  createVNode$1(_component_RadioGroup, {
39807
39847
  modelValue: $data.paramData.keyType,
39808
- "onUpdate:modelValue": _cache[64] || (_cache[64] = ($event) => $data.paramData.keyType = $event),
39848
+ "onUpdate:modelValue": _cache[66] || (_cache[66] = ($event) => $data.paramData.keyType = $event),
39809
39849
  onOnChange: $options.keyTypeChange
39810
39850
  }, {
39811
39851
  default: withCtx(() => [
@@ -39831,7 +39871,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39831
39871
  createVNode$1(_component_Input, {
39832
39872
  type: "text",
39833
39873
  modelValue: $data.paramData.val,
39834
- "onUpdate:modelValue": _cache[65] || (_cache[65] = ($event) => $data.paramData.val = $event)
39874
+ "onUpdate:modelValue": _cache[67] || (_cache[67] = ($event) => $data.paramData.val = $event)
39835
39875
  }, null, 8, ["modelValue"])
39836
39876
  ]),
39837
39877
  _: 1
@@ -39850,7 +39890,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
39850
39890
  createVNode$1(_component_Input, {
39851
39891
  type: "text",
39852
39892
  modelValue: $data.paramData.val,
39853
- "onUpdate:modelValue": _cache[66] || (_cache[66] = ($event) => $data.paramData.val = $event)
39893
+ "onUpdate:modelValue": _cache[68] || (_cache[68] = ($event) => $data.paramData.val = $event)
39854
39894
  }, {
39855
39895
  prepend: withCtx(() => [
39856
39896
  createVNode$1(_component_Button, {
@@ -41404,7 +41444,9 @@ const _sfc_main$r = {
41404
41444
  mixins: [mixin$1, mixinPage],
41405
41445
  components: { DialogSelect },
41406
41446
  data() {
41407
- return {};
41447
+ return {
41448
+ data: {}
41449
+ };
41408
41450
  },
41409
41451
  async created() {
41410
41452
  this.init();
@@ -41413,7 +41455,7 @@ const _sfc_main$r = {
41413
41455
  tableView: {
41414
41456
  type: Object
41415
41457
  },
41416
- data: {
41458
+ filter: {
41417
41459
  type: Object
41418
41460
  },
41419
41461
  columns: {
@@ -41429,6 +41471,10 @@ const _sfc_main$r = {
41429
41471
  methods: {
41430
41472
  init() {
41431
41473
  let data2 = this.data;
41474
+ if (this.filter) {
41475
+ lodash$1.exports.defaultsDeep(data2, this.filter);
41476
+ lodash$1.exports.assign(this.filter, data2);
41477
+ }
41432
41478
  this.columns.forEach((item) => {
41433
41479
  if (item.defaultValue) {
41434
41480
  if (item.defaultValue == "{today}") {
@@ -41452,6 +41498,7 @@ const _sfc_main$r = {
41452
41498
  } else if (item.dataType === "Boolean" && item.defaultValue.toUpperCase == "FALSE") {
41453
41499
  this.setFilterData(data2, item, false);
41454
41500
  } else {
41501
+ console.log("this.setFilterData", data2, item, item.defaultValue);
41455
41502
  this.setFilterData(data2, item, item.defaultValue);
41456
41503
  }
41457
41504
  }
@@ -41518,7 +41565,7 @@ const _sfc_main$r = {
41518
41565
  column.triggers = [];
41519
41566
  });
41520
41567
  this.columns.filter((column) => {
41521
- return !column.isStaticItem && !!(column.source || "").trim() && !!(column.param || "").trim() && !column.dataType.startsWith("Enum:");
41568
+ return !column.isStaticItem && !!(column.source || "").trim() && !!(column.param || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:"));
41522
41569
  }).forEach((column) => {
41523
41570
  let param = JSON.parse(column.param);
41524
41571
  for (let key in param) {
@@ -41589,6 +41636,7 @@ const _sfc_main$r = {
41589
41636
  }
41590
41637
  },
41591
41638
  onSelectDataChange(sender, selected) {
41639
+ console.log("onSelectDataChange", sender, selected);
41592
41640
  let code2;
41593
41641
  if (sender.code.endsWith("ID")) {
41594
41642
  code2 = sender.code.substr(0, sender.code.length - 2);
@@ -41635,7 +41683,7 @@ const _sfc_main$r = {
41635
41683
  });
41636
41684
  if (sender == null || sender.triggers !== []) {
41637
41685
  this.columns.forEach(function(column) {
41638
- if (!column.isStaticItem && !!(column.source || "").trim() && !column.dataType.startsWith("Enum:") && (sender == null || sender.triggers.some((item) => {
41686
+ if (!column.isStaticItem && !!(column.source || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:")) && (sender == null || sender.triggers.some((item) => {
41639
41687
  return item.id === column.id;
41640
41688
  }))) {
41641
41689
  column.needRefresh = true;
@@ -41816,18 +41864,18 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
41816
41864
  column.controlType === "Custom" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
41817
41865
  createCommentVNode("\r\n @slot \u81EA\u5B9A\u4E49\u5217\r\n @binding {object} filter \u6570\u636E\u5BF9\u8C61\r\n @binding {object} column \u5217\u5BF9\u8C61\r\n @binding {string} code \u5217\u4EE3\u7801\r\n "),
41818
41866
  renderSlot(_ctx.$slots, "column", {
41819
- filter: $props.data,
41867
+ filter: $data.data,
41820
41868
  column,
41821
41869
  code: column.code
41822
41870
  })
41823
41871
  ], 64)) : column.controlType === "Label" ? (openBlock(), createElementBlock("div", _hoisted_2$f, [
41824
- createElementVNode("div", null, toDisplayString$1(_ctx.showData($props.data, column)), 1)
41872
+ createElementVNode("div", null, toDisplayString$1(_ctx.showData($data.data, column)), 1)
41825
41873
  ])) : column.controlType === "TextInput" ? (openBlock(), createBlock(_component_Input, {
41826
41874
  key: 2,
41827
41875
  size: "small",
41828
41876
  type: "text",
41829
- "model-value": $options.parseFilterData($props.data, column),
41830
- "onUpdate:modelValue": ($event) => $options.setFilterData($props.data, column, $event),
41877
+ "model-value": $options.parseFilterData($data.data, column),
41878
+ "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
41831
41879
  onOnKeyup: _cache[0] || (_cache[0] = ($event) => $options.onKeyup($event)),
41832
41880
  style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
41833
41881
  placeholder: column.description
@@ -41836,16 +41884,16 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
41836
41884
  size: "small",
41837
41885
  type: "number",
41838
41886
  number: "",
41839
- "model-value": $options.parseFilterData($props.data, column),
41840
- "onUpdate:modelValue": ($event) => $options.setFilterData($props.data, column, $event),
41887
+ "model-value": $options.parseFilterData($data.data, column),
41888
+ "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
41841
41889
  onOnKeyup: _cache[1] || (_cache[1] = ($event) => $options.onKeyup($event)),
41842
41890
  style: normalizeStyle$1({ width: column.controlWidth == null ? "100px" : column.controlWidth + "px" }),
41843
41891
  placeholder: column.description
41844
41892
  }, null, 8, ["model-value", "onUpdate:modelValue", "style", "placeholder"])) : column.controlType === "Select" ? (openBlock(), createBlock(_component_Select, {
41845
41893
  key: 4,
41846
41894
  size: "small",
41847
- "model-value": $options.parseFilterData($props.data, column),
41848
- "onUpdate:modelValue": ($event) => $options.setFilterData($props.data, column, $event),
41895
+ "model-value": $options.parseFilterData($data.data, column),
41896
+ "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
41849
41897
  clearable: "",
41850
41898
  style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
41851
41899
  placeholder: column.description,
@@ -41853,7 +41901,7 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
41853
41901
  onOnChange: (selected) => $options.onSelectDataChange(column, selected)
41854
41902
  }, {
41855
41903
  default: withCtx(() => [
41856
- (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($props.data, column), (item) => {
41904
+ (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
41857
41905
  return openBlock(), createBlock(_component_Option, {
41858
41906
  key: item.id,
41859
41907
  value: item.id
@@ -41869,17 +41917,17 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
41869
41917
  }, 1032, ["model-value", "onUpdate:modelValue", "style", "placeholder", "onOnChange"])) : column.controlType === "MultiSelect" ? (openBlock(), createBlock(_component_Select, {
41870
41918
  key: 5,
41871
41919
  size: "small",
41872
- "model-value": $options.parseArrayFilterData($props.data, column),
41920
+ "model-value": $options.parseArrayFilterData($data.data, column),
41873
41921
  multiple: true,
41874
41922
  clearable: "",
41875
- "onUpdate:modelValue": ($event) => $options.setArrayFilterData($props.data, column, $event),
41923
+ "onUpdate:modelValue": ($event) => $options.setArrayFilterData($data.data, column, $event),
41876
41924
  style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
41877
41925
  placeholder: column.description,
41878
41926
  transfer: true,
41879
41927
  onOnChange: (selected) => $options.onSelectDataChange(column, selected)
41880
41928
  }, {
41881
41929
  default: withCtx(() => [
41882
- (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($props.data, column), (item) => {
41930
+ (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
41883
41931
  return openBlock(), createBlock(_component_Option, {
41884
41932
  key: item.id,
41885
41933
  value: item.id
@@ -41895,9 +41943,9 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
41895
41943
  }, 1032, ["model-value", "onUpdate:modelValue", "style", "placeholder", "onOnChange"])) : column.controlType === "TreeSelect" ? (openBlock(), createBlock(_component_TreeSelect, {
41896
41944
  key: 6,
41897
41945
  size: "small",
41898
- "model-value": $options.parseTreeFilterData($props.data, column),
41899
- "onUpdate:modelValue": ($event) => $options.setFilterData($props.data, column, $event),
41900
- data: $options.getDataSource($props.data, column),
41946
+ "model-value": $options.parseTreeFilterData($data.data, column),
41947
+ "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
41948
+ data: $options.getDataSource($data.data, column),
41901
41949
  clearable: true,
41902
41950
  style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
41903
41951
  placeholder: column.description,
@@ -41906,9 +41954,9 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
41906
41954
  }, null, 8, ["model-value", "onUpdate:modelValue", "data", "style", "placeholder", "onOnChange"])) : column.controlType === "MultiTreeSelect" ? (openBlock(), createBlock(_component_TreeSelect, {
41907
41955
  key: 7,
41908
41956
  size: "small",
41909
- "model-value": $options.parseArrayFilterData($props.data, column),
41910
- "onUpdate:modelValue": ($event) => $options.setArrayFilterData($props.data, column, $event),
41911
- data: $options.getDataSource($props.data, column),
41957
+ "model-value": $options.parseArrayFilterData($data.data, column),
41958
+ "onUpdate:modelValue": ($event) => $options.setArrayFilterData($data.data, column, $event),
41959
+ data: $options.getDataSource($data.data, column),
41912
41960
  multiple: true,
41913
41961
  "show-checkbox": true,
41914
41962
  clearable: true,
@@ -41919,8 +41967,8 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
41919
41967
  }, null, 8, ["model-value", "onUpdate:modelValue", "data", "style", "placeholder", "onOnChange"])) : column.controlType === "SelectWithOther" ? (openBlock(), createElementBlock(Fragment, { key: 8 }, [
41920
41968
  createVNode$1(_component_Select, {
41921
41969
  size: "small",
41922
- "model-value": $options.parseFilterDataWithOther($props.data, column),
41923
- "onUpdate:modelValue": ($event) => $options.setFilterDataWithOther($props.data, column, $event),
41970
+ "model-value": $options.parseFilterDataWithOther($data.data, column),
41971
+ "onUpdate:modelValue": ($event) => $options.setFilterDataWithOther($data.data, column, $event),
41924
41972
  clearable: "",
41925
41973
  style: normalizeStyle$1({ width: column.controlWidth == null ? "40%" : column.controlWidth + "px" }),
41926
41974
  placeholder: column.description,
@@ -41928,7 +41976,7 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
41928
41976
  onOnChange: (selected) => $options.onSelectDataChange(column, selected)
41929
41977
  }, {
41930
41978
  default: withCtx(() => [
41931
- (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($props.data, column), (item) => {
41979
+ (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
41932
41980
  return openBlock(), createBlock(_component_Option, {
41933
41981
  key: item.id,
41934
41982
  value: item.id
@@ -41954,20 +42002,20 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
41954
42002
  withDirectives(createVNode$1(_component_Input, {
41955
42003
  type: "text",
41956
42004
  size: "small",
41957
- "model-value": $options.parseFilterData($props.data, column),
41958
- "onUpdate:modelValue": ($event) => $options.setFilterData($props.data, column, $event),
42005
+ "model-value": $options.parseFilterData($data.data, column),
42006
+ "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
41959
42007
  style: normalizeStyle$1([{ width: column.controlWidth == null ? "40%" : column.controlWidth + "px" }, { "margin-left": "4px" }]),
41960
42008
  maxlength: column.maxLength,
41961
42009
  placeholder: column.description,
41962
42010
  onOnChange: ($event) => $options.onDataChange(column)
41963
42011
  }, null, 8, ["model-value", "onUpdate:modelValue", "style", "maxlength", "placeholder", "onOnChange"]), [
41964
- [vShow, $options.parseFilterDataWithOther($props.data, column) == "__Other"]
42012
+ [vShow, $options.parseFilterDataWithOther($data.data, column) == "__Other"]
41965
42013
  ])
41966
42014
  ], 64)) : column.controlType === "ComboSelect" ? (openBlock(), createBlock(_component_Select, {
41967
42015
  key: 9,
41968
42016
  size: "small",
41969
- "model-value": $options.parseFilterData($props.data, column),
41970
- "onUpdate:modelValue": ($event) => $options.setFilterData($props.data, column, $event),
42017
+ "model-value": $options.parseFilterData($data.data, column),
42018
+ "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
41971
42019
  clearable: "",
41972
42020
  filterable: "",
41973
42021
  style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
@@ -41976,7 +42024,7 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
41976
42024
  onOnChange: (selected) => $options.onSelectDataChange(column, selected)
41977
42025
  }, {
41978
42026
  default: withCtx(() => [
41979
- (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($props.data, column), (item) => {
42027
+ (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
41980
42028
  return openBlock(), createBlock(_component_Option, {
41981
42029
  key: item.id,
41982
42030
  value: item.id
@@ -41992,32 +42040,32 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
41992
42040
  }, 1032, ["model-value", "onUpdate:modelValue", "style", "placeholder", "onOnChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
41993
42041
  key: 10,
41994
42042
  size: "small",
41995
- "model-value": $options.parseFilterData($props.data, column),
41996
- "onUpdate:modelValue": ($event) => $options.setFilterData($props.data, column, $event),
42043
+ "model-value": $options.parseFilterData($data.data, column),
42044
+ "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
41997
42045
  source: column.source,
41998
42046
  "source-data-code": column.sourceDataCode,
41999
42047
  "source-display-code": column.sourceDisplayCode,
42000
- param: _ctx.getParam($props.data, column),
42048
+ param: _ctx.getParam($data.data, column),
42001
42049
  controlWidth: column.controlWidth,
42002
42050
  onOnChange: (selected) => $options.onSelectDataChange(column, selected)
42003
42051
  }, null, 8, ["model-value", "onUpdate:modelValue", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : column.controlType === "Date" || column.controlType === "DateTime" || column.controlType === "Year" || column.controlType === "Month" || column.controlType === "DateRange" ? (openBlock(), createBlock(_component_DatePicker, {
42004
42052
  key: 11,
42005
42053
  size: "small",
42006
42054
  type: column.controlType.toLowerCase(),
42007
- "model-value": $options.parseFilterData($props.data, column),
42055
+ "model-value": $options.parseFilterData($data.data, column),
42008
42056
  placeholder: column.description,
42009
42057
  transfer: true,
42010
42058
  style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
42011
42059
  onOnChange: (time2) => {
42012
- $options.setFilterData($props.data, column, time2);
42060
+ $options.setFilterData($data.data, column, time2);
42013
42061
  $options.onDataChange(column);
42014
42062
  }
42015
42063
  }, null, 8, ["type", "model-value", "placeholder", "style", "onOnChange"])) : column.controlType === "Time" ? (openBlock(), createBlock(_component_TimePicker, {
42016
42064
  key: 12,
42017
42065
  size: "small",
42018
42066
  type: "time",
42019
- "model-value": $options.parseFilterData($props.data, column),
42020
- "onUpdate:modelValue": ($event) => $options.setFilterData($props.data, column, $event),
42067
+ "model-value": $options.parseFilterData($data.data, column),
42068
+ "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
42021
42069
  placeholder: column.description,
42022
42070
  transfer: true,
42023
42071
  style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
@@ -42026,26 +42074,26 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
42026
42074
  key: 13,
42027
42075
  size: "small",
42028
42076
  style: { "line-height": "26px" },
42029
- "model-value": !!$options.parseFilterData($props.data, column),
42030
- "onUpdate:modelValue": ($event) => $options.setFilterData($props.data, column, $event),
42077
+ "model-value": !!$options.parseFilterData($data.data, column),
42078
+ "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
42031
42079
  onOnChange: ($event) => $options.onDataChange(column)
42032
42080
  }, null, 8, ["model-value", "onUpdate:modelValue", "onOnChange"])) : column.controlType === "Switch" ? (openBlock(), createElementBlock("div", _hoisted_3$d, [
42033
42081
  createVNode$1(_component_Switch, {
42034
42082
  size: "small",
42035
- "model-value": !!$options.parseFilterData($props.data, column),
42036
- "onUpdate:modelValue": ($event) => $options.setFilterData($props.data, column, $event),
42083
+ "model-value": !!$options.parseFilterData($data.data, column),
42084
+ "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
42037
42085
  onOnChange: ($event) => $options.onDataChange(column)
42038
42086
  }, null, 8, ["model-value", "onUpdate:modelValue", "onOnChange"])
42039
42087
  ])) : column.controlType === "Radio" ? (openBlock(), createBlock(_component_RadioGroup, {
42040
42088
  key: 15,
42041
42089
  size: "small",
42042
42090
  style: { "line-height": "22px" },
42043
- "model-value": $options.parseFilterData($props.data, column),
42044
- "onUpdate:modelValue": ($event) => $options.setFilterData($props.data, column, $event),
42091
+ "model-value": $options.parseFilterData($data.data, column),
42092
+ "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
42045
42093
  onOnChange: (selected) => $options.onSelectDataChange(column, selected)
42046
42094
  }, {
42047
42095
  default: withCtx(() => [
42048
- (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($props.data, column), (item) => {
42096
+ (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
42049
42097
  return openBlock(), createBlock(_component_Radio, {
42050
42098
  key: item.id,
42051
42099
  label: item.id
@@ -42076,8 +42124,8 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
42076
42124
  }, {
42077
42125
  default: withCtx(() => [
42078
42126
  withDirectives(createVNode$1(_component_Input, {
42079
- modelValue: $props.data.keyword,
42080
- "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => $props.data.keyword = $event),
42127
+ modelValue: $data.data.keyword,
42128
+ "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => $data.data.keyword = $event),
42081
42129
  onOnKeyup: _cache[3] || (_cache[3] = ($event) => $options.onKeyup($event)),
42082
42130
  size: "small"
42083
42131
  }, null, 8, ["modelValue"]), [
@@ -42307,6 +42355,9 @@ const _sfc_main$q = {
42307
42355
  } else {
42308
42356
  return this.height;
42309
42357
  }
42358
+ },
42359
+ filterData() {
42360
+ return this.$refs.tableFilter.data;
42310
42361
  }
42311
42362
  },
42312
42363
  watch: {},
@@ -42344,6 +42395,7 @@ const _sfc_main$q = {
42344
42395
  });
42345
42396
  this.columns.forEach((column) => {
42346
42397
  column.name = this.getNameI18n(column);
42398
+ column.fixed = column.isFixed ? "left" : null;
42347
42399
  });
42348
42400
  if (this.tableView.snEnable) {
42349
42401
  this.columns.unshift({
@@ -42701,8 +42753,8 @@ const _sfc_main$q = {
42701
42753
  return data2;
42702
42754
  },
42703
42755
  resetFilter() {
42704
- for (let key in this.filter) {
42705
- delete this.filter[key];
42756
+ for (let key in this.filterData) {
42757
+ delete this.filterData[key];
42706
42758
  }
42707
42759
  },
42708
42760
  search() {
@@ -42843,7 +42895,7 @@ const _sfc_main$q = {
42843
42895
  }
42844
42896
  });
42845
42897
  } else {
42846
- if (!!(column.source || "").trim() && !column.dataType.startsWith("Enum:")) {
42898
+ if (!!(column.source || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:"))) {
42847
42899
  this.data.forEach((row) => {
42848
42900
  if (row._dataSource && row._dataSource[column.code]) {
42849
42901
  return;
@@ -42863,7 +42915,7 @@ const _sfc_main$q = {
42863
42915
  column.triggers = [];
42864
42916
  });
42865
42917
  this.columns.filter((column) => {
42866
- return !column.isStaticItem && !!(column.source || "").trim() && !!(column.param || "").trim() && !column.dataType.startsWith("Enum:");
42918
+ return !column.isStaticItem && !!(column.source || "").trim() && !!(column.param || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:"));
42867
42919
  }).forEach((column) => {
42868
42920
  let param = JSON.parse(column.param);
42869
42921
  for (let key in param) {
@@ -42997,7 +43049,7 @@ const _sfc_main$q = {
42997
43049
  this.$emit("on-change", data2, sender, selected);
42998
43050
  if (sender == null || sender.triggers !== []) {
42999
43051
  this.columns.forEach(function(column) {
43000
- if (!column.isStaticItem && !!(column.source || "").trim() && !column.dataType.startsWith("Enum:") && (sender == null || sender.triggers.some((item) => {
43052
+ if (!column.isStaticItem && !!(column.source || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:")) && (sender == null || sender.triggers.some((item) => {
43001
43053
  return item.code == column.code;
43002
43054
  }))) {
43003
43055
  if (data2._needRefresh) {
@@ -43018,7 +43070,7 @@ const _sfc_main$q = {
43018
43070
  column.triggers.forEach((item) => {
43019
43071
  data2._needClear[item.code] = true;
43020
43072
  });
43021
- } else if (data2._needRefresh[column.code] && !!(column.source || "").trim() && !column.dataType.startsWith("Enum:")) {
43073
+ } else if (data2._needRefresh[column.code] && !!(column.source || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:"))) {
43022
43074
  let param = this.getParam(data2, column, this.parentData);
43023
43075
  if (column.controlType === "Select" || column.controlType === "SelectWithOther" || column.controlType === "ComboSelect" || column.controlType === "MulitSelect" || column.controlType === "Radio" || column.controlType === "CheckGroup") {
43024
43076
  if (param != null) {
@@ -43104,9 +43156,10 @@ const _sfc_main$q = {
43104
43156
  this.search();
43105
43157
  },
43106
43158
  getAllFilter() {
43159
+ console.log("getAllFilter");
43107
43160
  let filter2 = {
43108
43161
  ...this.viewFilter,
43109
- ...this.filter
43162
+ ...this.filterData
43110
43163
  };
43111
43164
  for (let key in filter2) {
43112
43165
  if (typeof filter2[key] == "object" && !(filter2[key] instanceof Date)) {
@@ -43118,7 +43171,7 @@ const _sfc_main$q = {
43118
43171
  getFilterResult() {
43119
43172
  let data2 = this.staticData;
43120
43173
  if (!this.filterDisable) {
43121
- let filter2 = this.filter;
43174
+ let filter2 = this.filterData;
43122
43175
  for (let key in filter2) {
43123
43176
  let column = key;
43124
43177
  let value = filter2[key];
@@ -43490,7 +43543,7 @@ const _sfc_main$q = {
43490
43543
  };
43491
43544
  const _hoisted_1$g = { class: "title" };
43492
43545
  const _hoisted_2$e = { ref: "filterCommand" };
43493
- const _hoisted_3$c = ["innerHTML"];
43546
+ const _hoisted_3$c = ["title", "innerHTML"];
43494
43547
  const _hoisted_4$5 = ["href", "target"];
43495
43548
  const _hoisted_5$4 = ["innerHTML"];
43496
43549
  const _hoisted_6$3 = {
@@ -43572,29 +43625,25 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
43572
43625
  }, {
43573
43626
  default: withCtx(() => [
43574
43627
  createCommentVNode("\r\n @slot \u7B5B\u9009\u680F\r\n @binding {object} table \u8868\u683C\u5BF9\u8C61\r\n @binding {object} filter \u7B5B\u9009\u5BF9\u8C61\r\n "),
43575
- renderSlot(_ctx.$slots, "filter", {
43576
- table: this,
43577
- filter: $props.filter
43578
- }, () => [
43628
+ renderSlot(_ctx.$slots, "filter", { table: this }, () => [
43579
43629
  createCommentVNode("\r\n @slot \u81EA\u5B9A\u4E49\u7B5B\u9009\u680F\r\n "),
43580
43630
  renderSlot(_ctx.$slots, "customFilter", {}, void 0, true),
43581
43631
  createVNode$1(_component_table_filter, {
43582
43632
  ref: "tableFilter",
43583
- data: $props.filter,
43633
+ filter: $props.filter,
43584
43634
  columns: $data.filterColumns,
43585
43635
  "table-view": $data.tableView,
43586
43636
  onOnKeyup: $options.onKeyup
43587
43637
  }, {
43588
- column: withCtx(({ filter: filter2, column }) => [
43638
+ column: withCtx(({ column }) => [
43589
43639
  createCommentVNode("\r\n @slot \u7B5B\u9009\u680F\u81EA\u5B9A\u4E49\u5217\r\n @binding {object} filter \u7B5B\u9009\u6761\u4EF6\u5BF9\u8C61\r\n @binding {object} column \u5217\u5BF9\u8C61\r\n @binding {string} code \u5217\u4EE3\u7801\r\n "),
43590
43640
  renderSlot(_ctx.$slots, "filterColumn", {
43591
- filter: filter2,
43592
43641
  column,
43593
43642
  code: column.code
43594
43643
  }, void 0, true)
43595
43644
  ]),
43596
43645
  _: 3
43597
- }, 8, ["data", "columns", "table-view", "onOnKeyup"]),
43646
+ }, 8, ["filter", "columns", "table-view", "onOnKeyup"]),
43598
43647
  createVNode$1(_component_Col, mergeProps(_ctx.getGrid($data.tableView.filterWidth), {
43599
43648
  style: { "text-align": $data.tableView.filterAlign == null ? "left" : $data.tableView.filterAlign.toLowerCase() }
43600
43649
  }), {
@@ -43760,8 +43809,10 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
43760
43809
  }, void 0, true)
43761
43810
  ], 64)) : column.controlType === "Label" ? (openBlock(), createElementBlock("div", {
43762
43811
  key: 1,
43812
+ title: column.isSingleLine ? _ctx.showData($options.rowData(row, index2), column) : null,
43813
+ class: normalizeClass({ "single-line": column.isSingleLine }),
43763
43814
  innerHTML: _ctx.showData($options.rowData(row, index2), column)
43764
- }, null, 8, _hoisted_3$c)) : column.controlType === "Hyperlink" ? (openBlock(), createElementBlock("a", {
43815
+ }, null, 10, _hoisted_3$c)) : column.controlType === "Hyperlink" ? (openBlock(), createElementBlock("a", {
43765
43816
  key: 2,
43766
43817
  href: _ctx.getHyperlink($options.rowData(row, index2), column.hyperlink),
43767
43818
  target: column.isNewWindow ? "_blank" : ""
@@ -51134,7 +51185,7 @@ const _sfc_main$o = {
51134
51185
  column.triggers = [];
51135
51186
  });
51136
51187
  this.columns.filter((column) => {
51137
- return !!(column.source || "").trim() && !!(column.param || "").trim() && !column.dataType.startsWith("Enum:");
51188
+ return !!(column.source || "").trim() && !!(column.param || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:"));
51138
51189
  }).forEach((column) => {
51139
51190
  let param = JSON.parse(column.param);
51140
51191
  for (let key in param) {
@@ -51223,7 +51274,7 @@ const _sfc_main$o = {
51223
51274
  async onDataChange(sender) {
51224
51275
  if (sender == null || sender.triggers !== []) {
51225
51276
  this.columns.forEach(function(column) {
51226
- if (!!(column.source || "").trim() && !column.dataType.startsWith("Enum:") && (sender == null || sender.triggers.some((item) => {
51277
+ if (!!(column.source || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:")) && (sender == null || sender.triggers.some((item) => {
51227
51278
  return item.id === column.id;
51228
51279
  }))) {
51229
51280
  column.needRefresh = true;
@@ -51242,7 +51293,7 @@ const _sfc_main$o = {
51242
51293
  column.triggers.forEach((item) => {
51243
51294
  item.needClear = true;
51244
51295
  });
51245
- } else if (column.needRefresh && !!(column.source || "").trim() && !column.dataType.startsWith("Enum:")) {
51296
+ } else if (column.needRefresh && !!(column.source || "").trim() && !(column.dataType && column.dataType.startsWith("Enum:"))) {
51246
51297
  let param = this.getParam(this.data, column);
51247
51298
  if (column.controlType === "Select" || column.controlType === "MultiSelect" || column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect" || column.controlType === "SelectWithOther" || column.controlType === "ComboSelect" || column.controlType === "Radio" || column.controlType === "CheckGroup") {
51248
51299
  if (param != null) {
@@ -52899,6 +52950,9 @@ const _sfc_main$l = {
52899
52950
  table() {
52900
52951
  return this.$refs.table;
52901
52952
  },
52953
+ filterData() {
52954
+ return this.$refs.tableFilter.data;
52955
+ },
52902
52956
  screenWidth() {
52903
52957
  return document.body.clientWidth * 0.8;
52904
52958
  }