@next-libs/cmdb-instances 6.26.7 → 6.27.1

package/dist/esm/instance-list-table/AdvancedSearchCondition.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/instance-list-table/AdvancedSearchCondition.tsx"],"names":["React","useReducer","i18n","K","NS_LIBS_CMDB_INSTANCES","LogicalOperators","DynamicSearch","isEmpty","uniqueId","startsWith","Tag","styles","newKey","fieldIds","aq","key","join","length","reducer","prevState","updatedProperty","formatAqToShow","newAqToShow","forEach","query","aqToShow","Object","entries","map","expressions","newExpressions","Or","And","translateAqConditions","fields","conditions","queries","keys","value","values","attr","find","v","id","contain","t","OPERATOR_CONTAIN_DEFINE","condition","name","replace","curCondition","attrId","valuesStr","push","AdvancedSearchCondition","props","state","setState","undefined","onAdvancedSearch","queriesToShow","fieldToShow","onAdvancedSearchCloseGen","isValueEqual","filterAq","filter","specialQueryHandler","isSpecial","some","formatAqQuery","querys","isAq","isKey","isStart","filteredSubQueries","isInstanceFilterForm","advancedSearchWrapper","marginBottom","hideSearchConditions","searchConditions","CURRENT_FILTER_REQUIREMENTS"],"mappings":"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","sourcesContent":["import React, { useReducer } from \"react\";\nimport i18n from \"i18next\";\nimport { K, NS_LIBS_CMDB_INSTANCES } from \"../i18n/constants\";\nimport { Query, LogicalOperators } from \"@next-libs/cmdb-utils\";\nimport { DynamicSearch } from \"./DynamicSearch\";\nimport { isEmpty, uniqueId, startsWith } from \"lodash\";\nimport { Tag } from \"antd\";\nimport styles from \"./AdvancedSearchCondition.module.css\";\nexport interface AdvancedSearchConditionProps {\n  fields: Record<string, any>[];\n  onAdvancedSearch?(queries: Query[]): void;\n  isInstanceFilterForm?: boolean;\n  aq?: Query[];\n  aqToShow?: Query[];\n  hideSearchConditions?: boolean;\n}\n\ninterface AdvancedSearchConditionState {\n  aq: Query[];\n  aqToShow?: Query[];\n  fieldIds: string[];\n  fieldToShow?: Record<string, any[]>[];\n  fields?: Record<string, any>[];\n}\n\n/* istanbul ignore next */\nfunction newKey(fieldIds: string[], aq: Query[]): string {\n  let key = \"\";\n  if (!isEmpty(fieldIds)) {\n    key += fieldIds.join(\"-\");\n  }\n  if (!isEmpty(aq)) {\n    key += `-${aq.length}`;\n  }\n  return key;\n}\n/* istanbul ignore next */\nconst reducer = (\n  prevState: AdvancedSearchConditionState,\n  updatedProperty: Partial<AdvancedSearchConditionState>\n): AdvancedSearchConditionState => {\n  return {\n    ...prevState,\n    ...updatedProperty,\n  };\n};\n\nexport const formatAqToShow = (aq: Query[]) => {\n  let newAqToShow: any[] = [];\n  if (aq) {\n    aq.forEach((query) => {\n      const aqToShow = Object.entries(query).map(([key, expressions]) => {\n        let newExpressions: any[] = [];\n        if (key === LogicalOperators.Or || key === LogicalOperators.And) {\n          newExpressions = [...newExpressions, ...(expressions as Query[])];\n\n          return { [key]: newExpressions };\n        } else {\n          return query;\n        }\n      });\n      newAqToShow = [...newAqToShow, ...aqToShow];\n    });\n    return newAqToShow;\n  }\n  return newAqToShow;\n};\n\nfunction translateAqConditions(\n  aq: Query[],\n  fields: any[]\n): { attrId: string; condition: string; valuesStr: string }[] {\n  const conditions: {\n    attrId: string;\n    condition: string;\n    valuesStr: string;\n  }[] = [];\n  if (!isEmpty(aq)) {\n    for (const query of aq) {\n      let queries: Query[] = [query];\n      if (\n        Object.keys(query)[0] === LogicalOperators.Or ||\n        Object.keys(query)[0] === LogicalOperators.And\n      ) {\n        queries = query[Object.keys(query)[0]] as Query[];\n      }\n      queries.forEach((query) => {\n        const key = Object.keys(query)[0];\n        const value = Object.values(query)[0];\n        const attr = fields.find((v) => v.id === key);\n        const contain = i18n.t(\n          `${NS_LIBS_CMDB_INSTANCES}:${K.OPERATOR_CONTAIN_DEFINE}`\n        );\n        const condition = `${attr?.name}:${contain}\"${Object.values(\n          value\n        )[0].replace(/%/g, \"\")}\"`;\n        const curCondition = {\n          attrId: key,\n          condition,\n          valuesStr: Object.values(value)[0],\n        };\n        conditions.push(curCondition);\n      });\n    }\n  }\n  return conditions;\n}\n\nexport function AdvancedSearchCondition(\n  props: AdvancedSearchConditionProps\n): React.ReactElement {\n  const [state, setState] = useReducer(reducer, undefined, () => ({\n    aq: formatAqToShow(props.aq),\n    aqToShow: props.aqToShow || formatAqToShow(props.aq),\n    fieldIds: (props.fields || []).map((v) => v.id),\n    fields: props.fields || [],\n  }));\n\n  const onAdvancedSearch = (\n    queries: Query[],\n    queriesToShow: Query[],\n    fieldToShow: Record<string, any[]>[]\n  ) => {\n    setState({\n      aq: queries,\n      fieldToShow,\n      aqToShow: queriesToShow,\n    });\n    props.onAdvancedSearch?.(queries);\n  };\n\n  /* istanbul ignore next */\n  const onAdvancedSearchCloseGen = (attrId: string, valuesStr: string) => {\n    return () => {\n      const queries: Query[] = [];\n      const queriesToShow: Query[] = [];\n      const isValueEqual = (query: any) =>\n        query[attrId]\n          ? Object.values(query[attrId]).join(\" \") !== valuesStr\n          : false;\n      const filterAq = (queries: any[]) =>\n        queries.filter((v: any) => isValueEqual(v));\n      const specialQueryHandler = (query: any, key: any, queries: Query[]) => {\n        // $exists $gte $lte 针对为空，不为空，时间范围特殊处理\n        const isSpecial = Object.keys(query[key] as Query[]).some(\n          (v) => v === \"$exists\" || v === \"$gte\" || v === \"$lte\"\n        );\n        if (isSpecial) {\n          return;\n        }\n        queries.push(query);\n      };\n      const formatAqQuery = (\n        querys: any[],\n        queries: Query[],\n        isAq: boolean\n      ) => {\n        querys.forEach((query) => {\n          const key = Object.keys(query)[0];\n          const isKey = key !== attrId;\n          const isStart = isAq\n            ? isKey && !startsWith(attrId, `${key}.`)\n            : isKey;\n          if (\n            (key === \"$or\" || key === \"$and\") &&\n            Object.keys((query[key] as Query[])[0])[0] === attrId\n          ) {\n            const filteredSubQueries = filterAq(query[key] as Query[]);\n            if (filteredSubQueries.length > 0) {\n              queries.push({\n                [key]: filteredSubQueries,\n              });\n            }\n          } else if (isStart) {\n            queries.push(query);\n          } else if (\n            props.isInstanceFilterForm &&\n            key === attrId &&\n            isValueEqual(query)\n          ) {\n            specialQueryHandler(query, key, queries);\n          }\n        });\n      };\n      formatAqQuery(state.aq, queries, true);\n      formatAqQuery(state.aqToShow, queriesToShow, false);\n      setState({\n        aq: queries,\n        aqToShow: queriesToShow,\n      });\n      props.onAdvancedSearch?.(queries);\n    };\n  };\n\n  const conditions = translateAqConditions(state.aqToShow, state.fields);\n\n  return (\n    <div className={styles.advancedSearchWrapper}>\n      <div style={{ marginBottom: \"18px\" }}>\n        <DynamicSearch\n          fields={state.fields}\n          onSearch={onAdvancedSearch}\n          key={newKey(state.fieldIds, state.aq)}\n          q={state.aqToShow}\n          fieldToShow={state.fieldToShow}\n        />\n      </div>\n      {!props.hideSearchConditions && !isEmpty(conditions) && (\n        <div className={styles.searchConditions}>\n          <span>\n            {i18n.t(\n              `${NS_LIBS_CMDB_INSTANCES}:${K.CURRENT_FILTER_REQUIREMENTS}`\n            )}\n          </span>\n          {conditions.map((condition) => (\n            <Tag\n              key={`${condition.attrId}${condition.valuesStr}-${uniqueId()}`}\n              closable\n              onClose={onAdvancedSearchCloseGen(\n                condition.attrId,\n                condition.valuesStr\n              )}\n            >\n              {condition.condition}\n            </Tag>\n          ))}\n        </div>\n      )}\n    </div>\n  );\n}\n"],"file":"AdvancedSearchCondition.js"}

