@zat-design/sisyphus-react 3.9.0-beta.4 → 3.9.0-beta.6

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 (59) hide show
  1. package/coverage/lcov-report/src/.umi/core/devScripts.ts.html +241 -0
  2. package/coverage/lcov-report/src/.umi/core/history.ts.html +148 -0
  3. package/coverage/lcov-report/src/.umi/core/index.html +206 -0
  4. package/coverage/lcov-report/src/.umi/core/plugin.ts.html +109 -0
  5. package/coverage/lcov-report/src/.umi/core/pluginRegister.ts.html +160 -0
  6. package/coverage/lcov-report/src/.umi/core/polyfill.ts.html +97 -0
  7. package/coverage/lcov-report/src/.umi/core/routes.ts.html +26050 -0
  8. package/coverage/lcov-report/src/.umi/core/umiExports.ts.html +112 -0
  9. package/coverage/lcov-report/src/.umi/dumi/demos/index.html +116 -0
  10. package/coverage/lcov-report/src/.umi/dumi/demos/index.ts.html +6340 -0
  11. package/coverage/lcov-report/src/.umi/dumi/index.html +116 -0
  12. package/coverage/lcov-report/src/.umi/dumi/layout.tsx.html +109 -0
  13. package/coverage/lcov-report/src/.umi/index.html +116 -0
  14. package/coverage/lcov-report/src/.umi/plugin-antd/index.html +116 -0
  15. package/coverage/lcov-report/src/.umi/plugin-antd/runtime.tsx.html +172 -0
  16. package/coverage/lcov-report/src/.umi/plugin-helmet/exports.ts.html +94 -0
  17. package/coverage/lcov-report/src/.umi/plugin-helmet/index.html +116 -0
  18. package/coverage/lcov-report/src/.umi/plugin-initial-state/Provider.tsx.html +196 -0
  19. package/coverage/lcov-report/src/.umi/plugin-initial-state/exports.ts.html +106 -0
  20. package/coverage/lcov-report/src/.umi/plugin-initial-state/index.html +146 -0
  21. package/coverage/lcov-report/src/.umi/plugin-initial-state/models/index.html +116 -0
  22. package/coverage/lcov-report/src/.umi/plugin-initial-state/models/initialState.ts.html +88 -0
  23. package/coverage/lcov-report/src/.umi/plugin-initial-state/runtime.tsx.html +124 -0
  24. package/coverage/lcov-report/src/.umi/plugin-locale/SelectLang.tsx.html +1246 -0
  25. package/coverage/lcov-report/src/.umi/plugin-locale/index.html +161 -0
  26. package/coverage/lcov-report/src/.umi/plugin-locale/locale.tsx.html +268 -0
  27. package/coverage/lcov-report/src/.umi/plugin-locale/localeExports.ts.html +778 -0
  28. package/coverage/lcov-report/src/.umi/plugin-locale/runtime.tsx.html +115 -0
  29. package/coverage/lcov-report/src/.umi/plugin-model/Provider.tsx.html +202 -0
  30. package/coverage/lcov-report/src/.umi/plugin-model/helpers/constant.tsx.html +97 -0
  31. package/coverage/lcov-report/src/.umi/plugin-model/helpers/dispatcher.tsx.html +142 -0
  32. package/coverage/lcov-report/src/.umi/plugin-model/helpers/executor.tsx.html +334 -0
  33. package/coverage/lcov-report/src/.umi/plugin-model/helpers/index.html +146 -0
  34. package/coverage/lcov-report/src/.umi/plugin-model/index.html +146 -0
  35. package/coverage/lcov-report/src/.umi/plugin-model/runtime.tsx.html +121 -0
  36. package/coverage/lcov-report/src/.umi/plugin-model/useModel.tsx.html +298 -0
  37. package/coverage/lcov-report/src/.umi/plugin-request/index.html +116 -0
  38. package/coverage/lcov-report/src/.umi/plugin-request/request.ts.html +919 -0
  39. package/coverage/lcov-report/src/.umi/umi.ts.html +268 -0
  40. package/dist/index.esm.css +10 -0
  41. package/dist/less.esm.css +10 -0
  42. package/es/ProForm/components/combination/Group/index.js +4 -3
  43. package/es/ProForm/components/render/ChangedWrapper.js +0 -1
  44. package/es/ProTable/components/FormatColumn/index.js +34 -25
  45. package/es/ProTable/components/RenderColumn/index.d.ts +1 -0
  46. package/es/ProTable/components/RenderColumn/index.js +5 -3
  47. package/es/ProTable/propsType.d.ts +1 -0
  48. package/es/ProTable/style/index.less +10 -1
  49. package/es/ProTree/components/ProTreeSelect/index.js +32 -13
  50. package/lib/ProForm/components/combination/Group/index.js +4 -3
  51. package/lib/ProForm/components/render/ChangedWrapper.js +0 -1
  52. package/lib/ProTable/components/FormatColumn/index.js +34 -25
  53. package/lib/ProTable/components/RenderColumn/index.d.ts +1 -0
  54. package/lib/ProTable/components/RenderColumn/index.js +5 -3
  55. package/lib/ProTable/propsType.d.ts +1 -0
  56. package/lib/ProTable/style/index.less +10 -1
  57. package/lib/ProTree/components/ProTreeSelect/index.js +31 -12
  58. package/package.json +1 -1
  59. package/.vscode/extensions.json +0 -5
