ztxkui 3.9.3 → 3.9.5

package/dist/DemoCom/FormDemo.js

@@ -61,7 +61,7 @@ var FormDemo = function () {
         React.createElement(Form, { name: "test-list", form: form },
             React.createElement(SearchContainer, { dark: true },
                 React.createElement(SearchLeft, { configInfo: configInfoMemo, isDynamic: true, dynamicStorageKey: "symbol-key-00001", isToggle: true, handleRef: handleRef },
-                    React.createElement(SearchItem, { width: "half", name: "pwNo", configname: "pwNoCopy", label: "\u5165\u5E93\u5355\u53F7", rules: [
+                    React.createElement(SearchItem, { width: "half", name: "pwNo", configname: "pwNoCopy", label: "\u5165\u5E93\u5355\u53F7", disabled: true, rules: [
                             {
                                 required: true,
                                 message: '采购基本数据-请选择入库单号',
@@ -70,7 +70,7 @@ var FormDemo = function () {
                         React.createElement(Input.TextArea, { autoSize: true, allowClear: true, disabled: true, onChange: function (e) {
                                 console.log(e.target.value);
                             } })),
-                    React.createElement(SearchItem, { width: "half", name: "pwNo1", label: "\u5165\u5E93\u5355\u53F71", rules: [
+                    React.createElement(SearchItem, { width: "half", name: "pwNo1", label: "\u5165\u5E93\u5355\u53F71", dynamicdisabled: "1", rules: [
                             {
                                 required: false,
                                 message: '采购基本数据-请选择入库单号1',

package/dist/components/PrintContainer/handle.js

@@ -283,22 +283,27 @@ export function getPositionLocal(localKey) {
  * @description 设置标签位置
  */
 export function setPositionDom(value) {
-    var _a;
     var printDom = document.querySelectorAll('.html2canvas-container-page');
     for (var i = 0; i < printDom.length; i++) {
         var item = printDom[i];
         item.setAttribute('style', "padding-top: " + ((value === null || value === void 0 ? void 0 : value.top) < 0 ? 0 : (value === null || value === void 0 ? void 0 : value.top) || 0) + "px; padding-left: " + ((value === null || value === void 0 ? void 0 : value.left) < 0 ? 0 : (value === null || value === void 0 ? void 0 : value.left) || 0) + "px");
         var childResultStyle = {};
-        var childrenDom = item.querySelectorAll('.set-box');
         if ((value === null || value === void 0 ? void 0 : value.top) < 0) {
-            var initTop = (_a = childrenDom[0]) === null || _a === void 0 ? void 0 : _a.dataset.top;
-            console.log(initTop);
             childResultStyle.top = value === null || value === void 0 ? void 0 : value.top;
         }
         if ((value === null || value === void 0 ? void 0 : value.left) < 0) {
             childResultStyle.left = value === null || value === void 0 ? void 0 : value.left;
         }
-        if (childResultStyle.top || childResultStyle.left) {
+        console.log(childResultStyle);
+        if (childResultStyle.top && !childResultStyle.left) {
+            setMinusPosition(item, childResultStyle);
+            reductionMinusPostion(item, 'left');
+        }
+        else if (!childResultStyle.top && childResultStyle.left) {
+            setMinusPosition(item, childResultStyle);
+            reductionMinusPostion(item, 'top');
+        }
+        else if (childResultStyle.top && childResultStyle.left) {
             setMinusPosition(item, childResultStyle);
         }
         else {
@@ -366,9 +371,11 @@ export function reductionMinusPostion(dom, type) {
         var childrenDom = dom.querySelectorAll('.set-box');
         if (childrenDom) {
             if (type === 'top') {
+                console.log(childrenDom[0].style.top);
                 childrenDom[0].style.top = childrenDom[0].dataset.top;
             }
             else if (type === 'left') {
+                console.log(childrenDom[0].style.left);
                 childrenDom[0].style.left = childrenDom[0].dataset.left;
             }
             else {

package/dist/components/business/SearchContainer/hooks/useDynamic.d.ts

@@ -5,6 +5,7 @@ export interface ISearchLayout {
     show?: boolean;
     disabled?: boolean;
     hiddenLabelName?: string;
+    dynamicDisabled?: any;
     [props: string]: any;
 }
 /**

package/dist/components/business/SearchContainer/hooks/useDynamic.js

@@ -135,13 +135,14 @@ dynamicStorageKey // 动态列配置的key值
             // 遍历当前子元素
             React.Children.forEach(children, function (item) {
                 if (item === null || item === void 0 ? void 0 : item.props) {
-                    var _a = item.props, name_2 = _a.name, label_1 = _a.label, hiddenLabelName_1 = _a.hiddenLabelName, disabled = _a.disabled;
+                    var _a = item.props, name_2 = _a.name, label_1 = _a.label, hiddenLabelName_1 = _a.hiddenLabelName, disabled = _a.disabled, dynamicDisabled_1 = _a.dynamicdisabled;
                     _initDynamicList_1.push({
                         name: name_2,
                         label: label_1,
                         hiddenLabelName: hiddenLabelName_1,
                         show: true,
                         disabled: disabled,
+                        dynamicDisabled: dynamicDisabled_1,
                     });
                     if (!dynamicList_1 || dynamicList_1.length === 0) {
                         _currentDynamicList_1.push({
@@ -150,6 +151,7 @@ dynamicStorageKey // 动态列配置的key值
                             hiddenLabelName: hiddenLabelName_1,
                             show: true,
                             disabled: disabled,
+                            dynamicDisabled: dynamicDisabled_1,
                         });
                     }
                     else {
@@ -160,6 +162,7 @@ dynamicStorageKey // 动态列配置的key值
                             currentData.forEach(function (item) {
                                 item.label = label_1;
                                 item.hiddenLabelName = hiddenLabelName_1;
+                                item.dynamicDisabled = dynamicDisabled_1;
                             });
                             if (currentData.length > 1) {
                                 var index = _currentDynamicList_1.findIndex(function (currentDynamic) { return currentDynamic.name === name_2; });
@@ -180,6 +183,7 @@ dynamicStorageKey // 动态列配置的key值
                 hiddenLabelName: item.hiddenLabelName,
                 show: true,
                 disabled: item.disabled,
+                dynamicDisabled: item.dynamicdisabled,
             }); }));
             // 将删除的数据剔除出去
             _currentDynamicList_1 = _currentDynamicList_1.filter(function (item) {

package/dist/components/business/SearchContainer/search-drawer.js

@@ -65,6 +65,6 @@ var SearchDrawer = function (_a) {
                 React.createElement("span", null, "\uFF08\u62D6\u62FD\u6392\u5E8F\uFF09"))), width: 290, placement: "right", visible: visible, closable: false, maskClosable: false, footer: renderFooter() },
         React.createElement(DndProvider, { backend: HTML5Backend, context: window },
             React.createElement(Checkbox.Group, { value: checkedValues, onChange: onCheckboxChange }, dynamicList.map(function (item, index) { return (React.createElement(Sortable, { key: item.name, type: "search-drawer", index: index, onMoveItem: onMoveItem },
-                React.createElement(Checkbox, { value: item.name }, item.label || item.hiddenLabelName || item.name))); })))));
+                React.createElement(Checkbox, { value: item.name, disabled: item.disabled || item.dynamicDisabled }, item.label || item.hiddenLabelName || item.name))); })))));
 };
 export default memo(SearchDrawer);

package/dist/components/business/SearchContainer/search-item.d.ts

@@ -18,6 +18,8 @@ export interface ISearchItem extends FormItemProps {
     hiddenLabelName?: string;
     /** 没有lable显示边框 */
     noLabelShowBg?: boolean;
+    /** 动态列禁用隐藏 */
+    dynamicdisabled?: any;
 }
 declare const SearchItem: React.FC<ISearchItem>;
 export default SearchItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "3.9.3",
+  "version": "3.9.5",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",