package/dist/esm/instance-list-table/AdvancedSearchCondition.module.css

@@ -0,0 +1,22 @@
+.searchConditions {
+  background-color: var(
+    --cmdb-instance-detail-search-container-bg,
+    rgb(250, 250, 250)
+  );
+  padding: 8px 16px;
+  margin-bottom: 18px;
+  border-radius: 6px;
+}
+
+.searchConditions :global(.ant-tag) {
+  margin-top: 3px;
+  background: var(--cmdb-instance-detail-search-container-tag-bg, #f5f5f5);
+  color: var(--cmdb-instance-detail-search-container-tag-color, #595959);
+
+  :global(.anticon-close):hover {
+    color: var(
+      --cmdb-instance-detail-search-container-tag-close-hover-color,
+      #595959
+    );
+  }
+}

package/dist/esm/instance-list-table/DynamicSearch.js

@@ -0,0 +1,276 @@
+import _objectSpread from "@babel/runtime/helpers/objectSpread2";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import React from "react";
+import update from "immutability-helper";
+import { isEqual, isNil, isString, isArray, isEmpty } from "lodash";
+import { Form } from "@ant-design/compatible";
+import { Button, Col, Input, Row, Select } from "antd";
+import { ComparisonOperators, LogicalOperators } from "@next-libs/cmdb-utils";
+import styles from "./DynamicSearch.module.css";
+import i18n from "i18next";
+import { NS_LIBS_CMDB_INSTANCES, K } from "../i18n/constants";
+import { processAttrValueWithQuote, ENABLED_CMDB_ADVANCE_SEARCH_WITH_QUOTE } from "../processors";
+export class DynamicSearchForm extends React.Component {
+  constructor(props) {
+    super(props);
+
+    _defineProperty(this, "onValueChange", (value, fieldIndex, valueIndex) => {
+      this.setState({
+        fields: update(this.state.fields, {
+          [fieldIndex]: {
+            values: {
+              [valueIndex]: {
+                $set: value
+              }
+            }
+          }
+        })
+      });
+    });
+
+    _defineProperty(this, "handleValueChange", (e, fieldIndex) => {
+      this.onValueChange(e.target.value, fieldIndex, 0);
+    });
+
+    _defineProperty(this, "handleSearch", e => {
+      e.preventDefault();
+
+      if (this.props.onSearch) {
+        var _queries = [];
+        var _queriesToShow = [];
+        var _fieldToShow = [];
+        this.state.fields.forEach(field => {
+          var expressions = {};
+          var fieldId = field.id;
+          var fieldQuery = {
+            [fieldId]: expressions
+          };
+          var fieldQueryToShow = {
+            [fieldId]: expressions
+          };
+          var hasValue = false;
+          var operator = {
+            comparisonOperator: ComparisonOperators.Like,
+            logicalOperator: LogicalOperators.Or
+          };
+          field.values.forEach(value => {
+            fieldQuery = {
+              [field.id]: expressions
+            };
+            var fieldIdToShow = field.id;
+            fieldQueryToShow = {
+              [fieldIdToShow]: expressions
+            };
+
+            if (value !== null && value !== "" && !(Array.isArray(value) && value.length === 0)) {
+              var values;
+
+              if (typeof value === "string") {
+                values = processAttrValueWithQuote(value, []);
+              }
+
+              if (values.length) {
+                fieldQuery = {
+                  [operator.logicalOperator]: values.map(value => {
+                    return {
+                      [fieldId]: {
+                        [operator.comparisonOperator]: "%".concat(value, "%")
+                      }
+                    };
+                  })
+                };
+              }
+
+              fieldQueryToShow = {
+                [operator.logicalOperator]: values.map(value => {
+                  return {
+                    [fieldIdToShow]: {
+                      [operator.comparisonOperator]: "%".concat(value, "%")
+                    }
+                  };
+                })
+              };
+              hasValue = true;
+
+              _fieldToShow.push({
+                [field.id]: field.values
+              });
+            }
+          });
+
+          if (hasValue) {
+            _queries.push(fieldQuery);
+
+            _queriesToShow.push(fieldQueryToShow);
+          }
+        });
+
+        if (_queries.length === 0) {
+          _queries = undefined;
+          _queriesToShow = undefined;
+        }
+
+        if (!isEqual(this.props.q, _queries)) {
+          this.props.onSearch(_queries, _queriesToShow, _fieldToShow);
+        }
+      }
+    });
+
+    _defineProperty(this, "handleReset", () => {
+      this.props.onSearch([], [], []);
+      this.props.form.resetFields();
+    });
+
+    this.state = this.computeState();
+  }
+
+  componentDidUpdate(prevProps) {
+    if (!isEqual(this.props.q, prevProps.q)) {
+      var newState = this.computeState();
+      this.setState(newState);
+      this.setFormFieldValues(newState.fields);
+    }
+  }
+
+  computeState() {
+    var fieldQueryOperatorExpressionsMap = {};
+    var fields = [];
+
+    if (this.props.q) {
+      this.props.q.forEach(query => {
+        Object.entries(query).forEach(_ref => {
+          var [key, expressions] = _ref;
+
+          if (key === LogicalOperators.Or || key === LogicalOperators.And) {
+            var firstSubQuery = expressions[0];
+            var fieldId = Object.keys(firstSubQuery)[0];
+            var compareOperator = Object.keys(firstSubQuery[fieldId])[0];
+            var subQueryValue = "";
+            var targetField;
+
+            if (ENABLED_CMDB_ADVANCE_SEARCH_WITH_QUOTE) {
+              var _this$props$fieldToSh;
+
+              targetField = (_this$props$fieldToSh = this.props.fieldToShow) === null || _this$props$fieldToSh === void 0 ? void 0 : _this$props$fieldToSh.find(fieldItem => Object.keys(fieldItem)[0] === fieldId);
+            }
+
+            if (!isNil(targetField)) {
+              // 二维数组会有问题，
+              subQueryValue = isArray(targetField[fieldId]) ? targetField[fieldId].map(item => isArray(item) ? item.join(" ") : item).join("") : targetField[fieldId];
+            } else {
+              subQueryValue = expressions.map(query => {
+                var targetValue = query[fieldId][compareOperator];
+
+                if (compareOperator === ComparisonOperators.Like || compareOperator === ComparisonOperators.NotLike) {
+                  return isString(targetValue) && targetValue.includes(" ") ? "".concat(targetValue[0], "\"").concat(targetValue.slice(1, targetValue.length - 1), "\"").concat(targetValue[targetValue.length - 1]) : targetValue;
+                } else {
+                  return isString(targetValue) && targetValue.includes(" ") ? "\"".concat(targetValue, "\"") : targetValue;
+                }
+              }).join(" ");
+            }
+
+            key = fieldId;
+            expressions = {
+              [compareOperator]: subQueryValue
+            };
+          }
+
+          fieldQueryOperatorExpressionsMap[key] = expressions;
+        });
+      });
+    }
+
+    if (this.props.fields) {
+      fields = this.props.fields.map(v => _objectSpread(_objectSpread({}, v), {}, {
+        values: [null]
+      }));
+
+      if (!isEmpty(fieldQueryOperatorExpressionsMap)) {
+        fields = this.props.fields.map(v => {
+          var str = null;
+
+          if (fieldQueryOperatorExpressionsMap[v.id]) {
+            var expressions = fieldQueryOperatorExpressionsMap[v.id]["$like"];
+            str = expressions.replace(/%/g, "");
+          }
+
+          return _objectSpread(_objectSpread({}, v), {}, {
+            values: [str]
+          });
+        });
+      }
+    }
+
+    return {
+      fields
+    };
+  }
+
+  setFormFieldValues(fields) {
+    var values = fields.reduce((acc, field) => {
+      acc["".concat(field.id)] = field.values.join("");
+      return acc;
+    }, {});
+    this.props.form.setFieldsValue(values);
+  }
+
+  getFields() {
+    var {
+      getFieldDecorator
+    } = this.props.form;
+    return this.state.fields.map((field, fieldIndex) => {
+      return /*#__PURE__*/React.createElement(Col, {
+        span: 12,
+        key: field.id
+      }, /*#__PURE__*/React.createElement(Form.Item, {
+        label: field.name
+      }, /*#__PURE__*/React.createElement(Input.Group, {
+        className: styles.conditionInputGroup,
+        compact: true
+      }, /*#__PURE__*/React.createElement(Select, {
+        dropdownMatchSelectWidth: false,
+        defaultValue: "contain"
+      }, /*#__PURE__*/React.createElement(Select.Option, {
+        value: "contain",
+        key: "contain"
+      }, i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.OPERATOR_CONTAIN_DEFINE)))), getFieldDecorator("".concat(field.id), {
+        initialValue: field.values || ""
+      })( /*#__PURE__*/React.createElement(Input, {
+        placeholder: i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.ADVANCE_SEARCH_SINGLE_INPUT_PLACEHOLDER)),
+        onChange: e => this.handleValueChange(e, fieldIndex)
+      })))));
+    });
+  }
+
+  render() {
+    return /*#__PURE__*/React.createElement("div", {
+      className: styles.dynamicSearch
+    }, /*#__PURE__*/React.createElement(Form, {
+      layout: "vertical",
+      className: styles.dynamicSearchForm,
+      onSubmit: this.handleSearch
+    }, /*#__PURE__*/React.createElement(Row, {
+      gutter: 50
+    }, this.getFields()), /*#__PURE__*/React.createElement(Row, null, /*#__PURE__*/React.createElement(Col, {
+      span: 24,
+      style: {
+        textAlign: "right"
+      }
+    }, /*#__PURE__*/React.createElement(Button, {
+      type: "primary",
+      htmlType: "submit",
+      "data-testid": "submit-button"
+    }, i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.SEARCH))), /*#__PURE__*/React.createElement(Button, {
+      style: {
+        marginLeft: 8
+      },
+      onClick: this.handleReset,
+      "data-testid": "reset-button"
+    }, i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.RESET)))))));
+  }
+
+}
+export var DynamicSearch = Form.create({
+  name: "dynamic_search"
+})(DynamicSearchForm);
+//# sourceMappingURL=DynamicSearch.js.map

package/dist/esm/instance-list-table/DynamicSearch.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/instance-list-table/DynamicSearch.tsx"],"names":["React","update","isEqual","isNil","isString","isArray","isEmpty","Form","Button","Col","Input","Row","Select","ComparisonOperators","LogicalOperators","styles","i18n","NS_LIBS_CMDB_INSTANCES","K","processAttrValueWithQuote","ENABLED_CMDB_ADVANCE_SEARCH_WITH_QUOTE","DynamicSearchForm","Component","constructor","props","value","fieldIndex","valueIndex","setState","fields","state","values","$set","e","onValueChange","target","preventDefault","onSearch","queries","queriesToShow","fieldToShow","forEach","field","expressions","fieldId","id","fieldQuery","fieldQueryToShow","hasValue","operator","comparisonOperator","Like","logicalOperator","Or","fieldIdToShow","Array","length","map","push","undefined","q","form","resetFields","computeState","componentDidUpdate","prevProps","newState","setFormFieldValues","fieldQueryOperatorExpressionsMap","query","Object","entries","key","And","firstSubQuery","keys","compareOperator","subQueryValue","targetField","find","fieldItem","item","join","targetValue","NotLike","includes","slice","v","str","replace","reduce","acc","setFieldsValue","getFields","getFieldDecorator","name","conditionInputGroup","t","OPERATOR_CONTAIN_DEFINE","initialValue","ADVANCE_SEARCH_SINGLE_INPUT_PLACEHOLDER","handleValueChange","render","dynamicSearch","dynamicSearchForm","handleSearch","textAlign","SEARCH","marginLeft","handleReset","RESET","DynamicSearch","create"],"mappings":"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","sourcesContent":["import React, { FormEvent } from \"react\";\nimport update from \"immutability-helper\";\nimport { isEqual, isNil, isString, isArray, isEmpty } from \"lodash\";\nimport { Form } from \"@ant-design/compatible\";\nimport { Button, Col, Input, Row, Select } from \"antd\";\nimport { FormComponentProps } from \"@ant-design/compatible/lib/form\";\nimport {\n  ComparisonOperators,\n  LogicalOperators,\n  Query,\n  QueryOperatorExpressions,\n} from \"@next-libs/cmdb-utils\";\nimport styles from \"./DynamicSearch.module.css\";\nimport i18n from \"i18next\";\nimport { NS_LIBS_CMDB_INSTANCES, K } from \"../i18n/constants\";\nimport {\n  processAttrValueWithQuote,\n  ENABLED_CMDB_ADVANCE_SEARCH_WITH_QUOTE,\n} from \"../processors\";\n\nexport interface Field {\n  id: string;\n  name: string;\n  values?: any[];\n}\n\nexport interface DynamicSearchFormProps extends FormComponentProps {\n  fields: Record<string, any>[];\n  q?: Query[];\n  onSearch?(\n    queries: Query[],\n    queriesToShow?: Query[],\n    fieldToShow?: Record<string, any[]>[]\n  ): void;\n  fieldToShow?: Record<string, any[]>[]; // 回填高级搜索的field值（根据query回填丢失了引号信息）\n}\n\nexport interface DynamicSearchFormState {\n  fields: Field[];\n}\n\nexport class DynamicSearchForm extends React.Component<\n  DynamicSearchFormProps,\n  DynamicSearchFormState\n> {\n  constructor(props: DynamicSearchFormProps) {\n    super(props);\n\n    this.state = this.computeState();\n  }\n\n  componentDidUpdate(prevProps: Readonly<DynamicSearchFormProps>): void {\n    if (!isEqual(this.props.q, prevProps.q)) {\n      const newState = this.computeState();\n      this.setState(newState);\n      this.setFormFieldValues(newState.fields);\n    }\n  }\n\n  computeState(): { fields: Field[] } {\n    const fieldQueryOperatorExpressionsMap: Record<\n      string,\n      QueryOperatorExpressions\n    > = {};\n    let fields: Field[] = [];\n    if (this.props.q) {\n      this.props.q.forEach((query) => {\n        Object.entries(query).forEach(([key, expressions]) => {\n          if (key === LogicalOperators.Or || key === LogicalOperators.And) {\n            const firstSubQuery = (expressions as Query[])[0];\n            const fieldId = Object.keys(firstSubQuery)[0];\n            const compareOperator = Object.keys(firstSubQuery[fieldId])[0];\n            let subQueryValue = \"\";\n            let targetField;\n            if (ENABLED_CMDB_ADVANCE_SEARCH_WITH_QUOTE) {\n              targetField = this.props.fieldToShow?.find(\n                (fieldItem) => Object.keys(fieldItem)[0] === fieldId\n              );\n            }\n            if (!isNil(targetField)) {\n              // 二维数组会有问题，\n              subQueryValue = isArray(targetField[fieldId])\n                ? targetField[fieldId]\n                    .map((item) => (isArray(item) ? item.join(\" \") : item))\n                    .join(\"\")\n                : (targetField[fieldId] as any);\n            } else {\n              subQueryValue = (expressions as Query[])\n                .map((query) => {\n                  const targetValue = (\n                    query[fieldId] as Record<ComparisonOperators, any>\n                  )[compareOperator as ComparisonOperators];\n                  if (\n                    compareOperator === ComparisonOperators.Like ||\n                    compareOperator === ComparisonOperators.NotLike\n                  ) {\n                    return isString(targetValue) && targetValue.includes(\" \")\n                      ? `${targetValue[0]}\"${targetValue.slice(\n                          1,\n                          targetValue.length - 1\n                        )}\"${targetValue[targetValue.length - 1]}`\n                      : targetValue;\n                  } else {\n                    return isString(targetValue) && targetValue.includes(\" \")\n                      ? `\"${targetValue}\"`\n                      : targetValue;\n                  }\n                })\n                .join(\" \");\n            }\n            key = fieldId;\n            expressions = {\n              [compareOperator]: subQueryValue,\n            };\n          }\n\n          fieldQueryOperatorExpressionsMap[key] =\n            expressions as QueryOperatorExpressions;\n        });\n      });\n    }\n    if (this.props.fields) {\n      fields = this.props.fields.map(\n        (v) => ({ ...v, values: [null] } as Field)\n      );\n      if (!isEmpty(fieldQueryOperatorExpressionsMap)) {\n        fields = this.props.fields.map((v) => {\n          let str: any = null;\n          if (fieldQueryOperatorExpressionsMap[v.id]) {\n            const expressions = fieldQueryOperatorExpressionsMap[v.id][\"$like\"];\n            str = expressions.replace(/%/g, \"\");\n          }\n          return {\n            ...v,\n            values: [str],\n          } as Field;\n        });\n      }\n    }\n    return { fields };\n  }\n\n  setFormFieldValues(fields: Field[]): void {\n    const values = fields.reduce<{ [key: string]: any }>((acc, field) => {\n      acc[`${field.id}`] = field.values.join(\"\");\n      return acc;\n    }, {});\n    this.props.form.setFieldsValue(values);\n  }\n\n  onValueChange = (value: any, fieldIndex: number, valueIndex: number) => {\n    this.setState({\n      fields: update(this.state.fields, {\n        [fieldIndex]: { values: { [valueIndex]: { $set: value } } },\n      }),\n    });\n  };\n\n  getFields() {\n    const { getFieldDecorator } = this.props.form;\n    return this.state.fields.map((field, fieldIndex) => {\n      return (\n        <Col span={12} key={field.id}>\n          <Form.Item label={field.name}>\n            <Input.Group className={styles.conditionInputGroup} compact>\n              <Select dropdownMatchSelectWidth={false} defaultValue={\"contain\"}>\n                <Select.Option value={\"contain\"} key={\"contain\"}>\n                  {i18n.t(\n                    `${NS_LIBS_CMDB_INSTANCES}:${K.OPERATOR_CONTAIN_DEFINE}`\n                  )}\n                </Select.Option>\n              </Select>\n              {getFieldDecorator(`${field.id}`, {\n                initialValue: field.values || \"\",\n              })(\n                <Input\n                  placeholder={i18n.t(\n                    `${NS_LIBS_CMDB_INSTANCES}:${K.ADVANCE_SEARCH_SINGLE_INPUT_PLACEHOLDER}`\n                  )}\n                  onChange={(e) => this.handleValueChange(e, fieldIndex)}\n                />\n              )}\n            </Input.Group>\n          </Form.Item>\n        </Col>\n      );\n    });\n  }\n\n  handleValueChange = (e: any, fieldIndex: number) => {\n    this.onValueChange(e.target.value, fieldIndex, 0);\n  };\n\n  handleSearch = (e: FormEvent<any>): void => {\n    e.preventDefault();\n    if (this.props.onSearch) {\n      let queries: Query[] = [];\n      let queriesToShow: Query[] = [];\n      const fieldToShow: Record<string, any[]>[] = [];\n      this.state.fields.forEach((field) => {\n        const expressions: QueryOperatorExpressions = {};\n        const fieldId = field.id;\n        let fieldQuery: Query = { [fieldId]: expressions };\n        let fieldQueryToShow: Query = { [fieldId]: expressions };\n        let hasValue = false;\n        const operator = {\n          comparisonOperator: ComparisonOperators.Like,\n          logicalOperator: LogicalOperators.Or,\n        };\n        field.values.forEach((value) => {\n          fieldQuery = { [field.id]: expressions };\n          const fieldIdToShow = field.id;\n          fieldQueryToShow = { [fieldIdToShow]: expressions };\n          if (\n            value !== null &&\n            value !== \"\" &&\n            !(Array.isArray(value) && value.length === 0)\n          ) {\n            let values: any[];\n            if (typeof value === \"string\") {\n              values = processAttrValueWithQuote(value, []);\n            }\n            if (values.length) {\n              fieldQuery = {\n                [operator.logicalOperator]: values.map((value) => {\n                  return {\n                    [fieldId]: {\n                      [operator.comparisonOperator]: `%${value}%`,\n                    },\n                  };\n                }),\n              };\n            }\n            fieldQueryToShow = {\n              [operator.logicalOperator]: values.map((value) => {\n                return {\n                  [fieldIdToShow]: {\n                    [operator.comparisonOperator]: `%${value}%`,\n                  },\n                };\n              }),\n            };\n            hasValue = true;\n            fieldToShow.push({ [field.id]: field.values });\n          }\n        });\n        if (hasValue) {\n          queries.push(fieldQuery);\n          queriesToShow.push(fieldQueryToShow);\n        }\n      });\n      if (queries.length === 0) {\n        queries = undefined;\n        queriesToShow = undefined;\n      }\n      if (!isEqual(this.props.q, queries)) {\n        this.props.onSearch(queries, queriesToShow, fieldToShow);\n      }\n    }\n  };\n\n  handleReset = () => {\n    this.props.onSearch([], [], []);\n    this.props.form.resetFields();\n  };\n\n  render(): React.ReactNode {\n    return (\n      <div className={styles.dynamicSearch}>\n        <Form\n          layout=\"vertical\"\n          className={styles.dynamicSearchForm}\n          onSubmit={this.handleSearch}\n        >\n          <Row gutter={50}>{this.getFields()}</Row>\n          <Row>\n            <Col span={24} style={{ textAlign: \"right\" }}>\n              <Button\n                type=\"primary\"\n                htmlType=\"submit\"\n                data-testid=\"submit-button\"\n              >\n                {i18n.t(`${NS_LIBS_CMDB_INSTANCES}:${K.SEARCH}`)}\n              </Button>\n              <Button\n                style={{ marginLeft: 8 }}\n                onClick={this.handleReset}\n                data-testid=\"reset-button\"\n              >\n                {i18n.t(`${NS_LIBS_CMDB_INSTANCES}:${K.RESET}`)}\n              </Button>\n            </Col>\n          </Row>\n        </Form>\n      </div>\n    );\n  }\n}\n\nexport const DynamicSearch = Form.create<DynamicSearchFormProps>({\n  name: \"dynamic_search\",\n})(DynamicSearchForm);\n"],"file":"DynamicSearch.js"}