@@ -0,0 +1,268 @@
1
+
2
+ <!doctype html>
3
+ <html lang="en">
4
+
5
+ <head>
6
+ <title>Code coverage report for src/.umi/umi.ts</title>
7
+ <meta charset="utf-8" />
8
+ <link rel="stylesheet" href="../../prettify.css" />
9
+ <link rel="stylesheet" href="../../base.css" />
10
+ <link rel="shortcut icon" type="image/x-icon" href="../../favicon.png" />
11
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
12
+ <style type='text/css'>
13
+ .coverage-summary .sorter {
14
+ background-image: url(../../sort-arrow-sprite.png);
15
+ }
16
+ </style>
17
+ </head>
18
+
19
+ <body>
20
+ <div class='wrapper'>
21
+ <div class='pad1'>
22
+ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/.umi</a> umi.ts</h1>
23
+ <div class='clearfix'>
24
+
25
+ <div class='fl pad1y space-right2'>
26
+ <span class="strong">0% </span>
27
+ <span class="quiet">Statements</span>
28
+ <span class='fraction'>0/14</span>
29
+ </div>
30
+
31
+
32
+ <div class='fl pad1y space-right2'>
33
+ <span class="strong">0% </span>
34
+ <span class="quiet">Branches</span>
35
+ <span class='fraction'>0/7</span>
36
+ </div>
37
+
38
+
39
+ <div class='fl pad1y space-right2'>
40
+ <span class="strong">0% </span>
41
+ <span class="quiet">Functions</span>
42
+ <span class='fraction'>0/4</span>
43
+ </div>
44
+
45
+
46
+ <div class='fl pad1y space-right2'>
47
+ <span class="strong">0% </span>
48
+ <span class="quiet">Lines</span>
49
+ <span class='fraction'>0/13</span>
50
+ </div>
51
+
52
+
53
+ </div>
54
+ <p class="quiet">
55
+ Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
56
+ </p>
57
+ <template id="filterTemplate">
58
+ <div class="quiet">
59
+ Filter:
60
+ <input oninput="onInput()" type="search" id="fileSearch">
61
+ </div>
62
+ </template>
63
+ </div>
64
+ <div class='status-line low'></div>
65
+ <pre><table class="coverage">
66
+ <tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
67
+ <a name='L2'></a><a href='#L2'>2</a>
68
+ <a name='L3'></a><a href='#L3'>3</a>
69
+ <a name='L4'></a><a href='#L4'>4</a>
70
+ <a name='L5'></a><a href='#L5'>5</a>
71
+ <a name='L6'></a><a href='#L6'>6</a>
72
+ <a name='L7'></a><a href='#L7'>7</a>
73
+ <a name='L8'></a><a href='#L8'>8</a>
74
+ <a name='L9'></a><a href='#L9'>9</a>
75
+ <a name='L10'></a><a href='#L10'>10</a>
76
+ <a name='L11'></a><a href='#L11'>11</a>
77
+ <a name='L12'></a><a href='#L12'>12</a>
78
+ <a name='L13'></a><a href='#L13'>13</a>
79
+ <a name='L14'></a><a href='#L14'>14</a>
80
+ <a name='L15'></a><a href='#L15'>15</a>
81
+ <a name='L16'></a><a href='#L16'>16</a>
82
+ <a name='L17'></a><a href='#L17'>17</a>
83
+ <a name='L18'></a><a href='#L18'>18</a>
84
+ <a name='L19'></a><a href='#L19'>19</a>
85
+ <a name='L20'></a><a href='#L20'>20</a>
86
+ <a name='L21'></a><a href='#L21'>21</a>
87
+ <a name='L22'></a><a href='#L22'>22</a>
88
+ <a name='L23'></a><a href='#L23'>23</a>
89
+ <a name='L24'></a><a href='#L24'>24</a>
90
+ <a name='L25'></a><a href='#L25'>25</a>
91
+ <a name='L26'></a><a href='#L26'>26</a>
92
+ <a name='L27'></a><a href='#L27'>27</a>
93
+ <a name='L28'></a><a href='#L28'>28</a>
94
+ <a name='L29'></a><a href='#L29'>29</a>
95
+ <a name='L30'></a><a href='#L30'>30</a>
96
+ <a name='L31'></a><a href='#L31'>31</a>
97
+ <a name='L32'></a><a href='#L32'>32</a>
98
+ <a name='L33'></a><a href='#L33'>33</a>
99
+ <a name='L34'></a><a href='#L34'>34</a>
100
+ <a name='L35'></a><a href='#L35'>35</a>
101
+ <a name='L36'></a><a href='#L36'>36</a>
102
+ <a name='L37'></a><a href='#L37'>37</a>
103
+ <a name='L38'></a><a href='#L38'>38</a>
104
+ <a name='L39'></a><a href='#L39'>39</a>
105
+ <a name='L40'></a><a href='#L40'>40</a>
106
+ <a name='L41'></a><a href='#L41'>41</a>
107
+ <a name='L42'></a><a href='#L42'>42</a>
108
+ <a name='L43'></a><a href='#L43'>43</a>
109
+ <a name='L44'></a><a href='#L44'>44</a>
110
+ <a name='L45'></a><a href='#L45'>45</a>
111
+ <a name='L46'></a><a href='#L46'>46</a>
112
+ <a name='L47'></a><a href='#L47'>47</a>
113
+ <a name='L48'></a><a href='#L48'>48</a>
114
+ <a name='L49'></a><a href='#L49'>49</a>
115
+ <a name='L50'></a><a href='#L50'>50</a>
116
+ <a name='L51'></a><a href='#L51'>51</a>
117
+ <a name='L52'></a><a href='#L52'>52</a>
118
+ <a name='L53'></a><a href='#L53'>53</a>
119
+ <a name='L54'></a><a href='#L54'>54</a>
120
+ <a name='L55'></a><a href='#L55'>55</a>
121
+ <a name='L56'></a><a href='#L56'>56</a>
122
+ <a name='L57'></a><a href='#L57'>57</a>
123
+ <a name='L58'></a><a href='#L58'>58</a>
124
+ <a name='L59'></a><a href='#L59'>59</a>
125
+ <a name='L60'></a><a href='#L60'>60</a>
126
+ <a name='L61'></a><a href='#L61'>61</a>
127
+ <a name='L62'></a><a href='#L62'>62</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
128
+ <span class="cline-any cline-neutral">&nbsp;</span>
129
+ <span class="cline-any cline-neutral">&nbsp;</span>
130
+ <span class="cline-any cline-neutral">&nbsp;</span>
131
+ <span class="cline-any cline-neutral">&nbsp;</span>
132
+ <span class="cline-any cline-neutral">&nbsp;</span>
133
+ <span class="cline-any cline-neutral">&nbsp;</span>
134
+ <span class="cline-any cline-neutral">&nbsp;</span>
135
+ <span class="cline-any cline-neutral">&nbsp;</span>
136
+ <span class="cline-any cline-neutral">&nbsp;</span>
137
+ <span class="cline-any cline-neutral">&nbsp;</span>
138
+ <span class="cline-any cline-neutral">&nbsp;</span>
139
+ <span class="cline-any cline-neutral">&nbsp;</span>
140
+ <span class="cline-any cline-no">&nbsp;</span>
141
+ <span class="cline-any cline-neutral">&nbsp;</span>
142
+ <span class="cline-any cline-no">&nbsp;</span>
143
+ <span class="cline-any cline-neutral">&nbsp;</span>
144
+ <span class="cline-any cline-neutral">&nbsp;</span>
145
+ <span class="cline-any cline-neutral">&nbsp;</span>
146
+ <span class="cline-any cline-no">&nbsp;</span>
147
+ <span class="cline-any cline-neutral">&nbsp;</span>
148
+ <span class="cline-any cline-neutral">&nbsp;</span>
149
+ <span class="cline-any cline-neutral">&nbsp;</span>
150
+ <span class="cline-any cline-neutral">&nbsp;</span>
151
+ <span class="cline-any cline-neutral">&nbsp;</span>
152
+ <span class="cline-any cline-neutral">&nbsp;</span>
153
+ <span class="cline-any cline-neutral">&nbsp;</span>
154
+ <span class="cline-any cline-neutral">&nbsp;</span>
155
+ <span class="cline-any cline-neutral">&nbsp;</span>
156
+ <span class="cline-any cline-neutral">&nbsp;</span>
157
+ <span class="cline-any cline-neutral">&nbsp;</span>
158
+ <span class="cline-any cline-neutral">&nbsp;</span>
159
+ <span class="cline-any cline-no">&nbsp;</span>
160
+ <span class="cline-any cline-neutral">&nbsp;</span>
161
+ <span class="cline-any cline-neutral">&nbsp;</span>
162
+ <span class="cline-any cline-neutral">&nbsp;</span>
163
+ <span class="cline-any cline-neutral">&nbsp;</span>
164
+ <span class="cline-any cline-no">&nbsp;</span>
165
+ <span class="cline-any cline-neutral">&nbsp;</span>
166
+ <span class="cline-any cline-neutral">&nbsp;</span>
167
+ <span class="cline-any cline-neutral">&nbsp;</span>
168
+ <span class="cline-any cline-no">&nbsp;</span>
169
+ <span class="cline-any cline-neutral">&nbsp;</span>
170
+ <span class="cline-any cline-neutral">&nbsp;</span>
171
+ <span class="cline-any cline-neutral">&nbsp;</span>
172
+ <span class="cline-any cline-neutral">&nbsp;</span>
173
+ <span class="cline-any cline-neutral">&nbsp;</span>
174
+ <span class="cline-any cline-neutral">&nbsp;</span>
175
+ <span class="cline-any cline-no">&nbsp;</span>
176
+ <span class="cline-any cline-neutral">&nbsp;</span>
177
+ <span class="cline-any cline-no">&nbsp;</span>
178
+ <span class="cline-any cline-no">&nbsp;</span>
179
+ <span class="cline-any cline-no">&nbsp;</span>
180
+ <span class="cline-any cline-no">&nbsp;</span>
181
+ <span class="cline-any cline-no">&nbsp;</span>
182
+ <span class="cline-any cline-neutral">&nbsp;</span>
183
+ <span class="cline-any cline-neutral">&nbsp;</span>
184
+ <span class="cline-any cline-no">&nbsp;</span>
185
+ <span class="cline-any cline-neutral">&nbsp;</span>
186
+ <span class="cline-any cline-neutral">&nbsp;</span>
187
+ <span class="cline-any cline-neutral">&nbsp;</span>
188
+ <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">// @ts-nocheck
189
+ import './core/polyfill';
190
+ import '@@/core/devScripts';
191
+ import { plugin } from './core/plugin';
192
+ import './core/pluginRegister';
193
+ import { createHistory } from './core/history';
194
+ import { ApplyPluginsType } from '/Users/zakj/Desktop/pro/za-material-warehouse/node_modules/@umijs/runtime';
195
+ import { renderClient } from '/Users/zakj/Desktop/pro/za-material-warehouse/node_modules/@umijs/renderer-react/dist/index.js';
196
+ import { getRoutes } from './core/routes';
197
+ &nbsp;
198
+ &nbsp;
199
+ import '../global.less';
200
+ import { _onCreate } from './plugin-locale/locale';
201
+ <span class="cstat-no" title="statement not covered" >_onCreate();</span>
202
+ &nbsp;
203
+ const getClientRender = <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >(a</span>rgs: { hot?: boolean; routes?: any[] } = <span class="branch-0 cbranch-no" title="branch not covered" >{})</span> =&gt; <span class="cstat-no" title="statement not covered" >plugin.applyPlugins({</span></span>
204
+ key: 'render',
205
+ type: ApplyPluginsType.compose,
206
+ initialValue: <span class="fstat-no" title="function not covered" >()</span> =&gt; {
207
+ const opts = <span class="cstat-no" title="statement not covered" >plugin.applyPlugins({</span>
208
+ key: 'modifyClientRenderOpts',
209
+ type: ApplyPluginsType.modify,
210
+ initialValue: {
211
+ routes: args.routes || getRoutes(),
212
+ plugin,
213
+ history: createHistory(args.hot),
214
+ isServer: process.env.__IS_SERVER,
215
+ dynamicImport: true,
216
+ rootElement: 'root',
217
+ defaultTitle: `sisyphus(3.4.3-beta.6)`,
218
+ },
219
+ });
220
+ <span class="cstat-no" title="statement not covered" > return renderClient(opts);</span>
221
+ },
222
+ args,
223
+ });
224
+ &nbsp;
225
+ const clientRender = <span class="cstat-no" title="statement not covered" >getClientRender();</span>
226
+ export default clientRender();
227
+ &nbsp;
228
+ &nbsp;
229
+ <span class="cstat-no" title="statement not covered" > window.g_umi = {</span>
230
+ version: '3.5.41',
231
+ };
232
+
233
+ &nbsp;
234
+ // hot module replacement
235
+ // @ts-ignore
236
+ <span class="cstat-no" title="statement not covered" >if (module.hot) {</span>
237
+ // @ts-ignore
238
+ <span class="cstat-no" title="statement not covered" > module.hot.accept('./core/routes', <span class="fstat-no" title="function not covered" >()</span> =&gt; {</span>
239
+ const ret = <span class="cstat-no" title="statement not covered" >require('./core/routes');</span>
240
+ <span class="cstat-no" title="statement not covered" > if (ret.then) {</span>
241
+ <span class="cstat-no" title="statement not covered" > ret.then(<span class="fstat-no" title="function not covered" >({</span> getRoutes }) =&gt; {</span>
242
+ <span class="cstat-no" title="statement not covered" > getClientRender({ hot: true, routes: getRoutes() })();</span>
243
+ });
244
+ } else {
245
+ <span class="cstat-no" title="statement not covered" > getClientRender({ hot: true, routes: ret.getRoutes() })();</span>
246
+ }
247
+ });
248
+ }
249
+ &nbsp;</pre></td></tr></table></pre>
250
+
251
+ <div class='push'></div><!-- for sticky footer -->
252
+ </div><!-- /wrapper -->
253
+ <div class='footer quiet pad2 space-top1 center small'>
254
+ Code coverage generated by
255
+ <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
256
+ at 2024-01-24T02:49:50.075Z
257
+ </div>
258
+ <script src="../../prettify.js"></script>
259
+ <script>
260
+ window.onload = function () {
261
+ prettyPrint();
262
+ };
263
+ </script>
264
+ <script src="../../sorter.js"></script>
265
+ <script src="../../block-navigation.js"></script>
266
+ </body>
267
+ </html>
268
+
@@ -1908,6 +1908,16 @@
1908
1908
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1909
1909
  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1910
1910
  }
1911
+ .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right {
1912
+ background: var(--zaui-contract-bg-add, #d2fff4) !important;
1913
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1914
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1915
+ }
1916
+ .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left {
1917
+ background: var(--zaui-contract-bg-add, #d2fff4) !important;
1918
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1919
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1920
+ }
1911
1921
  .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell {
1912
1922
  margin-left: -8px;
1913
1923
  padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
package/dist/less.esm.css CHANGED
@@ -1908,6 +1908,16 @@
1908
1908
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1909
1909
  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1910
1910
  }
1911
+ .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right {
1912
+ background: var(--zaui-contract-bg-add, #d2fff4) !important;
1913
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1914
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1915
+ }
1916
+ .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left {
1917
+ background: var(--zaui-contract-bg-add, #d2fff4) !important;
1918
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1919
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1920
+ }
1911
1921
  .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell {
1912
1922
  margin-left: -8px;
1913
1923
  padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
@@ -26,7 +26,8 @@ var Group = function Group(props) {
26
26
  value = props.value,
27
27
  onChange = props.onChange,
28
28
  otherProps = props.otherProps,
29
- id = props.id;
29
+ id = props.id,
30
+ isParentView = props.isView;
30
31
  var contextProps = ProForm.useFieldProps() || {};
31
32
  var names = contextProps.names,
32
33
  name = contextProps.name,
@@ -71,7 +72,7 @@ var Group = function Group(props) {
71
72
  children: columns.map(function (column, index) {
72
73
  return _jsx(ComRender, _objectSpread(_objectSpread({
73
74
  contextProps: contextProps,
74
- isView: isView
75
+ isView: isParentView || isView
75
76
  }, column), {}, {
76
77
  otherProps: otherProps
77
78
  }), column.name);
@@ -82,7 +83,7 @@ var Group = function Group(props) {
82
83
  children: columns.map(function (column, index) {
83
84
  return _jsx(ComRender, _objectSpread(_objectSpread({
84
85
  contextProps: contextProps,
85
- isView: isView
86
+ isView: isParentView || isView
86
87
  }, column), {}, {
87
88
  otherProps: otherProps
88
89
  }), column.name);
@@ -29,7 +29,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
29
29
  getValueProps = props.getValueProps,
30
30
  viewRender = props.viewRender,
31
31
  rest = _objectWithoutProperties(props, _excluded);
32
- // const contentRef = useRef(null);
33
32
  var _useProConfig = useProConfig('ProForm'),
34
33
  isDiffAll = _useProConfig.isDiffAll;
35
34
  var originalValues = diffConfig.originalValues,
@@ -1,6 +1,8 @@
1
1
  import "antd/es/space/style";
2
2
  import _Space from "antd/es/space";
3
3
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
+ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
5
+ var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "originalDiffTip", "toolTipProps", "minWidth", "onDiff"];
4
6
  import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
5
7
  import { isValidElement } from 'react';
6
8
  import moment from 'moment';
@@ -11,6 +13,7 @@ import { tools } from '@zat-design/utils';
11
13
  import TooltipTitle from '../TooltipTitle';
12
14
  import RenderColumn from '../RenderColumn';
13
15
  import { getDecimalDigits, getOriginalValue } from '../../utils';
16
+ import { isEmpty } from '../../../utils';
14
17
  import getEnumLabel from '../../../ProEnum/utils/getEnumLabel';
15
18
  import ProForm from '../../../ProForm';
16
19
  var isReactElement = function isReactElement(element) {
@@ -73,7 +76,8 @@ export var formatColumn = function formatColumn(_ref2) {
73
76
  _column$toolTipProps = column.toolTipProps,
74
77
  toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
75
78
  minWidth = column.minWidth,
76
- onDiff = column.onDiff;
79
+ onDiff = column.onDiff,
80
+ otherProps = _objectWithoutProperties(column, _excluded);
77
81
  // 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
78
82
  var isMaxContentOverFlow = isObject(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
79
83
  calcMinWidth({
@@ -136,9 +140,14 @@ export var formatColumn = function formatColumn(_ref2) {
136
140
  extraDiffFlag = true;
137
141
  }
138
142
  }
139
- return _jsx(RenderColumn, {
143
+ // 存在比对
144
+ if (originalObj && isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
145
+ var _originalObj$record$r2;
146
+ otherProps.viewRender = otherProps.viewRender(originalValue, (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {}, index);
147
+ }
148
+ return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
140
149
  valueType: valueType,
141
- originalValue: !originalValue && originalValue !== 0 ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
150
+ originalValue: isEmpty(originalValue) ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
142
151
  ellipsis: ellipsis,
143
152
  width: width,
144
153
  value: _value,
@@ -148,7 +157,7 @@ export var formatColumn = function formatColumn(_ref2) {
148
157
  toolTipProps: _toolTipProps,
149
158
  minWidth: minWidth,
150
159
  isInNewRowFlag: isInNewRowFlag
151
- });
160
+ }));
152
161
  };
153
162
  return;
154
163
  }
@@ -174,7 +183,7 @@ export var formatColumn = function formatColumn(_ref2) {
174
183
  var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
175
184
  var originalRealValue = tools.calc(Number(originalValue || null), '*', multiple);
176
185
  var originalRenderValue = getDecimalDigits(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
177
- if (!originalValue && originalValue !== 0) {
186
+ if (isEmpty(originalValue)) {
178
187
  originalRenderValue = '-';
179
188
  }
180
189
  if (!value && value !== 0 && renderValue === originalRenderValue) {
@@ -190,7 +199,7 @@ export var formatColumn = function formatColumn(_ref2) {
190
199
  children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
191
200
  });
192
201
  var isInNewRowFlag = isInNewRow(record);
193
- return _jsx(RenderColumn, {
202
+ return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
194
203
  valueType: valueType,
195
204
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
196
205
  ellipsis: ellipsis,
@@ -202,7 +211,7 @@ export var formatColumn = function formatColumn(_ref2) {
202
211
  toolTipProps: _toolTipProps,
203
212
  minWidth: minWidth,
204
213
  isInNewRowFlag: isInNewRowFlag
205
- });
214
+ }));
206
215
  };
207
216
  // 千分位, 千分位带CNY前缀
208
217
  } else if (['thousandth', 'thousandthCNY'].includes(valueType)) {
@@ -212,7 +221,7 @@ export var formatColumn = function formatColumn(_ref2) {
212
221
  var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
213
222
  var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
214
223
  var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
215
- if (!originalValue && originalValue !== 0) {
224
+ if (isEmpty(originalValue)) {
216
225
  originalRenderValue = '-';
217
226
  }
218
227
  var node = _jsxs(_Space, {
@@ -228,7 +237,7 @@ export var formatColumn = function formatColumn(_ref2) {
228
237
  });
229
238
  }
230
239
  var isInNewRowFlag = isInNewRow(record);
231
- return _jsx(RenderColumn, {
240
+ return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
232
241
  valueType: valueType,
233
242
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
234
243
  ellipsis: ellipsis,
@@ -240,7 +249,7 @@ export var formatColumn = function formatColumn(_ref2) {
240
249
  toolTipProps: _toolTipProps,
241
250
  minWidth: minWidth,
242
251
  isInNewRowFlag: isInNewRowFlag
243
- });
252
+ }));
244
253
  };
245
254
  } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
246
255
  column.render = function (value, record, index) {
@@ -289,7 +298,7 @@ export var formatColumn = function formatColumn(_ref2) {
289
298
  });
290
299
  }
291
300
  var isInNewRowFlag = isInNewRow(record);
292
- return _jsx(RenderColumn, {
301
+ return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
293
302
  valueType: valueType,
294
303
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
295
304
  ellipsis: ellipsis,
@@ -301,7 +310,7 @@ export var formatColumn = function formatColumn(_ref2) {
301
310
  toolTipProps: _toolTipProps,
302
311
  minWidth: minWidth,
303
312
  isInNewRowFlag: isInNewRowFlag
304
- });
313
+ }));
305
314
  };
306
315
  } else if (['enumName', 'enumCodeName'].includes(valueType)) {
307
316
  column.render = function (value, record, index) {
@@ -330,7 +339,7 @@ export var formatColumn = function formatColumn(_ref2) {
330
339
  children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
331
340
  });
332
341
  var isInNewRowFlag = isInNewRow(record);
333
- return _jsx(RenderColumn, {
342
+ return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
334
343
  valueType: valueType,
335
344
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
336
345
  ellipsis: ellipsis,
@@ -342,7 +351,7 @@ export var formatColumn = function formatColumn(_ref2) {
342
351
  toolTipProps: _toolTipProps,
343
352
  minWidth: minWidth,
344
353
  isInNewRowFlag: isInNewRowFlag
345
- });
354
+ }));
346
355
  };
347
356
  } else if (precision || prefix || suffix) {
348
357
  column.render = function (value, record, index) {
@@ -353,7 +362,7 @@ export var formatColumn = function formatColumn(_ref2) {
353
362
  size: 8,
354
363
  children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
355
364
  });
356
- if (!originalValue && originalValue !== 0) {
365
+ if (isEmpty(originalValue)) {
357
366
  originalRenderValue = '-';
358
367
  }
359
368
  if (!value && value !== 0 && renderValue === originalRenderValue) {
@@ -365,7 +374,7 @@ export var formatColumn = function formatColumn(_ref2) {
365
374
  });
366
375
  }
367
376
  var isInNewRowFlag = isInNewRow(record);
368
- return _jsx(RenderColumn, {
377
+ return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
369
378
  valueType: valueType,
370
379
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
371
380
  ellipsis: ellipsis,
@@ -377,7 +386,7 @@ export var formatColumn = function formatColumn(_ref2) {
377
386
  toolTipProps: _toolTipProps,
378
387
  minWidth: minWidth,
379
388
  isInNewRowFlag: isInNewRowFlag
380
- });
389
+ }));
381
390
  };
