npm - @zat-design/sisyphus-react - Versions diffs - 3.7.0 → 3.7.1-beta.1 - Mend

@zat-design/sisyphus-react 3.7.0 → 3.7.1-beta.1

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 (76) hide show

package/coverage/lcov-report/src/.umi/umi.ts.html ADDED Viewed

@@ -0,0 +1,268 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <title>Code coverage report for src/.umi/umi.ts</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="../../prettify.css" />
+    <link rel="stylesheet" href="../../base.css" />
+    <link rel="shortcut icon" type="image/x-icon" href="../../favicon.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <style type='text/css'>
+        .coverage-summary .sorter {
+            background-image: url(../../sort-arrow-sprite.png);
+        }
+    </style>
+</head>
+<body>
+<div class='wrapper'>
+    <div class='pad1'>
+        <h1><a href="../../index.html">All files</a> / <a href="index.html">src/.umi</a> umi.ts</h1>
+        <div class='clearfix'>
+            <div class='fl pad1y space-right2'>
+                <span class="strong">0% </span>
+                <span class="quiet">Statements</span>
+                <span class='fraction'>0/14</span>
+            </div>
+            <div class='fl pad1y space-right2'>
+                <span class="strong">0% </span>
+                <span class="quiet">Branches</span>
+                <span class='fraction'>0/7</span>
+            </div>
+            <div class='fl pad1y space-right2'>
+                <span class="strong">0% </span>
+                <span class="quiet">Functions</span>
+                <span class='fraction'>0/4</span>
+            </div>
+            <div class='fl pad1y space-right2'>
+                <span class="strong">0% </span>
+                <span class="quiet">Lines</span>
+                <span class='fraction'>0/13</span>
+            </div>
+        </div>
+        <p class="quiet">
+            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.
+        </p>
+        <template id="filterTemplate">
+            <div class="quiet">
+                Filter:
+                <input oninput="onInput()" type="search" id="fileSearch">
+            </div>
+        </template>
+    </div>
+    <div class='status-line low'></div>
+    <pre><table class="coverage">
+<tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
+<a name='L2'></a><a href='#L2'>2</a>
+<a name='L3'></a><a href='#L3'>3</a>
+<a name='L4'></a><a href='#L4'>4</a>
+<a name='L5'></a><a href='#L5'>5</a>
+<a name='L6'></a><a href='#L6'>6</a>
+<a name='L7'></a><a href='#L7'>7</a>
+<a name='L8'></a><a href='#L8'>8</a>
+<a name='L9'></a><a href='#L9'>9</a>
+<a name='L10'></a><a href='#L10'>10</a>
+<a name='L11'></a><a href='#L11'>11</a>
+<a name='L12'></a><a href='#L12'>12</a>
+<a name='L13'></a><a href='#L13'>13</a>
+<a name='L14'></a><a href='#L14'>14</a>
+<a name='L15'></a><a href='#L15'>15</a>
+<a name='L16'></a><a href='#L16'>16</a>
+<a name='L17'></a><a href='#L17'>17</a>
+<a name='L18'></a><a href='#L18'>18</a>
+<a name='L19'></a><a href='#L19'>19</a>
+<a name='L20'></a><a href='#L20'>20</a>
+<a name='L21'></a><a href='#L21'>21</a>
+<a name='L22'></a><a href='#L22'>22</a>
+<a name='L23'></a><a href='#L23'>23</a>
+<a name='L24'></a><a href='#L24'>24</a>
+<a name='L25'></a><a href='#L25'>25</a>
+<a name='L26'></a><a href='#L26'>26</a>
+<a name='L27'></a><a href='#L27'>27</a>
+<a name='L28'></a><a href='#L28'>28</a>
+<a name='L29'></a><a href='#L29'>29</a>
+<a name='L30'></a><a href='#L30'>30</a>
+<a name='L31'></a><a href='#L31'>31</a>
+<a name='L32'></a><a href='#L32'>32</a>
+<a name='L33'></a><a href='#L33'>33</a>
+<a name='L34'></a><a href='#L34'>34</a>
+<a name='L35'></a><a href='#L35'>35</a>
+<a name='L36'></a><a href='#L36'>36</a>
+<a name='L37'></a><a href='#L37'>37</a>
+<a name='L38'></a><a href='#L38'>38</a>
+<a name='L39'></a><a href='#L39'>39</a>
+<a name='L40'></a><a href='#L40'>40</a>
+<a name='L41'></a><a href='#L41'>41</a>
+<a name='L42'></a><a href='#L42'>42</a>
+<a name='L43'></a><a href='#L43'>43</a>
+<a name='L44'></a><a href='#L44'>44</a>
+<a name='L45'></a><a href='#L45'>45</a>
+<a name='L46'></a><a href='#L46'>46</a>
+<a name='L47'></a><a href='#L47'>47</a>
+<a name='L48'></a><a href='#L48'>48</a>
+<a name='L49'></a><a href='#L49'>49</a>
+<a name='L50'></a><a href='#L50'>50</a>
+<a name='L51'></a><a href='#L51'>51</a>
+<a name='L52'></a><a href='#L52'>52</a>
+<a name='L53'></a><a href='#L53'>53</a>
+<a name='L54'></a><a href='#L54'>54</a>
+<a name='L55'></a><a href='#L55'>55</a>
+<a name='L56'></a><a href='#L56'>56</a>
+<a name='L57'></a><a href='#L57'>57</a>
+<a name='L58'></a><a href='#L58'>58</a>
+<a name='L59'></a><a href='#L59'>59</a>
+<a name='L60'></a><a href='#L60'>60</a>
+<a name='L61'></a><a href='#L61'>61</a>
+<a name='L62'></a><a href='#L62'>62</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">// @ts-nocheck
+import './core/polyfill';
+import '@@/core/devScripts';
+import { plugin } from './core/plugin';
+import './core/pluginRegister';
+import { createHistory } from './core/history';
+import { ApplyPluginsType } from '/Users/zakj/Desktop/pro/za-material-warehouse/node_modules/@umijs/runtime';
+import { renderClient } from '/Users/zakj/Desktop/pro/za-material-warehouse/node_modules/@umijs/renderer-react/dist/index.js';
+import { getRoutes } from './core/routes';
+&nbsp;
+&nbsp;
+import '../global.less';
+import { _onCreate } from './plugin-locale/locale';
+<span class="cstat-no" title="statement not covered" >_onCreate();</span>
+&nbsp;
+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>
+  key: 'render',
+  type: ApplyPluginsType.compose,
+  initialValue: <span class="fstat-no" title="function not covered" >()</span> =&gt; {
+    const opts = <span class="cstat-no" title="statement not covered" >plugin.applyPlugins({</span>
+      key: 'modifyClientRenderOpts',
+      type: ApplyPluginsType.modify,
+      initialValue: {
+        routes: args.routes || getRoutes(),
+        plugin,
+        history: createHistory(args.hot),
+        isServer: process.env.__IS_SERVER,
+        dynamicImport: true,
+        rootElement: 'root',
+        defaultTitle: `sisyphus(3.4.3-beta.6)`,
+      },
+    });
+<span class="cstat-no" title="statement not covered" >    return renderClient(opts);</span>
+  },
+  args,
+});
+&nbsp;
+const clientRender = <span class="cstat-no" title="statement not covered" >getClientRender();</span>
+export default clientRender();
+&nbsp;
+&nbsp;
+<span class="cstat-no" title="statement not covered" >    window.g_umi = {</span>
+      version: '3.5.41',
+    };
+&nbsp;
+// hot module replacement
+// @ts-ignore
+<span class="cstat-no" title="statement not covered" >if (module.hot) {</span>
+  // @ts-ignore
+<span class="cstat-no" title="statement not covered" >  module.hot.accept('./core/routes', <span class="fstat-no" title="function not covered" >()</span> =&gt; {</span>
+    const ret = <span class="cstat-no" title="statement not covered" >require('./core/routes');</span>
+<span class="cstat-no" title="statement not covered" >    if (ret.then) {</span>
+<span class="cstat-no" title="statement not covered" >      ret.then(<span class="fstat-no" title="function not covered" >({</span> getRoutes }) =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >        getClientRender({ hot: true, routes: getRoutes() })();</span>
+      });
+    } else {
+<span class="cstat-no" title="statement not covered" >      getClientRender({ hot: true, routes: ret.getRoutes() })();</span>
+    }
+  });
+}
+&nbsp;</pre></td></tr></table></pre>
+                <div class='push'></div><!-- for sticky footer -->
+            </div><!-- /wrapper -->
+            <div class='footer quiet pad2 space-top1 center small'>
+                Code coverage generated by
+                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
+                at 2024-01-24T02:49:50.075Z
+            </div>
+        <script src="../../prettify.js"></script>
+        <script>
+            window.onload = function () {
+                prettyPrint();
+            };
+        </script>
+        <script src="../../sorter.js"></script>
+        <script src="../../block-navigation.js"></script>
+    </body>
+</html>