package/dist/esm/instance-list-table/DynamicSearch.module.css

@@ -0,0 +1,40 @@
+.dynamicSearch {
+  padding: 20px 25px;
+  background-color: var(--custom-form-item-wrapper-bg, #f5f5f5);
+  border-radius: 6px;
+}
+
+.dynamicSearchForm
+  :global(.ant-legacy-form-item-children)
+  > .conditionInputGroup {
+  display: inline-flex;
+}
+
+.dynamicSearchForm :global(.ant-legacy-form-item) {
+  margin-bottom: 14px;
+}
+
+.dynamicSearchForm :global(.ant-legacy-form-item-label) {
+  line-height: unset;
+}
+
+.dynamicSearchForm :global(.ant-legacy-form-item) label {
+  display: inline-block;
+  margin-bottom: 4px;
+}
+
+.conditionInput {
+  flex-grow: 1;
+}
+
+.conditionInputGroup .separatorInput {
+  width: 30px;
+  pointer-events: none;
+  border-left: 0;
+  border-right: 0;
+  background: var(--input-fill-bg, var(--antd-input-disabled-bg));
+}
+
+.conditionInputGroup :global(.ant-select-selection-selected-value) {
+  margin-right: 4px;
+}

package/dist/esm/instance-list-table/InstanceListTable.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _excluded = ["useBrick"];
 import React from "react";
@@ -11,7 +11,7 @@ import { Button, Popover, Table, Tag, Tooltip, Modal, message } from "antd";
 import { isNil, isBoolean, compact, map } from "lodash";
 import { CopyOutlined, DeleteOutlined } from "@ant-design/icons";
 import { PropertyDisplayType } from "@next-core/brick-types";
-import { CmdbObjectApi_getIdMapName } from "@next-sdk/cmdb-sdk";
+import { CmdbObjectApi_getIdMapName, InstanceApi_postSearch } from "@next-sdk/cmdb-sdk";
 import { Link, GeneralIcon } from "@next-libs/basic-components";
 import { forEachAvailableFields, getInstanceNameKeys, getTemplateFromMap, parseTemplate, modifyModelData } from "@next-libs/cmdb-utils";
 import { ModelAttributeValueType } from "../model-attribute-form-control/ModelAttributeFormControl";
@@ -49,9 +49,10 @@ var SELF_RENDER_COLUMNS = {
 };
 export class LegacyInstanceListTable extends React.Component {
   constructor(props) {
-    var _SELF_RENDER_COLUMNS$, _this$props$propertyD;
+    var _this, _SELF_RENDER_COLUMNS$, _this$props$propertyD;
 
     super(props);
+    _this = this;
 
     _defineProperty(this, "keyDisplayConfigMap", {});
 
@@ -61,6 +62,8 @@ export class LegacyInstanceListTable extends React.Component {
 
     _defineProperty(this, "selectedRows", []);
 
+    _defineProperty(this, "ROM_KEY", "instanceId");
+
     _defineProperty(this, "instanceSourceTitle", /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.INSTANCE_SOURCE))), /*#__PURE__*/React.createElement(Tooltip, {
       title: i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.INSTANCE_SOURCE_TOOLTIP))
     }, /*#__PURE__*/React.createElement("span", {
@@ -119,28 +122,53 @@ export class LegacyInstanceListTable extends React.Component {
       });
     });
 
-    _defineProperty(this, "handelIpCopyText", (ev, dataIndex) => {
-      var _this$props$selectedR;
+    _defineProperty(this, "handelIpCopyText", /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator(function* (ev, dataIndex) {
+        var _selectedRowKeys;
 
-      ev.stopPropagation();
+        ev.stopPropagation();
+        var selectedRowKeys = _this.props.selectedRowKeys;
 
-      if (((_this$props$selectedR = this.props.selectedRowKeys) === null || _this$props$selectedR === void 0 ? void 0 : _this$props$selectedR.length) < 1 || this.selectedRows.length < 1) {
-        message.warning(i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.SELECT_COPY_DATA)));
-        return false;
-      }
+        var selectedRows = _this.selectedRows.filter(v => v);
 
-      var inputDom = document.createElement("textarea");
-      inputDom.value = [...new Set(map(this.selectedRows.filter(v => v[dataIndex]), dataIndex))].join("\n");
-      document.body.appendChild(inputDom);
-      inputDom.select(); //选择对象
+        var objectId = _this.props.modelData.objectId;
 
-      document.execCommand("copy");
-      inputDom.remove();
-      message.success(i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.COPY_SUCCESS)));
-    });
+        if (((_selectedRowKeys = selectedRowKeys) === null || _selectedRowKeys === void 0 ? void 0 : _selectedRowKeys.length) < 1) {
+          message.warning(i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.SELECT_COPY_DATA)));
+          return false;
+        }
+
+        selectedRowKeys = selectedRowKeys.filter(k => selectedRows.every(row => row[_this.ROM_KEY] !== k));
+
+        if (selectedRowKeys.length > 0) {
+          var resp = yield InstanceApi_postSearch(objectId, {
+            query: {
+              instanceId: {
+                $in: selectedRowKeys
+              }
+            },
+            page_size: selectedRowKeys.length
+          });
+          selectedRows = [...selectedRows, ...((resp === null || resp === void 0 ? void 0 : resp.list) || [])];
+        }
+
+        var inputDom = document.createElement("textarea");
+        inputDom.value = [...new Set(map(selectedRows.filter(v => v[dataIndex]), dataIndex))].join("\n");
+        document.body.appendChild(inputDom);
+        inputDom.select(); //选择对象
+
+        document.execCommand("copy");
+        inputDom.remove();
+        message.success(i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.COPY_SUCCESS)));
+      });
+
+      return function (_x, _x2) {
+        return _ref.apply(this, arguments);
+      };
+    }());
 
-    var objectId = this.props.modelData.objectId;
-    (_SELF_RENDER_COLUMNS$ = SELF_RENDER_COLUMNS[objectId]) === null || _SELF_RENDER_COLUMNS$ === void 0 ? void 0 : _SELF_RENDER_COLUMNS$.forEach(config => this.keyDisplayConfigMap[config.key] = config);
+    var _objectId = this.props.modelData.objectId;
+    (_SELF_RENDER_COLUMNS$ = SELF_RENDER_COLUMNS[_objectId]) === null || _SELF_RENDER_COLUMNS$ === void 0 ? void 0 : _SELF_RENDER_COLUMNS$.forEach(config => this.keyDisplayConfigMap[config.key] = config);
     (_this$props$propertyD = this.props.propertyDisplayConfigs) === null || _this$props$propertyD === void 0 ? void 0 : _this$props$propertyD.forEach(config => this.keyDisplayConfigMap[config.key] = config);
     var fieldIds = this.props.fieldIds;
     var sortedColumns = this.getChangeColumns(fieldIds);
@@ -304,19 +332,19 @@ export class LegacyInstanceListTable extends React.Component {
   }
 
   componentDidMount() {
-    var _this = this;
+    var _this2 = this;
 
     return _asyncToGenerator(function* () {
-      if (_this.props.modelData.isAbstract && isNil(_this.inheritanceModelIdNameMap)) {
-        _this.inheritanceModelIdNameMap = yield CmdbObjectApi_getIdMapName({
-          parentObjectId: _this.props.modelData.objectId
+      if (_this2.props.modelData.isAbstract && isNil(_this2.inheritanceModelIdNameMap)) {
+        _this2.inheritanceModelIdNameMap = yield CmdbObjectApi_getIdMapName({
+          parentObjectId: _this2.props.modelData.objectId
         });
       }
 
-      var columns = _this.getChangeColumns(_this.props.fieldIds);
+      var columns = _this2.getChangeColumns(_this2.props.fieldIds);
 
-      _this.setState({
-        columns: _this.getMergedColumns(columns, _this.props.extraColumns)
+      _this2.setState({
+        columns: _this2.getMergedColumns(columns, _this2.props.extraColumns)
       });
     })();
   }
@@ -622,12 +650,12 @@ export class LegacyInstanceListTable extends React.Component {
     } else {
       tempColumns = (instances, record, index) => {
         if (instances && instances.length > 0) {
-          var _objectId = relation["".concat(sides.that, "_object_id")];
-          var nameKeys = getInstanceNameKeys(this.props.idObjectMap[_objectId]);
+          var _objectId2 = relation["".concat(sides.that, "_object_id")];
+          var nameKeys = getInstanceNameKeys(this.props.idObjectMap[_objectId2]);
           var detailUrlTemplate;
 
           if (this.props.detailUrlTemplates) {
-            detailUrlTemplate = getTemplateFromMap(this.props.detailUrlTemplates, _objectId);
+            detailUrlTemplate = getTemplateFromMap(this.props.detailUrlTemplates, _objectId2);
           }
 
           var instanceNodes = instances.map((instance, index) => {
@@ -643,7 +671,7 @@ export class LegacyInstanceListTable extends React.Component {
               var _this$props$separator;
 
               var url = parseTemplate(detailUrlTemplate, _objectSpread(_objectSpread({}, instance), {}, {
-                objectId: _objectId
+                objectId: _objectId2
               }));
               return /*#__PURE__*/React.createElement(React.Fragment, {
                 key: instance.instanceId
@@ -777,7 +805,7 @@ export class LegacyInstanceListTable extends React.Component {
     }, /*#__PURE__*/React.createElement(Table, _extends({
       columns: this.state.columns,
       dataSource: this.props.instanceListData.list,
-      rowKey: "instanceId",
+      rowKey: this.ROM_KEY,
       scroll: {
         x: "max-content"
       },