382
391
  } else if (valueType === 'address') {
383
392
  column.render = function (value, record, index) {
@@ -420,7 +429,7 @@ export var formatColumn = function formatColumn(_ref2) {
420
429
  tooltip: false
421
430
  });
422
431
  var isInNewRowFlag = isInNewRow(record);
423
- return _jsx(RenderColumn, {
432
+ return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
424
433
  valueType: valueType,
425
434
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
426
435
  ellipsis: ellipsis,
@@ -432,14 +441,14 @@ export var formatColumn = function formatColumn(_ref2) {
432
441
  toolTipProps: _toolTipProps,
433
442
  minWidth: minWidth,
434
443
  isInNewRowFlag: isInNewRowFlag
435
- });
444
+ }));
436
445
  };
437
446
  } else if (copyable) {
438
447
  column.render = function (value, record, index) {
439
448
  var isInNewRowFlag = isInNewRow(record);
440
449
  return _jsxs(_Space, {
441
450
  size: 8,
442
- children: [prefixNode(value, record, index), _jsx(RenderColumn, {
451
+ children: [prefixNode(value, record, index), _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
443
452
  valueType: valueType,
444
453
  copyable: copyable,
445
454
  ellipsis: ellipsis,
@@ -450,7 +459,7 @@ export var formatColumn = function formatColumn(_ref2) {
450
459
  toolTipProps: _toolTipProps,
451
460
  minWidth: minWidth,
452
461
  isInNewRowFlag: isInNewRowFlag
453
- }), suffixNode(value, record, index)]
462
+ })), suffixNode(value, record, index)]
454
463
  });