package/dist/index.esm.css CHANGED Viewed

@@ -1387,7 +1387,6 @@
   content: '';
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-item-selected {
-  padding-right: 16px;
   background: transparent !important;
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-item-selected::after {
@@ -2024,7 +2023,6 @@
   height: 100%;
 }
 .pro-table .ant-table .ant-table-thead > tr > th {
-  white-space: nowrap;
   background: var(--zaui-table-header-bg, #f2f3f5);
   border-bottom: 0;
 }
@@ -2477,6 +2475,32 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
+.pro-modal-select .ant-input-compact-item:not(.ant-input-compact-last-item):not(.ant-input-compact-item-rtl),
+.pro-tree-modal .ant-input-compact-item:not(.ant-input-compact-last-item):not(.ant-input-compact-item-rtl) {
+  margin-right: 0;
+}
+.pro-modal-select .ant-btn-compact-item.ant-btn.ant-btn-compact-last-item:not(.ant-btn-compact-first-item):not(.ant-btn-compact-item-rtl):hover,
+.pro-tree-modal .ant-btn-compact-item.ant-btn.ant-btn-compact-last-item:not(.ant-btn-compact-first-item):not(.ant-btn-compact-item-rtl):hover {
+  position: relative;
+  -webkit-transition: none;
+  transition: none;
+}
+.pro-modal-select .ant-btn-compact-item.ant-btn.ant-btn-compact-last-item:not(.ant-btn-compact-first-item):not(.ant-btn-compact-item-rtl):hover::before,
+.pro-tree-modal .ant-btn-compact-item.ant-btn.ant-btn-compact-last-item:not(.ant-btn-compact-first-item):not(.ant-btn-compact-item-rtl):hover::before {
+  opacity: 1;
+}
+.pro-modal-select .ant-btn-compact-item.ant-btn.ant-btn-compact-last-item:not(.ant-btn-compact-first-item):not(.ant-btn-compact-item-rtl)::before,
+.pro-tree-modal .ant-btn-compact-item.ant-btn.ant-btn-compact-last-item:not(.ant-btn-compact-first-item):not(.ant-btn-compact-item-rtl)::before {
+  content: '';
+  position: absolute;
+  top: -1px;
+  left: -1px;
+  width: 1px;
+  height: calc(100% + 2px);
+  background: var(--ant-primary-color-hover);
+  opacity: 0;
+  display: block;
+}
 .pro-modal-select .ant-input-group-wrapper-status-error:hover .ant-input,
 .pro-tree-modal .ant-input-group-wrapper-status-error:hover .ant-input,
 .pro-modal-select .ant-input-group-wrapper-status-error:hover .ant-input-group-addon,
@@ -2515,7 +2539,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-modal-select .ant-space-compact .ant-btn-compact-last-item,
 .pro-tree-modal .ant-space-compact .ant-btn-compact-last-item {
-  border-left: none;
+  border-left: none !important;
 }
 .pro-modal-select .ant-input-group-addon,
 .pro-tree-modal .ant-input-group-addon {
@@ -2538,6 +2562,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   color: var(--zaui-danger, #ff5050);
   border-color: var(--zaui-danger, #ff5050);
 }
+.ant-form-item-has-error .pro-modal-select .ant-btn-compact-last-item::before {
+  background: var(--zaui-danger, #ff5050) !important;
+}
 .pro-group {
   width: unset !important;
   display: -webkit-box;
@@ -4433,7 +4460,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-edit-table .ant-table-thead > tr > th {
   border: 0;
-  white-space: nowrap;
   background-color: var(--zaui-table-header-bg, #f2f3f5);
 }
 .pro-edit-table .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {

package/dist/less.esm.css CHANGED Viewed

@@ -1387,7 +1387,6 @@
   content: '';
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-item-selected {
-  padding-right: 16px;
   background: transparent !important;
 }
 .pro-layout.pro-layout-light .pro-layout-open-menu .ant-menu-item-selected::after {
@@ -2024,7 +2023,6 @@
   height: 100%;
 }
 .pro-table .ant-table .ant-table-thead > tr > th {
-  white-space: nowrap;
   background: var(--zaui-table-header-bg, #f2f3f5);
   border-bottom: 0;
 }
@@ -2477,6 +2475,32 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
+.pro-modal-select .ant-input-compact-item:not(.ant-input-compact-last-item):not(.ant-input-compact-item-rtl),
+.pro-tree-modal .ant-input-compact-item:not(.ant-input-compact-last-item):not(.ant-input-compact-item-rtl) {
+  margin-right: 0;
+}
+.pro-modal-select .ant-btn-compact-item.ant-btn.ant-btn-compact-last-item:not(.ant-btn-compact-first-item):not(.ant-btn-compact-item-rtl):hover,
+.pro-tree-modal .ant-btn-compact-item.ant-btn.ant-btn-compact-last-item:not(.ant-btn-compact-first-item):not(.ant-btn-compact-item-rtl):hover {
+  position: relative;
+  -webkit-transition: none;
+  transition: none;
+}
+.pro-modal-select .ant-btn-compact-item.ant-btn.ant-btn-compact-last-item:not(.ant-btn-compact-first-item):not(.ant-btn-compact-item-rtl):hover::before,
+.pro-tree-modal .ant-btn-compact-item.ant-btn.ant-btn-compact-last-item:not(.ant-btn-compact-first-item):not(.ant-btn-compact-item-rtl):hover::before {
+  opacity: 1;
+}
+.pro-modal-select .ant-btn-compact-item.ant-btn.ant-btn-compact-last-item:not(.ant-btn-compact-first-item):not(.ant-btn-compact-item-rtl)::before,
+.pro-tree-modal .ant-btn-compact-item.ant-btn.ant-btn-compact-last-item:not(.ant-btn-compact-first-item):not(.ant-btn-compact-item-rtl)::before {
+  content: '';
+  position: absolute;
+  top: -1px;
+  left: -1px;
+  width: 1px;
+  height: calc(100% + 2px);
+  background: var(--ant-primary-color-hover);
+  opacity: 0;
+  display: block;
+}
 .pro-modal-select .ant-input-group-wrapper-status-error:hover .ant-input,
 .pro-tree-modal .ant-input-group-wrapper-status-error:hover .ant-input,
 .pro-modal-select .ant-input-group-wrapper-status-error:hover .ant-input-group-addon,
@@ -2515,7 +2539,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-modal-select .ant-space-compact .ant-btn-compact-last-item,
 .pro-tree-modal .ant-space-compact .ant-btn-compact-last-item {
-  border-left: none;
+  border-left: none !important;
 }
 .pro-modal-select .ant-input-group-addon,
 .pro-tree-modal .ant-input-group-addon {
@@ -2538,6 +2562,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   color: var(--zaui-danger, #ff5050);
   border-color: var(--zaui-danger, #ff5050);
 }
+.ant-form-item-has-error .pro-modal-select .ant-btn-compact-last-item::before {
+  background: var(--zaui-danger, #ff5050) !important;
+}
 .pro-group {
   width: unset !important;
   display: -webkit-box;
@@ -4433,7 +4460,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-edit-table .ant-table-thead > tr > th {
   border: 0;
-  white-space: nowrap;
   background-color: var(--zaui-table-header-bg, #f2f3f5);
 }
 .pro-edit-table .ant-table-thead > tr > th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {

package/es/ProEditTable/style/index.less CHANGED Viewed

@@ -206,7 +206,6 @@
   .@{ant-prefix}-table-thead>tr>th {
     border          : 0;
-    white-space     : nowrap;
     background-color: var(--zaui-table-header-bg, #f2f3f5);
   }

package/es/ProEditTable/utils/index.js CHANGED Viewed

@@ -13,7 +13,7 @@ var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
   _excluded2 = ["title", "icon"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
-import { cloneDeep, cloneDeepWith, isArray, isBoolean, isEqual } from 'lodash';
+import { cloneDeepWith, isArray, isBoolean, isEqual } from 'lodash';
 import classnames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import { tools } from '@zat-design/utils';
@@ -284,7 +284,7 @@ export var transformColumns = function transformColumns() {
         if (!(_cacheMap === null || _cacheMap === void 0 ? void 0 : (_cacheMap$item$dataIn = _cacheMap[item.dataIndex]) === null || _cacheMap$item$dataIn === void 0 ? void 0 : (_cacheMap$item$dataIn2 = _cacheMap$item$dataIn.dataSource) === null || _cacheMap$item$dataIn2 === void 0 ? void 0 : _cacheMap$item$dataIn2.length)) {
           var _item$fieldProps, _item$fieldProps2;
           _cacheMap[item.dataIndex] = {
-            useRequest: cloneDeep((_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.useRequest),
+            useRequest: (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.useRequest,
             dataSource: [],
             transformResponse: (_item$fieldProps2 = item.fieldProps) === null || _item$fieldProps2 === void 0 ? void 0 : _item$fieldProps2.transformResponse
           };

package/es/ProEnum/hooks/useEnumRequest.js CHANGED Viewed

@@ -91,6 +91,9 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                 // 忽略清洗的 codes
                 ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
                 Object.keys(response).forEach(function (key) {
+                  if (!response[key] || !Array.isArray(response[key])) {
+                    return;
+                  }
                   var options = _toConsumableArray(response[key]) || [];
                   if (ignoreCodes.includes(key)) {
                     response[key] = options;

package/es/ProEnum/utils/index.js CHANGED Viewed

@@ -74,7 +74,7 @@ export function cacheFieldNames(fieldNames, dataSource) {
   });
   // 递归去对数据进行清洗
   if (children && Array.isArray(dataSource[children])) {
-    result[children] = dataSource[children].map(function (item) {
+    result.children = dataSource[children].map(function (item) {
       return cacheFieldNames(fieldNames, item);
     });
   }

package/es/ProForm/components/base/Select/index.js CHANGED Viewed

@@ -58,6 +58,7 @@ var Select = function Select(props) {
   }, initialConfig), {}, {
     options: dataSource
   }, rest), {}, {
+    value: rest.value === '' ? null : rest.value,
     fieldNames: _fieldNames
   }));
 };

package/es/ProForm/components/combination/ProModalSelect/index.js CHANGED Viewed

@@ -9,6 +9,7 @@ import _Spin from "antd/es/spin";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/message/style";
 import _message from "antd/es/message";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
@@ -24,7 +25,7 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { SearchOutlined } from '@ant-design/icons';
 import { useDeepCompareEffect, useMount, useSetState } from 'ahooks';
-import { cloneDeep, debounce, isArray, isEqual, isFunction, omit } from 'lodash';
+import { debounce, isArray, isEqual, isFunction, omit } from 'lodash';
 import { ReactSVG } from 'react-svg';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
 import { ProForm, ProDrawerForm, ProTable, useProConfig, ProSelect } from '../../../../index';
@@ -409,8 +410,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
     if (record === null || record === void 0 ? void 0 : record.disabled) return;
     var selectedValue = getRowKey(record);
-    var tempSelectedRows = cloneDeep(selectedRows);
-    var tempSelectedRowKeys = cloneDeep(selectedRowKeys);
+    var tempSelectedRows = _toConsumableArray(selectedRows);
+    var tempSelectedRowKeys = _toConsumableArray(selectedRowKeys);
     if (isMultiple) {
       var rowIndex = tempSelectedRows.findIndex(function (item) {
         return getRowKey(item) === selectedValue;

package/es/ProForm/components/combination/ProModalSelect/style/index.less CHANGED Viewed

@@ -57,7 +57,7 @@
   .@{ant-prefix}-input-affix-wrapper {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
-    &.ant-input-affix-wrapper-status-error{
+    &.@{ant-prefix}-input-affix-wrapper-status-error{
        & + .@{ant-prefix}-btn{
         border: 1px solid var(--ant-error-color);
         >.viewSvg{
@@ -74,6 +74,36 @@
     }
   }
+  .@{ant-prefix}-input-compact-item:not(.@{ant-prefix}-input-compact-last-item):not(.@{ant-prefix}-input-compact-item-rtl){
+    margin-right: 0;
+  }
+  .@{ant-prefix}-btn-compact-item.@{ant-prefix}-btn.@{ant-prefix}-btn-compact-last-item:not(.@{ant-prefix}-btn-compact-first-item):not(.@{ant-prefix}-btn-compact-item-rtl){
+    &:hover{
+      position: relative;
+      transition: none;
+      &::before{
+        opacity: 1;
+      }
+    }
+    &::before{
+      content: '';
+      position: absolute;
+      top: -1px;
+      left: -1px;
+      width: 1px;
+      height: calc(100% + 2px);
+      background:var(--ant-primary-color-hover);
+      opacity: 0;
+      display: block;
+    }
+  }
+  .@{ant-prefix}-input-affix-wrapper-status-error{
+  }
   .@{ant-prefix}-input-group-wrapper-status-error {
     &:hover {
       .@{ant-prefix}-input,
@@ -109,7 +139,7 @@
   .@{ant-prefix}-space-compact {
     .@{ant-prefix}-select-compact-item-div:has(.@{ant-prefix}-select-status-error) {
-      & + .ant-btn-compact-last-item {
+      & + .@{ant-prefix}-btn-compact-last-item {
         border-top: 1px solid var(--ant-error-color);
         border-right: 1px solid var(--ant-error-color);
         border-bottom: 1px solid var(--ant-error-color);
@@ -119,7 +149,7 @@
       }
     }
     .@{ant-prefix}-btn-compact-last-item{
-      border-left: none;
+      border-left: none !important;
     }
   }
@@ -138,9 +168,12 @@
 // 报错信息
 .@{ant-prefix}-form-item-has-error{
   .pro-modal-select{
-    .ant-btn-compact-last-item{
+    .@{ant-prefix}-btn-compact-last-item{
       color: @zaui-danger;
       border-color: @zaui-danger;
+      &::before{
+      background:  @zaui-danger !important;
+      }
     }
   }
 }

package/es/ProForm/components/render/ConfirmWrapper.js CHANGED Viewed

@@ -46,7 +46,8 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
               form: form,
               namePath: otherProps.namePath,
               name: otherProps.name,
-              index: otherProps.index
+              index: otherProps.index,
+              preValue: form.getFieldValue(otherProps.listName || otherProps.name)
             });
           case 5:
             _context.t0 = _context.sent;

package/es/ProForm/components/render/propsType.d.ts CHANGED Viewed

@@ -220,7 +220,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
-    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void | Promise<boolean | ModalFuncProps | void>>;
     /** 防抖模式 */
     debounceWait?: number;
 }

package/es/ProLayout/style/index.less CHANGED Viewed

@@ -242,7 +242,6 @@
     }
     .pro-layout-open-menu .@{ant-prefix}-menu-item-selected {
-      padding-right: 16px;
       &::after {
         display: none;
       }

package/es/ProSelect/index.js CHANGED Viewed

@@ -268,6 +268,10 @@ export var ProSelect = function ProSelect(props, ref) {
         return option === null || option === void 0 ? void 0 : option[code];
       }
     }
+    // 修复空字符placeholder不显示
+    if (value === '') {
+      return null;
+    }
     return value;
   };
   var newSelectList = selectList;

package/es/ProTable/components/RcTable/components/BaseTable/index.js CHANGED Viewed

@@ -25,7 +25,6 @@ var BaseTable = function BaseTable(_ref) {
     return null;
   };
   return _jsx(_Table, _objectSpread(_objectSpread({
-    className: "pro-edit-table-drag",
     components: renderComponents(),
     columns: columns,
     locale: {

package/es/ProTable/components/RcTable/components/DraggableTable/index.js CHANGED Viewed

@@ -8,7 +8,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * @Author: za-xuwenli xuwenli@zhongan.io
  * @Date: 2024-08-09 13:48:59
  * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2024-08-20 19:31:24
+ * @LastEditTime: 2024-08-27 15:27:44
  * @FilePath: /za-material-warehouse/src/ProTable/components/RcTable/components/DraggableTable/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */