resolver-egretimp-plus 0.0.46 → 0.0.48

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 (32) hide show
  1. package/dist/h5/index.js +1 -1
  2. package/dist/theme/element/index.css +1 -1
  3. package/dist/theme/element/src/components/collapse.scss +98 -10
  4. package/dist/theme/element/src/components/common.scss +12 -0
  5. package/dist/theme/element/src/components/dialog.scss +42 -0
  6. package/dist/theme/element/src/components/index.scss +1 -0
  7. package/dist/theme/element/src/components/tabs.scss +10 -0
  8. package/dist/theme/element/src/index.scss +0 -63
  9. package/dist/web/index.js +1 -1
  10. package/package.json +1 -1
  11. package/scripts/webpack.config.js +3 -1
  12. package/src/components/childDialog/src/index.vue +25 -18
  13. package/src/components/helper/eventOrchestration.js +7 -1
  14. package/src/components/helper/resolver.js +2 -2
  15. package/src/components/packages-web/CustomComponentCol.vue +0 -1
  16. package/src/components/packages-web/CustomComponentCollapse.vue +2 -70
  17. package/src/components/packages-web/CustomComponentRow.vue +1 -3
  18. package/src/components/packages-web/CustomComponentTable.jsx +1 -1
  19. package/src/components/packages-web/ElCheckbox.vue +26 -5
  20. package/src/components/styles/CustomComponenTable.scss +1 -1
  21. package/src/resolver-H5.vue +23 -1
  22. package/src/resolver-common.vue +24 -2
  23. package/src/resolver-web.vue +23 -1
  24. package/src/theme/element/components/collapse.scss +98 -10
  25. package/src/theme/element/components/common.scss +12 -0
  26. package/src/theme/element/components/dialog.scss +42 -0
  27. package/src/theme/element/components/index.scss +1 -0
  28. package/src/theme/element/components/tabs.scss +10 -0
  29. package/src/theme/element/index.scss +0 -63
  30. package/src/utils/const.js +5 -1
  31. package/src/utils/render.jsx +2 -2
  32. package/src/utils/respone.js +10 -4
package/src/theme/element/index.scss CHANGED
@@ -14,66 +14,3 @@
14
14
  }
15
15
  }
16
16
 
17
- .CustomComponentCollapse:first-child {
18
- margin-bottom: 12px;
19
- }
20
- .CustomComponentCollapse + .CustomComponentCollapse {
21
- margin-bottom: 12px;
22
- }
23
-
24
- .CustomComponentCollapse.is-card:first-child {
25
- margin-bottom: 16px;
26
- }
27
- .CustomComponentCollapse.is-card + .CustomComponentCollapse.is-card {
28
- margin-bottom: 16px;
29
- }
30
-
31
- // 加权
32
- .CustomComponentCollapse.CustomComponentCollapse.CustomComponentCollapse:last-child {
33
- margin-bottom: 0;
34
- }
35
- .el-collapse-item__arrow {
36
- margin-right: 0;
37
- }
38
-
39
- // 组件弹框样式定义调整
40
- .custom-component-dialog {
41
- padding-top: 0px;
42
- padding-bottom: 0;
43
-
44
- .el-dialog__header {
45
- display: none;
46
- }
47
- .el-dialog__body {
48
- height: 100%;
49
- .header {
50
- line-height: 46px;
51
- font-size: 14px;
52
- font-weight: 500;
53
- color: #1F2329;
54
- }
55
- .content {
56
- height: 100%;
57
- box-sizing: border-box;
58
- // .el-scrollbar__wrap {
59
- // overflow-x: hidden;
60
- // }
61
- // .is-horizontal {
62
- // display: none;
63
- // }
64
- }
65
- .footer {
66
- height: 68px;
67
- text-align: right;
68
- overflow: hidden;
69
- .dialog-footer {
70
- margin-top: 16px;
71
- }
72
- }
73
- }
74
- &.el-dialog footer {
75
- position: initial;
76
- transform: none;
77
- padding: 0;
78
- }
79
- }
package/src/utils/const.js CHANGED
@@ -164,7 +164,11 @@ export const commonPropsType = {
164
164
  }
165
165
 
166
166
  export function calcDisable(config, mode) {
167
- const flag = isPatchComponent(['CustomComponentTabs', 'CustomComponentTabPane'], config) ?
167
+ const specicesType = [
168
+ 'CustomComponentTabs',
169
+ // 'CustomComponentTabPane' // 有需要需根据配置来进行配置是否禁用
170
+ ]
171
+ const flag = isPatchComponent(specicesType, config) ?
168
172
  false :
169
173
  mode === MODE.LOG ?
170
174
  (
package/src/utils/render.jsx CHANGED
@@ -195,9 +195,9 @@ export function normalConfig({
195
195
  }
196
196
  const pageConfig = {
197
197
  ...extendObj,
198
- ...extendAttrObj,
199
198
  ...config,
200
- ...extendNativeObj
199
+ ...extendAttrObj,
200
+ ...extendNativeObj,
201
201
  }
202
202
  if (config.metaType == 'textarea') {
203
203
  pageConfig.type = 'textarea'
package/src/utils/respone.js CHANGED
@@ -40,21 +40,27 @@ export function resultToast(result = {}, messageInstance, {messageCb, service, c
40
40
  cbKey = 'error'
41
41
  break;
42
42
  }
43
-
43
+ // transactionType
44
44
  if (messageCb) {
45
45
  if (isPromise(messageCb)) {
46
46
  messageCb({resultMessage, result, resultCode, service, compConfig}).then(res => {
47
47
  if (res === true) {
48
- messageInstance?.[cbKey]?.(resultMessage)
48
+ if (service?.transactionType === '2') {
49
+ messageInstance?.[cbKey]?.(resultMessage)
50
+ }
49
51
  }
50
52
  })
51
53
  } else {
52
54
  if (messageCb({resultMessage, result, resultCode, service, compConfig}) === true) {
53
- messageInstance?.[cbKey]?.(resultMessage)
55
+ if (service?.transactionType === '2') {
56
+ messageInstance?.[cbKey]?.(resultMessage)
57
+ }
54
58
  }
55
59
  }
56
60
  } else {
57
- messageInstance?.[cbKey]?.(resultMessage)
61
+ if (service?.transactionType === '2') {
62
+ messageInstance?.[cbKey]?.(resultMessage)
63
+ }
58
64
  }
59
65
  return ret
60
66
  }