455
464
  };
456
465
  } else if (ellipsis) {
@@ -467,7 +476,7 @@ export var formatColumn = function formatColumn(_ref2) {
467
476
  var isInNewRowFlag = isInNewRow(record);
468
477
  return _jsxs(_Space, {
469
478
  size: 8,
470
- children: [prefixNode(value, record, index), _jsx(RenderColumn, {
479
+ children: [prefixNode(value, record, index), _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
471
480
  valueType: valueType,
472
481
  originalValue: originalValue === undefined ? undefined : originalValue || '-',
473
482
  ellipsis: ellipsis,
@@ -479,7 +488,7 @@ export var formatColumn = function formatColumn(_ref2) {
479
488
  toolTipProps: _toolTipProps,
480
489
  minWidth: minWidth,
481
490
  isInNewRowFlag: isInNewRowFlag
482
- }), suffixNode(value, record, index)]
491
+ })), suffixNode(value, record, index)]
483
492
  });
484
493
  };
485
494
  } else {
@@ -498,7 +507,7 @@ export var formatColumn = function formatColumn(_ref2) {
498
507
  });
499
508
  }
500
509
  var isInNewRowFlag = isInNewRow(record);
501
- return _jsx(RenderColumn, {
510
+ return _jsx(RenderColumn, _objectSpread(_objectSpread({}, otherProps), {}, {
502
511
  valueType: valueType,
503
512
  originalValue: originalValue === undefined ? undefined : originalValue || '-',
504
513
  ellipsis: ellipsis,
@@ -510,7 +519,7 @@ export var formatColumn = function formatColumn(_ref2) {
510
519
  toolTipProps: _toolTipProps,
511
520
  minWidth: minWidth,
512
521
  isInNewRowFlag: isInNewRowFlag
513
- });
522
+ }));
514
523
  };
