@bit-sun/business-component 4.2.1-alpha.29-aiwei → 4.2.1-alpha.30-aiwei

package/dist/index.esm.js

@@ -19784,6 +19784,13 @@ var css_248z$j = "#bs-sula-query-table .ant-table-title + .ant-table-container t
 styleInject(css_248z$j);
 
 var _excluded$i = ["onResize", "width"];
+/**
+ * 获取列或搜索字段的稳定标识，用于过滤已经从最新配置中删除的项目。
+ */
+var getConfigItemKey = function getConfigItemKey(item, type) {
+  var value = type === 'columns' ? (item === null || item === void 0 ? void 0 : item.key) || (item === null || item === void 0 ? void 0 : item.dataIndex) : item === null || item === void 0 ? void 0 : item.name;
+  return Array.isArray(value) ? JSON.stringify(value) : value || '';
+};
 var MemoQueryTable = /*#__PURE__*/React$1.memo(QueryTable);
 var Text$2 = Typography.Text;
 var ResizeableTitle$2 = function ResizeableTitle(props) {
@@ -19998,6 +20005,12 @@ var BsSulaQueryTable = (function (props) {
   var value = props;
   var _props$fields = props.fields,
     fields = _props$fields === void 0 ? [] : _props$fields;
+  var columnsStructureKey = JSON.stringify((props.columns || []).map(function (item) {
+    return getConfigItemKey(item, 'columns');
+  }));
+  var fieldsStructureKey = JSON.stringify((props.fields || []).map(function (item) {
+    return getConfigItemKey(item, 'searchFields');
+  }));
   var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
     showColumn = _useState12[0],
@@ -20116,35 +20129,21 @@ var BsSulaQueryTable = (function (props) {
   //组件初始挂载
   useEffect(function () {
     // getTableHeight();
-    setInitialTableInfo();
-    setInitialSearchFieldsInfo();
     window.addEventListener('resize', function (e) {
       watchWinResize();
     });
     setPagePath(pathname); // 做处理，记录当前页面渲染的初始pathname，用于进行判断当前列表页面数据是否需要重新渲染
   }, []);
   useEffect(function () {
-    if ((props === null || props === void 0 ? void 0 : props.columns) && (value === null || value === void 0 ? void 0 : value.columns)) {
-      var newKeys = props.columns.map(function (d) {
-        return Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : d.key || d.dataIndex;
-      });
-      var oldKeys = value.columns.map(function (d) {
-        return Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : d.key || d.dataIndex;
-      });
-      JSON.stringify(newKeys) !== JSON.stringify(oldKeys) && setInitialTableInfo();
+    if (props === null || props === void 0 ? void 0 : props.columns) {
+      setInitialTableInfo();
     }
-  }, [props === null || props === void 0 ? void 0 : props.columns]);
+  }, [columnsStructureKey]);
   useEffect(function () {
-    if ((props === null || props === void 0 ? void 0 : props.fields) && (value === null || value === void 0 ? void 0 : value.fields)) {
-      var newKeys = props.fields.map(function (d) {
-        return Array.isArray(d.name) ? JSON.stringify(d.name) : d.name;
-      });
-      var oldKeys = value.fields.map(function (d) {
-        return Array.isArray(d.name) ? JSON.stringify(d.name) : d.name;
-      });
-      JSON.stringify(newKeys) !== JSON.stringify(oldKeys) && setInitialSearchFieldsInfo();
+    if (props === null || props === void 0 ? void 0 : props.fields) {
+      setInitialSearchFieldsInfo();
     }
-  }, [props === null || props === void 0 ? void 0 : props.fields]);
+  }, [fieldsStructureKey]);
   useEffect(function () {
     setInitialTableInfo();
   }, [props === null || props === void 0 ? void 0 : props.refreshColumns]);
@@ -20387,9 +20386,15 @@ var BsSulaQueryTable = (function (props) {
   };
   var getColumns = function getColumns() {
     // 优化一下 减少复杂度
-    var titleMap = toMapByKey(value.columns, 'title');
+    var currentColumns = value.columns || [];
+    var currentColumnKeys = new Set(currentColumns.map(function (item) {
+      return getConfigItemKey(item, 'columns');
+    }));
+    var titleMap = toMapByKey(currentColumns, 'title');
     // 加上排序
-    var cols = showColumn.map(function (i) {
+    var cols = showColumn.filter(function (i) {
+      return currentColumnKeys.has(getConfigItemKey(i, 'columns'));
+    }).map(function (i) {
       var _titleMap$renderToStr, _titleMap$renderToStr2;
       return _objectSpread2(_objectSpread2({}, i), {}, {
         isPermissionColumn: (_titleMap$renderToStr = titleMap[renderToString(i.title)]) === null || _titleMap$renderToStr === void 0 ? void 0 : _titleMap$renderToStr.isPermissionColumn,
@@ -20460,7 +20465,11 @@ var BsSulaQueryTable = (function (props) {
       }
     }) : false,
     columns: _toConsumableArray(getColumns()),
-    fields: _toConsumableArray(showSearchFields),
+    fields: _toConsumableArray(showSearchFields.filter(function (item) {
+      return new Set((value.fields || []).map(function (field) {
+        return getConfigItemKey(field, 'searchFields');
+      })).has(getConfigItemKey(item, 'searchFields'));
+    })),
     ref: props.forwardedRef || refs,
     isFullScreen: isFullScreen
   });
@@ -36577,7 +36586,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
-        // 库存组织选择器
+        // 库存组织选择器（与结算组织 290 对齐：不加 treeCheckStrictly，避免 labelInValue 回传结构异常导致 params 为空）
         if (dataChoiceBusinessType == 280) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
             return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement(BusinessTreeSearchSelect$1, {
@@ -36587,7 +36596,6 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: dataInputBusinessType === 12 ? values : values[0],
               style: styleCommon,
-              treeCheckStrictly: true,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[0] = value.map(function (i) {
@@ -36612,7 +36620,6 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: dataInputBusinessType === 12 ? values : values[0],
               style: styleCommon,
-              treeCheckStrictly: true,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[1] = value.map(function (i) {
@@ -36639,7 +36646,6 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: dataInputBusinessType === 12 ? values : values[0],
               style: styleCommon,
-              treeCheckStrictly: true,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values = value.map(function (i) {

package/dist/index.js

@@ -19807,6 +19807,13 @@ var css_248z$j = "#bs-sula-query-table .ant-table-title + .ant-table-container t
 styleInject(css_248z$j);
 
 var _excluded$i = ["onResize", "width"];
+/**
+ * 获取列或搜索字段的稳定标识，用于过滤已经从最新配置中删除的项目。
+ */
+var getConfigItemKey = function getConfigItemKey(item, type) {
+  var value = type === 'columns' ? (item === null || item === void 0 ? void 0 : item.key) || (item === null || item === void 0 ? void 0 : item.dataIndex) : item === null || item === void 0 ? void 0 : item.name;
+  return Array.isArray(value) ? JSON.stringify(value) : value || '';
+};
 var MemoQueryTable = /*#__PURE__*/React__default['default'].memo(bssula.QueryTable);
 var Text$2 = antd.Typography.Text;
 var ResizeableTitle$2 = function ResizeableTitle(props) {
@@ -20021,6 +20028,12 @@ var BsSulaQueryTable = (function (props) {
   var value = props;
   var _props$fields = props.fields,
     fields = _props$fields === void 0 ? [] : _props$fields;
+  var columnsStructureKey = JSON.stringify((props.columns || []).map(function (item) {
+    return getConfigItemKey(item, 'columns');
+  }));
+  var fieldsStructureKey = JSON.stringify((props.fields || []).map(function (item) {
+    return getConfigItemKey(item, 'searchFields');
+  }));
   var _useState11 = React$1.useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
     showColumn = _useState12[0],
@@ -20139,35 +20152,21 @@ var BsSulaQueryTable = (function (props) {
   //组件初始挂载
   React$1.useEffect(function () {
     // getTableHeight();
-    setInitialTableInfo();
-    setInitialSearchFieldsInfo();
     window.addEventListener('resize', function (e) {
       watchWinResize();
     });
     setPagePath(pathname); // 做处理，记录当前页面渲染的初始pathname，用于进行判断当前列表页面数据是否需要重新渲染
   }, []);
   React$1.useEffect(function () {
-    if ((props === null || props === void 0 ? void 0 : props.columns) && (value === null || value === void 0 ? void 0 : value.columns)) {
-      var newKeys = props.columns.map(function (d) {
-        return Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : d.key || d.dataIndex;
-      });
-      var oldKeys = value.columns.map(function (d) {
-        return Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : d.key || d.dataIndex;
-      });
-      JSON.stringify(newKeys) !== JSON.stringify(oldKeys) && setInitialTableInfo();
+    if (props === null || props === void 0 ? void 0 : props.columns) {
+      setInitialTableInfo();
     }
-  }, [props === null || props === void 0 ? void 0 : props.columns]);
+  }, [columnsStructureKey]);
   React$1.useEffect(function () {
-    if ((props === null || props === void 0 ? void 0 : props.fields) && (value === null || value === void 0 ? void 0 : value.fields)) {
-      var newKeys = props.fields.map(function (d) {
-        return Array.isArray(d.name) ? JSON.stringify(d.name) : d.name;
-      });
-      var oldKeys = value.fields.map(function (d) {
-        return Array.isArray(d.name) ? JSON.stringify(d.name) : d.name;
-      });
-      JSON.stringify(newKeys) !== JSON.stringify(oldKeys) && setInitialSearchFieldsInfo();
+    if (props === null || props === void 0 ? void 0 : props.fields) {
+      setInitialSearchFieldsInfo();
     }
-  }, [props === null || props === void 0 ? void 0 : props.fields]);
+  }, [fieldsStructureKey]);
   React$1.useEffect(function () {
     setInitialTableInfo();
   }, [props === null || props === void 0 ? void 0 : props.refreshColumns]);
@@ -20410,9 +20409,15 @@ var BsSulaQueryTable = (function (props) {
   };
   var getColumns = function getColumns() {
     // 优化一下 减少复杂度
-    var titleMap = toMapByKey(value.columns, 'title');
+    var currentColumns = value.columns || [];
+    var currentColumnKeys = new Set(currentColumns.map(function (item) {
+      return getConfigItemKey(item, 'columns');
+    }));
+    var titleMap = toMapByKey(currentColumns, 'title');
     // 加上排序
-    var cols = showColumn.map(function (i) {
+    var cols = showColumn.filter(function (i) {
+      return currentColumnKeys.has(getConfigItemKey(i, 'columns'));
+    }).map(function (i) {
       var _titleMap$renderToStr, _titleMap$renderToStr2;
       return _objectSpread2(_objectSpread2({}, i), {}, {
         isPermissionColumn: (_titleMap$renderToStr = titleMap[renderToString(i.title)]) === null || _titleMap$renderToStr === void 0 ? void 0 : _titleMap$renderToStr.isPermissionColumn,
@@ -20483,7 +20488,11 @@ var BsSulaQueryTable = (function (props) {
       }
     }) : false,
     columns: _toConsumableArray(getColumns()),
-    fields: _toConsumableArray(showSearchFields),
+    fields: _toConsumableArray(showSearchFields.filter(function (item) {
+      return new Set((value.fields || []).map(function (field) {
+        return getConfigItemKey(field, 'searchFields');
+      })).has(getConfigItemKey(item, 'searchFields'));
+    })),
     ref: props.forwardedRef || refs,
     isFullScreen: isFullScreen
   });
@@ -36600,7 +36609,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
-        // 库存组织选择器
+        // 库存组织选择器（与结算组织 290 对齐：不加 treeCheckStrictly，避免 labelInValue 回传结构异常导致 params 为空）
         if (dataChoiceBusinessType == 280) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
             return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessTreeSearchSelect$1, {
@@ -36610,7 +36619,6 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: dataInputBusinessType === 12 ? values : values[0],
               style: styleCommon,
-              treeCheckStrictly: true,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[0] = value.map(function (i) {
@@ -36635,7 +36643,6 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: dataInputBusinessType === 12 ? values : values[0],
               style: styleCommon,
-              treeCheckStrictly: true,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[1] = value.map(function (i) {
@@ -36662,7 +36669,6 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: dataInputBusinessType === 12 ? values : values[0],
               style: styleCommon,
-              treeCheckStrictly: true,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values = value.map(function (i) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.1-alpha.29-aiwei",
+  "version": "4.2.1-alpha.30-aiwei",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/BsSulaQueryTable/index.tsx

@@ -38,6 +38,14 @@ interface Field {
   field: any;
 }
 
+/**
+ * 获取列或搜索字段的稳定标识，用于过滤已经从最新配置中删除的项目。
+ */
+const getConfigItemKey = (item: any, type: 'columns' | 'searchFields') => {
+  const value = type === 'columns' ? item?.key || item?.dataIndex : item?.name;
+  return Array.isArray(value) ? JSON.stringify(value) : value || '';
+};
+
 const MemoQueryTable = React.memo(QueryTable);
 const { Text } = Typography;
 
@@ -267,6 +275,16 @@ export default (props: any) => {
   // @ts-nocheck
   const value = props;
   const { fields = [] } = props;
+  const columnsStructureKey = JSON.stringify(
+    (props.columns || []).map((item: any) =>
+      getConfigItemKey(item, 'columns'),
+    ),
+  );
+  const fieldsStructureKey = JSON.stringify(
+    (props.fields || []).map((item: any) =>
+      getConfigItemKey(item, 'searchFields'),
+    ),
+  );
   const [showColumn, setShowColumns] = useState([]); // 列字段
   const originSearchFields = getSettingFieldOrColumn(
     getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION),
@@ -446,8 +464,6 @@ export default (props: any) => {
   //组件初始挂载
   useEffect(() => {
     // getTableHeight();
-    setInitialTableInfo();
-    setInitialSearchFieldsInfo();
     window.addEventListener('resize', (e) => {
       watchWinResize();
     });
@@ -456,34 +472,16 @@ export default (props: any) => {
   }, []);
 
   useEffect(() => {
-    if (props?.columns && value?.columns) {
-      let newKeys = props.columns.map((d: any) =>
-        Array.isArray(d.key || d.dataIndex)
-          ? JSON.stringify(d.key || d.dataIndex)
-          : d.key || d.dataIndex,
-      );
-      let oldKeys = value.columns.map((d: any) =>
-        Array.isArray(d.key || d.dataIndex)
-          ? JSON.stringify(d.key || d.dataIndex)
-          : d.key || d.dataIndex,
-      );
-      JSON.stringify(newKeys) !== JSON.stringify(oldKeys) &&
-        setInitialTableInfo();
+    if (props?.columns) {
+      setInitialTableInfo();
     }
-  }, [props?.columns]);
+  }, [columnsStructureKey]);
 
   useEffect(() => {
-    if (props?.fields && value?.fields) {
-      let newKeys = props.fields.map((d: any) =>
-        Array.isArray(d.name) ? JSON.stringify(d.name) : d.name,
-      );
-      let oldKeys = value.fields.map((d: any) =>
-        Array.isArray(d.name) ? JSON.stringify(d.name) : d.name,
-      );
-      JSON.stringify(newKeys) !== JSON.stringify(oldKeys) &&
-        setInitialSearchFieldsInfo();
+    if (props?.fields) {
+      setInitialSearchFieldsInfo();
     }
-  }, [props?.fields]);
+  }, [fieldsStructureKey]);
 
   useEffect(() => {
     setInitialTableInfo();
@@ -771,9 +769,15 @@ export default (props: any) => {
   };
   const getColumns = () => {
     // 优化一下 减少复杂度
-    const titleMap = toMapByKey(value.columns, 'title');
+    const currentColumns = value.columns || [];
+    const currentColumnKeys = new Set(
+      currentColumns.map((item: any) => getConfigItemKey(item, 'columns')),
+    );
+    const titleMap = toMapByKey(currentColumns, 'title');
     // 加上排序
-    const cols = showColumn.map((i) => ({
+    const cols = showColumn.filter((i: any) =>
+      currentColumnKeys.has(getConfigItemKey(i, 'columns')),
+    ).map((i) => ({
       ...i,
       isPermissionColumn: titleMap[renderToString(i.title)]?.isPermissionColumn,
       render: titleMap[renderToString(i.title)]?.render,
@@ -846,7 +850,15 @@ export default (props: any) => {
       },
     } : false,
     columns: [...getColumns()],
-    fields: [...showSearchFields],
+    fields: [
+      ...showSearchFields.filter((item: any) =>
+        new Set(
+          (value.fields || []).map((field: any) =>
+            getConfigItemKey(field, 'searchFields'),
+          ),
+        ).has(getConfigItemKey(item, 'searchFields')),
+      ),
+    ],
     ref: props.forwardedRef || refs,
     isFullScreen,
   };

package/src/components/Solution/RuleComponent/ruleFiled.js

@@ -1804,7 +1804,7 @@ export default class RuleField extends Component {
           );
         }
       }
-      // 库存组织选择器
+      // 库存组织选择器（与结算组织 290 对齐：不加 treeCheckStrictly，避免 labelInValue 回传结构异常导致 params 为空）
       if (dataChoiceBusinessType == 280) {
         if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
           return (
@@ -1816,7 +1816,6 @@ export default class RuleField extends Component {
                 labelInValue={true}
                 value={dataInputBusinessType === 12 ? values : values[0]}
                 style={styleCommon}
-                treeCheckStrictly={true}
                 onChange={(value) => {
                   if (dataInputBusinessType === 12) {
                     values[0] = value.map((i) => i.key);
@@ -1837,7 +1836,6 @@ export default class RuleField extends Component {
                 labelInValue={true}
                 value={dataInputBusinessType === 12 ? values : values[0]}
                 style={styleCommon}
-                treeCheckStrictly={true}
                 onChange={(value) => {
                   if (dataInputBusinessType === 12) {
                     values[1] = value.map((i) => i.key);
@@ -1861,7 +1859,6 @@ export default class RuleField extends Component {
               labelInValue={true}
               value={dataInputBusinessType === 12 ? values : values[0]}
               style={styleCommon}
-              treeCheckStrictly={true}
               onChange={(value) => {
                 if (dataInputBusinessType === 12) {
                   values = value.map((i) => i.key)||[];