515
524
  }
516
525
  };
@@ -13,6 +13,7 @@ interface Props {
13
13
  toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
14
14
  minWidth?: number;
15
15
  isInNewRowFlag?: boolean;
16
+ viewRender?: (value: any, record: any, index: number) => any;
16
17
  }
17
18
  declare const RenderColumn: FC<Props>;
18
19
  export default RenderColumn;
@@ -10,6 +10,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
10
10
  import { useSetState } from 'ahooks';
11
11
  import { CheckOutlined } from '@ant-design/icons';
12
12
  import { ReactSVG } from 'react-svg';
13
+ import { isEmpty } from '../../../utils';
13
14
  import copySvg from '../../../assets/copy.svg';
14
15
  var Paragraph = _Typography.Paragraph,
15
16
  Text = _Typography.Text;
@@ -27,14 +28,15 @@ var RenderColumn = function RenderColumn(props) {
27
28
  _props$toolTipProps = props.toolTipProps,
28
29
  toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
29
30
  minWidth = props.minWidth,
30
- isInNewRowFlag = props.isInNewRowFlag;
31
+ isInNewRowFlag = props.isInNewRowFlag,
32
+ viewRender = props.viewRender;
31
33
  var _useSetState = useSetState({
32
34
  tooltip: false
33
35
  }),
34
36
  _useSetState2 = _slicedToArray(_useSetState, 2),
35
37
  tooltip = _useSetState2[0].tooltip,
36
38
  setState = _useSetState2[1];
37
- if ((originalValue || originalValue === 0) && !isInNewRowFlag) {
39
+ if (!isEmpty(originalValue) && !isInNewRowFlag) {
38
40
  var renderNode = value ? node : '-';
39
41
  if (ellipsis || originalDiffTip) {
40
42
  renderNode = _jsx(Text, {
@@ -63,7 +65,7 @@ var RenderColumn = function RenderColumn(props) {
63
65
  children: [_jsxs(_Space, {
64
66
  align: "start",
65
67
  className: "original-value-container",
66
- children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
68
+ children: ["\u521D\u59CB\u503C\uFF1A", viewRender || originalValue]
67
69
  }), _jsx(_Space, {
68
70
  className: "current-value-container",
69
71
  children: ellipsis ? _jsxs(_Space, {
@@ -45,6 +45,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
45
45
  value: any;
46
46
  originValue: any;
47
47
  }) => boolean;
48
+ viewRender?: (value: any, record: any, index: number) => any;
48
49
  }
49
50
  export interface CreateTreeFromArrayOptions {
50
51
  itemKey?: string;
@@ -261,11 +261,20 @@
261
261
  tr.@{ant-prefix}-table-row.new-cell {
262
262
  background: var(--zaui-contract-bg-add; #d2fff4) !important;
263
263
  background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
264
-
265
264
  td.@{ant-prefix}-table-cell {
266
265
  background: var(--zaui-contract-bg-add; #d2fff4) !important;
267
266
  background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
268
267
  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
268
+ &.@{ant-prefix}-table-cell-fix-right {
269
+ background: var(--zaui-contract-bg-add; #d2fff4) !important;
270
+ background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
271
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
272
+ }
273
+ &.@{ant-prefix}-table-cell-fix-left {
274
+ background: var(--zaui-contract-bg-add; #d2fff4) !important;
275
+ background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
276
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
277
+ }
269
278
  }
270
279
  }
271
280