@next-libs/cmdb-instances 6.27.0 → 6.27.1

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

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

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/instance-list-table/DynamicSearch.tsx"],"names":["DynamicSearchForm","React","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","ComparisonOperators","Like","logicalOperator","LogicalOperators","Or","fieldIdToShow","Array","isArray","length","map","push","undefined","q","form","resetFields","computeState","componentDidUpdate","prevProps","newState","setFormFieldValues","fieldQueryOperatorExpressionsMap","query","Object","entries","key","And","firstSubQuery","keys","compareOperator","subQueryValue","targetField","ENABLED_CMDB_ADVANCE_SEARCH_WITH_QUOTE","find","fieldItem","item","join","targetValue","NotLike","includes","slice","v","str","replace","reduce","acc","setFieldsValue","getFields","getFieldDecorator","name","styles","conditionInputGroup","i18n","t","NS_LIBS_CMDB_INSTANCES","K","OPERATOR_CONTAIN_DEFINE","initialValue","ADVANCE_SEARCH_SINGLE_INPUT_PLACEHOLDER","handleValueChange","render","dynamicSearch","dynamicSearchForm","handleSearch","textAlign","SEARCH","marginLeft","handleReset","RESET","DynamicSearch","Form","create"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAEA;;AAMA;;AACA;;AACA;;AACA;;AA0BO,MAAMA,iBAAN,SAAgCC,eAAMC,SAAtC,CAGL;AACAC,EAAAA,WAAW,CAACC,KAAD,EAAgC;AACzC,UAAMA,KAAN;AADyC,yDAyG3B,CAACC,KAAD,EAAaC,UAAb,EAAiCC,UAAjC,KAAwD;AACtE,WAAKC,QAAL,CAAc;AACZC,QAAAA,MAAM,EAAE,iCAAO,KAAKC,KAAL,CAAWD,MAAlB,EAA0B;AAChC,WAACH,UAAD,GAAc;AAAEK,YAAAA,MAAM,EAAE;AAAE,eAACJ,UAAD,GAAc;AAAEK,gBAAAA,IAAI,EAAEP;AAAR;AAAhB;AAAV;AADkB,SAA1B;AADI,OAAd;AAKD,KA/G0C;AAAA,6DAgJvB,CAACQ,CAAD,EAASP,UAAT,KAAgC;AAClD,WAAKQ,aAAL,CAAmBD,CAAC,CAACE,MAAF,CAASV,KAA5B,EAAmCC,UAAnC,EAA+C,CAA/C;AACD,KAlJ0C;AAAA,wDAoJ3BO,CAAD,IAA6B;AAC1CA,MAAAA,CAAC,CAACG,cAAF;;AACA,UAAI,KAAKZ,KAAL,CAAWa,QAAf,EAAyB;AACvB,YAAIC,OAAgB,GAAG,EAAvB;AACA,YAAIC,aAAsB,GAAG,EAA7B;AACA,cAAMC,WAAoC,GAAG,EAA7C;AACA,aAAKV,KAAL,CAAWD,MAAX,CAAkBY,OAAlB,CAA2BC,KAAD,IAAW;AACnC,gBAAMC,WAAqC,GAAG,EAA9C;AACA,gBAAMC,OAAO,GAAGF,KAAK,CAACG,EAAtB;AACA,cAAIC,UAAiB,GAAG;AAAE,aAACF,OAAD,GAAWD;AAAb,WAAxB;AACA,cAAII,gBAAuB,GAAG;AAAE,aAACH,OAAD,GAAWD;AAAb,WAA9B;AACA,cAAIK,QAAQ,GAAG,KAAf;AACA,gBAAMC,QAAQ,GAAG;AACfC,YAAAA,kBAAkB,EAAEC,+BAAoBC,IADzB;AAEfC,YAAAA,eAAe,EAAEC,4BAAiBC;AAFnB,WAAjB;AAIAb,UAAAA,KAAK,CAACX,MAAN,CAAaU,OAAb,CAAsBhB,KAAD,IAAW;AAC9BqB,YAAAA,UAAU,GAAG;AAAE,eAACJ,KAAK,CAACG,EAAP,GAAYF;AAAd,aAAb;AACA,kBAAMa,aAAa,GAAGd,KAAK,CAACG,EAA5B;AACAE,YAAAA,gBAAgB,GAAG;AAAE,eAACS,aAAD,GAAiBb;AAAnB,aAAnB;;AACA,gBACElB,KAAK,KAAK,IAAV,IACAA,KAAK,KAAK,EADV,IAEA,EAAEgC,KAAK,CAACC,OAAN,CAAcjC,KAAd,KAAwBA,KAAK,CAACkC,MAAN,KAAiB,CAA3C,CAHF,EAIE;AACA,kBAAI5B,MAAJ;;AACA,kBAAI,OAAON,KAAP,KAAiB,QAArB,EAA+B;AAC7BM,gBAAAA,MAAM,GAAG,2CAA0BN,KAA1B,EAAiC,EAAjC,CAAT;AACD;;AACD,kBAAIM,MAAM,CAAC4B,MAAX,EAAmB;AACjBb,gBAAAA,UAAU,GAAG;AACX,mBAACG,QAAQ,CAACI,eAAV,GAA4BtB,MAAM,CAAC6B,GAAP,CAAYnC,KAAD,IAAW;AAChD,2BAAO;AACL,uBAACmB,OAAD,GAAW;AACT,yBAACK,QAAQ,CAACC,kBAAV,GAAgC,IAAGzB,KAAM;AADhC;AADN,qBAAP;AAKD,mBAN2B;AADjB,iBAAb;AASD;;AACDsB,cAAAA,gBAAgB,GAAG;AACjB,iBAACE,QAAQ,CAACI,eAAV,GAA4BtB,MAAM,CAAC6B,GAAP,CAAYnC,KAAD,IAAW;AAChD,yBAAO;AACL,qBAAC+B,aAAD,GAAiB;AACf,uBAACP,QAAQ,CAACC,kBAAV,GAAgC,IAAGzB,KAAM;AAD1B;AADZ,mBAAP;AAKD,iBAN2B;AADX,eAAnB;AASAuB,cAAAA,QAAQ,GAAG,IAAX;AACAR,cAAAA,WAAW,CAACqB,IAAZ,CAAiB;AAAE,iBAACnB,KAAK,CAACG,EAAP,GAAYH,KAAK,CAACX;AAApB,eAAjB;AACD;AACF,WApCD;;AAqCA,cAAIiB,QAAJ,EAAc;AACZV,YAAAA,OAAO,CAACuB,IAAR,CAAaf,UAAb;AACAP,YAAAA,aAAa,CAACsB,IAAd,CAAmBd,gBAAnB;AACD;AACF,SAnDD;;AAoDA,YAAIT,OAAO,CAACqB,MAAR,KAAmB,CAAvB,EAA0B;AACxBrB,UAAAA,OAAO,GAAGwB,SAAV;AACAvB,UAAAA,aAAa,GAAGuB,SAAhB;AACD;;AACD,YAAI,CAAC,qBAAQ,KAAKtC,KAAL,CAAWuC,CAAnB,EAAsBzB,OAAtB,CAAL,EAAqC;AACnC,eAAKd,KAAL,CAAWa,QAAX,CAAoBC,OAApB,EAA6BC,aAA7B,EAA4CC,WAA5C;AACD;AACF;AACF,KAtN0C;AAAA,uDAwN7B,MAAM;AAClB,WAAKhB,KAAL,CAAWa,QAAX,CAAoB,EAApB,EAAwB,EAAxB,EAA4B,EAA5B;AACA,WAAKb,KAAL,CAAWwC,IAAX,CAAgBC,WAAhB;AACD,KA3N0C;AAGzC,SAAKnC,KAAL,GAAa,KAAKoC,YAAL,EAAb;AACD;;AAEDC,EAAAA,kBAAkB,CAACC,SAAD,EAAoD;AACpE,QAAI,CAAC,qBAAQ,KAAK5C,KAAL,CAAWuC,CAAnB,EAAsBK,SAAS,CAACL,CAAhC,CAAL,EAAyC;AACvC,YAAMM,QAAQ,GAAG,KAAKH,YAAL,EAAjB;AACA,WAAKtC,QAAL,CAAcyC,QAAd;AACA,WAAKC,kBAAL,CAAwBD,QAAQ,CAACxC,MAAjC;AACD;AACF;;AAEDqC,EAAAA,YAAY,GAAwB;AAClC,UAAMK,gCAGL,GAAG,EAHJ;AAIA,QAAI1C,MAAe,GAAG,EAAtB;;AACA,QAAI,KAAKL,KAAL,CAAWuC,CAAf,EAAkB;AAChB,WAAKvC,KAAL,CAAWuC,CAAX,CAAatB,OAAb,CAAsB+B,KAAD,IAAW;AAC9BC,QAAAA,MAAM,CAACC,OAAP,CAAeF,KAAf,EAAsB/B,OAAtB,CAA8B,CAAC,CAACkC,GAAD,EAAMhC,WAAN,CAAD,KAAwB;AACpD,cAAIgC,GAAG,KAAKrB,4BAAiBC,EAAzB,IAA+BoB,GAAG,KAAKrB,4BAAiBsB,GAA5D,EAAiE;AAC/D,kBAAMC,aAAa,GAAIlC,WAAD,CAAyB,CAAzB,CAAtB;AACA,kBAAMC,OAAO,GAAG6B,MAAM,CAACK,IAAP,CAAYD,aAAZ,EAA2B,CAA3B,CAAhB;AACA,kBAAME,eAAe,GAAGN,MAAM,CAACK,IAAP,CAAYD,aAAa,CAACjC,OAAD,CAAzB,EAAoC,CAApC,CAAxB;AACA,gBAAIoC,aAAa,GAAG,EAApB;AACA,gBAAIC,WAAJ;;AACA,gBAAIC,kDAAJ,EAA4C;AAAA;;AAC1CD,cAAAA,WAAW,4BAAG,KAAKzD,KAAL,CAAWgB,WAAd,0DAAG,sBAAwB2C,IAAxB,CACXC,SAAD,IAAeX,MAAM,CAACK,IAAP,CAAYM,SAAZ,EAAuB,CAAvB,MAA8BxC,OADjC,CAAd;AAGD;;AACD,gBAAI,CAAC,mBAAMqC,WAAN,CAAL,EAAyB;AACvB;AACAD,cAAAA,aAAa,GAAG,qBAAQC,WAAW,CAACrC,OAAD,CAAnB,IACZqC,WAAW,CAACrC,OAAD,CAAX,CACGgB,GADH,CACQyB,IAAD,IAAW,qBAAQA,IAAR,IAAgBA,IAAI,CAACC,IAAL,CAAU,GAAV,CAAhB,GAAiCD,IADnD,EAEGC,IAFH,CAEQ,EAFR,CADY,GAIXL,WAAW,CAACrC,OAAD,CAJhB;AAKD,aAPD,MAOO;AACLoC,cAAAA,aAAa,GAAIrC,WAAD,CACbiB,GADa,CACRY,KAAD,IAAW;AACd,sBAAMe,WAAW,GACff,KAAK,CAAC5B,OAAD,CADa,CAElBmC,eAFkB,CAApB;;AAGA,oBACEA,eAAe,KAAK5B,+BAAoBC,IAAxC,IACA2B,eAAe,KAAK5B,+BAAoBqC,OAF1C,EAGE;AACA,yBAAO,sBAASD,WAAT,KAAyBA,WAAW,CAACE,QAAZ,CAAqB,GAArB,CAAzB,GACF,GAAEF,WAAW,CAAC,CAAD,CAAI,IAAGA,WAAW,CAACG,KAAZ,CACnB,CADmB,EAEnBH,WAAW,CAAC5B,MAAZ,GAAqB,CAFF,CAGnB,IAAG4B,WAAW,CAACA,WAAW,CAAC5B,MAAZ,GAAqB,CAAtB,CAAyB,EAJtC,GAKH4B,WALJ;AAMD,iBAVD,MAUO;AACL,yBAAO,sBAASA,WAAT,KAAyBA,WAAW,CAACE,QAAZ,CAAqB,GAArB,CAAzB,GACF,IAAGF,WAAY,GADb,GAEHA,WAFJ;AAGD;AACF,eApBa,EAqBbD,IArBa,CAqBR,GArBQ,CAAhB;AAsBD;;AACDX,YAAAA,GAAG,GAAG/B,OAAN;AACAD,YAAAA,WAAW,GAAG;AACZ,eAACoC,eAAD,GAAmBC;AADP,aAAd;AAGD;;AAEDT,UAAAA,gCAAgC,CAACI,GAAD,CAAhC,GACEhC,WADF;AAED,SAnDD;AAoDD,OArDD;AAsDD;;AACD,QAAI,KAAKnB,KAAL,CAAWK,MAAf,EAAuB;AACrBA,MAAAA,MAAM,GAAG,KAAKL,KAAL,CAAWK,MAAX,CAAkB+B,GAAlB,CACN+B,CAAD,KAAQ,EAAE,GAAGA,CAAL;AAAQ5D,QAAAA,MAAM,EAAE,CAAC,IAAD;AAAhB,OAAR,CADO,CAAT;;AAGA,UAAI,CAAC,qBAAQwC,gCAAR,CAAL,EAAgD;AAC9C1C,QAAAA,MAAM,GAAG,KAAKL,KAAL,CAAWK,MAAX,CAAkB+B,GAAlB,CAAuB+B,CAAD,IAAO;AACpC,cAAIC,GAAQ,GAAG,IAAf;;AACA,cAAIrB,gCAAgC,CAACoB,CAAC,CAAC9C,EAAH,CAApC,EAA4C;AAC1C,kBAAMF,WAAW,GAAG4B,gCAAgC,CAACoB,CAAC,CAAC9C,EAAH,CAAhC,CAAuC,OAAvC,CAApB;AACA+C,YAAAA,GAAG,GAAGjD,WAAW,CAACkD,OAAZ,CAAoB,IAApB,EAA0B,EAA1B,CAAN;AACD;;AACD,iBAAO,EACL,GAAGF,CADE;AAEL5D,YAAAA,MAAM,EAAE,CAAC6D,GAAD;AAFH,WAAP;AAID,SAVQ,CAAT;AAWD;AACF;;AACD,WAAO;AAAE/D,MAAAA;AAAF,KAAP;AACD;;AAEDyC,EAAAA,kBAAkB,CAACzC,MAAD,EAAwB;AACxC,UAAME,MAAM,GAAGF,MAAM,CAACiE,MAAP,CAAsC,CAACC,GAAD,EAAMrD,KAAN,KAAgB;AACnEqD,MAAAA,GAAG,CAAE,GAAErD,KAAK,CAACG,EAAG,EAAb,CAAH,GAAqBH,KAAK,CAACX,MAAN,CAAauD,IAAb,CAAkB,EAAlB,CAArB;AACA,aAAOS,GAAP;AACD,KAHc,EAGZ,EAHY,CAAf;AAIA,SAAKvE,KAAL,CAAWwC,IAAX,CAAgBgC,cAAhB,CAA+BjE,MAA/B;AACD;;AAUDkE,EAAAA,SAAS,GAAG;AACV,UAAM;AAAEC,MAAAA;AAAF,QAAwB,KAAK1E,KAAL,CAAWwC,IAAzC;AACA,WAAO,KAAKlC,KAAL,CAAWD,MAAX,CAAkB+B,GAAlB,CAAsB,CAAClB,KAAD,EAAQhB,UAAR,KAAuB;AAClD,0BACE,6BAAC,SAAD;AAAK,QAAA,IAAI,EAAE,EAAX;AAAe,QAAA,GAAG,EAAEgB,KAAK,CAACG;AAA1B,sBACE,6BAAC,gBAAD,CAAM,IAAN;AAAW,QAAA,KAAK,EAAEH,KAAK,CAACyD;AAAxB,sBACE,6BAAC,WAAD,CAAO,KAAP;AAAa,QAAA,SAAS,EAAEC,6BAAOC,mBAA/B;AAAoD,QAAA,OAAO;AAA3D,sBACE,6BAAC,YAAD;AAAQ,QAAA,wBAAwB,EAAE,KAAlC;AAAyC,QAAA,YAAY,EAAE;AAAvD,sBACE,6BAAC,YAAD,CAAQ,MAAR;AAAe,QAAA,KAAK,EAAE,SAAtB;AAAiC,QAAA,GAAG,EAAE;AAAtC,SACGC,iBAAKC,CAAL,CACE,GAAEC,iCAAuB,IAAGC,aAAEC,uBAAwB,EADxD,CADH,CADF,CADF,EAQGR,iBAAiB,CAAE,GAAExD,KAAK,CAACG,EAAG,EAAb,EAAgB;AAChC8D,QAAAA,YAAY,EAAEjE,KAAK,CAACX,MAAN,IAAgB;AADE,OAAhB,CAAjB,eAGC,6BAAC,WAAD;AACE,QAAA,WAAW,EAAEuE,iBAAKC,CAAL,CACV,GAAEC,iCAAuB,IAAGC,aAAEG,uCAAwC,EAD5D,CADf;AAIE,QAAA,QAAQ,EAAG3E,CAAD,IAAO,KAAK4E,iBAAL,CAAuB5E,CAAvB,EAA0BP,UAA1B;AAJnB,QAHD,CARH,CADF,CADF,CADF;AAyBD,KA1BM,CAAP;AA2BD;;AA+EDoF,EAAAA,MAAM,GAAoB;AACxB,wBACE;AAAK,MAAA,SAAS,EAAEV,6BAAOW;AAAvB,oBACE,6BAAC,gBAAD;AACE,MAAA,MAAM,EAAC,UADT;AAEE,MAAA,SAAS,EAAEX,6BAAOY,iBAFpB;AAGE,MAAA,QAAQ,EAAE,KAAKC;AAHjB,oBAKE,6BAAC,SAAD;AAAK,MAAA,MAAM,EAAE;AAAb,OAAkB,KAAKhB,SAAL,EAAlB,CALF,eAME,6BAAC,SAAD,qBACE,6BAAC,SAAD;AAAK,MAAA,IAAI,EAAE,EAAX;AAAe,MAAA,KAAK,EAAE;AAAEiB,QAAAA,SAAS,EAAE;AAAb;AAAtB,oBACE,6BAAC,YAAD;AACE,MAAA,IAAI,EAAC,SADP;AAEE,MAAA,QAAQ,EAAC,QAFX;AAGE,qBAAY;AAHd,OAKGZ,iBAAKC,CAAL,CAAQ,GAAEC,iCAAuB,IAAGC,aAAEU,MAAO,EAA7C,CALH,CADF,eAQE,6BAAC,YAAD;AACE,MAAA,KAAK,EAAE;AAAEC,QAAAA,UAAU,EAAE;AAAd,OADT;AAEE,MAAA,OAAO,EAAE,KAAKC,WAFhB;AAGE,qBAAY;AAHd,OAKGf,iBAAKC,CAAL,CAAQ,GAAEC,iCAAuB,IAAGC,aAAEa,KAAM,EAA5C,CALH,CARF,CADF,CANF,CADF,CADF;AA6BD;;AA5PD;;;;AA+PK,MAAMC,aAAa,GAAGC,iBAAKC,MAAL,CAAoC;AAC/DtB,EAAAA,IAAI,EAAE;AADyD,CAApC,EAE1B/E,iBAF0B,CAAtB","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/AdvancedSearchCondition.js

@@ -1,14 +1,11 @@
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
-import React, { useMemo, useReducer } from "react";
+import React, { useReducer } from "react";
 import i18n from "i18next";
 import { K, NS_LIBS_CMDB_INSTANCES } from "../i18n/constants";
-import { getRelationObjectSides, getInstanceNameKeys, isSelfRelation, ElementOperators } from "@next-libs/cmdb-utils";
-import { CMDB_MODAL_FIELDS_SETTINGS, CMDB_RESOURCE_FIELDS_SETTINGS } from "./constants";
-import { changeQueryWithCustomRules } from "../processors";
-import { initAqToShow } from "../instance-list/InstanceList";
-import { difference, isEmpty, isEqual, isString, map, uniq, filter, reject, sortBy, uniqueId, findIndex, find, startsWith, omit } from "lodash";
+import { LogicalOperators } from "@next-libs/cmdb-utils";
+import { DynamicSearch } from "./DynamicSearch";
+import { isEmpty, uniqueId, startsWith } from "lodash";
 import { Tag } from "antd";
-import { AdvancedSearch, ConditionType, getFieldConditionsAndValues } from "./AdvancedSearch";
 import styles from "./AdvancedSearchCondition.module.css";
 
 /* istanbul ignore next */
@@ -32,97 +29,55 @@ var reducer = (prevState, updatedProperty) => {
   return _objectSpread(_objectSpread({}, prevState), updatedProperty);
 };
 
-function translateConditions(aq, idObjectMap, modelData, t) {
-  var conditions = [];
-  var relations = [];
-  modelData.relation_list.forEach(relation => {
-    var sidesArr = [];
-
-    if (isSelfRelation(relation)) {
-      sidesArr = [{
-        this: "left",
-        that: "right"
-      }, {
-        this: "right",
-        that: "left"
-      }];
-    } else {
-      sidesArr = [getRelationObjectSides(relation, modelData)];
-    }
+export var formatAqToShow = aq => {
+  var newAqToShow = [];
 
-    sidesArr.forEach(sides => {
-      var objectId = relation["".concat(sides.this, "_id")];
-      var relationObject = idObjectMap[relation["".concat(sides.that, "_object_id")]];
-      var nameKeys = getInstanceNameKeys(relationObject);
-      nameKeys.forEach(nameKey => {
-        var _find$name, _find;
+  if (aq) {
+    aq.forEach(query => {
+      var aqToShow = Object.entries(query).map(_ref => {
+        var [key, expressions] = _ref;
+        var newExpressions = [];
 
-        var nameOfNameKey = (_find$name = (_find = find(relationObject === null || relationObject === void 0 ? void 0 : relationObject.attrList, ["id", nameKey])) === null || _find === void 0 ? void 0 : _find.name) !== null && _find$name !== void 0 ? _find$name : nameKey;
-        var id = "".concat(objectId, ".").concat(nameKey);
-        var name = "".concat(relation["".concat(sides.this, "_name")], "(").concat(nameOfNameKey, ")");
-        relations.push({
-          id,
-          name,
-          value: {
-            type: "str"
-          },
-          relationSideId: relation["".concat(sides.this, "_id")]
-        });
-      });
-      relations.push({
-        id: "".concat(objectId, "."),
-        name: "".concat(relation["".concat(sides.this, "_name")]),
-        value: {
-          type: "str"
-        },
-        relationSideId: relation["".concat(sides.this, "_id")]
+        if (key === LogicalOperators.Or || key === LogicalOperators.And) {
+          newExpressions = [...newExpressions, ...expressions];
+          return {
+            [key]: newExpressions
+          };
+        } else {
+          return query;
+        }
       });
+      newAqToShow = [...newAqToShow, ...aqToShow];
     });
-  });
-  var attrAndRelationList = [...modelData.attrList, ...relations];
+    return newAqToShow;
+  }
+
+  return newAqToShow;
+};
+
+function translateAqConditions(aq, fields) {
+  var conditions = [];
 
   if (!isEmpty(aq)) {
     for (var query of aq) {
       var _queries = [query];
 
-      if (Object.keys(query)[0] === "$or" || Object.keys(query)[0] === "$and") {
+      if (Object.keys(query)[0] === LogicalOperators.Or || Object.keys(query)[0] === LogicalOperators.And) {
         _queries = query[Object.keys(query)[0]];
       }
 
       _queries.forEach(query => {
         var key = Object.keys(query)[0];
         var value = Object.values(query)[0];
-        var attr = attrAndRelationList.find(attr => attr.id === key || attr.relationSideId === key);
-
-        if (Object.keys(value)[0] === ElementOperators.Exists && attr.relationSideId) {
-          var relationSideId = attr.relationSideId;
-          attr = attrAndRelationList.find(attr => attr.id === "".concat(relationSideId, ".")) || attr;
-        }
-
-        if (attr) {
-          query = changeQueryWithCustomRules(modelData.objectId, attr.id, query);
-          var info = getFieldConditionsAndValues(query, key, attr.value.type, undefined, undefined, modelData.objectId, attr.id);
-
-          if (![ConditionType.Between, ConditionType.Empty, ConditionType.NotEmpty, ConditionType.False, ConditionType.True].includes(info.currentCondition.type)) {
-            info.values = info.values.map(v => isString(v) && v.includes(" ") ? v.replace(/^"+|"+$/g, "") : v);
-          }
-
-          var condition = "".concat(attr.name, ": ").concat(info.currentCondition.label);
-
-          if (![ConditionType.Empty, ConditionType.NotEmpty].includes(info.currentCondition.type)) {
-            condition += "\"".concat(info.values.join(" ~ "), "\"");
-          }
-
-          var curCondition = {
-            attrId: key,
-            condition,
-            valuesStr: info.queryValuesStr
-          };
-
-          if (conditions.every(v => !isEqual(omit(v, "attrId"), omit(curCondition, "attrId")))) {
-            conditions.push(curCondition);
-          }
-        }
+        var attr = fields.find(v => v.id === key);
+        var contain = i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.OPERATOR_CONTAIN_DEFINE));
+        var condition = "".concat(attr === null || attr === void 0 ? void 0 : attr.name, ":").concat(contain, "\"").concat(Object.values(value)[0].replace(/%/g, ""), "\"");
+        var curCondition = {
+          attrId: key,
+          condition,
+          valuesStr: Object.values(value)[0]
+        };
+        conditions.push(curCondition);
       });
     }
   }
@@ -131,87 +86,11 @@ function translateConditions(aq, idObjectMap, modelData, t) {
 }
 
 export function AdvancedSearchCondition(props) {
-  var {
-    modelData,
-    idObjectMap
-  } = useMemo(() => {
-    var modelData;
-    var idObjectMap = {};
-    props.objectList.forEach(object => {
-      idObjectMap[object.objectId] = object;
-
-      if (object.objectId === props.objectId) {
-        modelData = object;
-        modelData.attrList = object.attrList;
-      }
-    });
-    return {
-      modelData,
-      idObjectMap
-    };
-  }, [props.objectList, props.objectId]);
-
-  var computeDefaultFields = function () {
-    var {
-      inModal
-    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-      inModal: false
-    };
-    // 原来有隐藏逻辑，针对 APP、HOST、USER、USER_GROUP模型，默认字段特殊处理了，现产品要求干掉，统一取8个默认字段，也不区分是否是内置模型
-    var settings = inModal ? CMDB_MODAL_FIELDS_SETTINGS : CMDB_RESOURCE_FIELDS_SETTINGS;
-    var ignoredFields = settings.ignoredFields[modelData.objectId] || [];
-    var fieldIds = difference(uniq(map(modelData.attrList, "id")), ignoredFields).slice(0, 8);
-    var hideModelData = modelData.view.hide_columns || [];
-    fieldIds = fieldIds.filter(field => !hideModelData.includes(field));
-    return {
-      fieldIds
-    };
-  }; // 根据用户预定义的 presetConfigs.fieldIds 进行排序，如果不在预定义的字段，则根据 modelData.view.attr_order 进行排序
-
-
-  var _sortFieldIds = fieldIds => {
-    var _props$fieldIds;
-
-    var frontFields = [];
-    var restFields = [];
-
-    if ((_props$fieldIds = props.fieldIds) !== null && _props$fieldIds !== void 0 && _props$fieldIds.length) {
-      frontFields = filter(props.fieldIds, id => fieldIds.includes(id));
-    }
-
-    restFields = sortBy(reject(fieldIds, id => frontFields.includes(id)), fieldId => {
-      var foundIndex = findIndex(modelData.view.attr_order, orderId => orderId === fieldId);
-
-      if (foundIndex === -1) {
-        return null;
-      } else {
-        return foundIndex;
-      }
-    });
-    return [...frontFields, ...restFields];
-  };
-
-  var getFields = () => {
-    var _fieldIds;
-
-    var fieldIds = props.fieldIds;
-
-    if (!((_fieldIds = fieldIds) !== null && _fieldIds !== void 0 && _fieldIds.length)) {
-      fieldIds = computeDefaultFields().fieldIds;
-    }
-
-    fieldIds = _sortFieldIds(fieldIds);
-    var hideModelData = modelData.view.hide_columns || [];
-    fieldIds = fieldIds.filter(field => !hideModelData.includes(field));
-    modelData.isAbstract && fieldIds.push("_object_id");
-    return fieldIds;
-  };
-
   var [state, setState] = useReducer(reducer, undefined, () => ({
-    objectId: props.objectId,
-    aq: initAqToShow(props.aq, modelData, false),
-    aqToShow: props.aqToShow || initAqToShow(props.aq, modelData),
-    fieldIds: getFields()
+    aq: formatAqToShow(props.aq),
+    aqToShow: props.aqToShow || formatAqToShow(props.aq),
+    fieldIds: (props.fields || []).map(v => v.id),
+    fields: props.fields || []
   }));
 
   var onAdvancedSearch = (queries, queriesToShow, fieldToShow) => {
@@ -224,6 +103,8 @@ export function AdvancedSearchCondition(props) {
     });
     (_props$onAdvancedSear = props.onAdvancedSearch) === null || _props$onAdvancedSear === void 0 ? void 0 : _props$onAdvancedSear.call(props, queries);
   };
+  /* istanbul ignore next */
+
 
   var onAdvancedSearchCloseGen = (attrId, valuesStr) => {
     return () => {
@@ -247,40 +128,30 @@ export function AdvancedSearchCondition(props) {
         queries.push(query);
       };
 
-      state.aq.forEach(query => {
-        var key = Object.keys(query)[0];
-
-        if ((key === "$or" || key === "$and") && Object.keys(query[key][0])[0] === attrId) {
-          var filteredSubQueries = filterAq(query[key]);
-
-          if (filteredSubQueries.length > 0) {
-            queries.push({
-              [key]: filteredSubQueries
-            });
+      var formatAqQuery = (querys, queries, isAq) => {
+        querys.forEach(query => {
+          var key = Object.keys(query)[0];
+          var isKey = key !== attrId;
+          var isStart = isAq ? isKey && !startsWith(attrId, "".concat(key, ".")) : isKey;
+
+          if ((key === "$or" || key === "$and") && Object.keys(query[key][0])[0] === attrId) {
+            var filteredSubQueries = filterAq(query[key]);
+
+            if (filteredSubQueries.length > 0) {
+              queries.push({
+                [key]: filteredSubQueries
+              });
+            }
+          } else if (isStart) {
+            queries.push(query);
+          } else if (props.isInstanceFilterForm && key === attrId && isValueEqual(query)) {
+            specialQueryHandler(query, key, queries);
           }
-        } else if (key !== attrId && !startsWith(attrId, "".concat(key, "."))) {
-          queries.push(query);
-        } else if (props.isInstanceFilterForm && key === attrId && isValueEqual(query)) {
-          specialQueryHandler(query, key, queries);
-        }
-      });
-      state.aqToShow.forEach(query => {
-        var key = Object.keys(query)[0];
-
-        if ((key === "$or" || key === "$and") && Object.keys(query[key][0])[0] === attrId) {
-          var filteredSubQueries = filterAq(query[key]);
+        });
+      };
 
-          if (filteredSubQueries.length > 0) {
-            queriesToShow.push({
-              [key]: filteredSubQueries
-            });
-          }
-        } else if (key !== attrId) {
-          queriesToShow.push(query);
-        } else if (props.isInstanceFilterForm && key === attrId && isValueEqual(query)) {
-          specialQueryHandler(query, key, queriesToShow);
-        }
-      });
+      formatAqQuery(state.aq, queries, true);
+      formatAqQuery(state.aqToShow, queriesToShow, false);
       setState({
         aq: queries,
         aqToShow: queriesToShow
@@ -289,21 +160,19 @@ export function AdvancedSearchCondition(props) {
     };
   };
 
-  var conditions = translateConditions(state.aqToShow, idObjectMap, modelData);
+  var conditions = translateAqConditions(state.aqToShow, state.fields);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.advancedSearchWrapper
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "18px"
     }
-  }, /*#__PURE__*/React.createElement(AdvancedSearch, {
-    modelData: modelData,
-    idObjectMap: idObjectMap,
+  }, /*#__PURE__*/React.createElement(DynamicSearch, {
+    fields: state.fields,
+    onSearch: onAdvancedSearch,
     key: newKey(state.fieldIds, state.aq),
-    fieldIds: state.fieldIds,
     q: state.aqToShow,
-    fieldToShow: state.fieldToShow,
-    onSearch: onAdvancedSearch
+    fieldToShow: state.fieldToShow
   })), !props.hideSearchConditions && !isEmpty(conditions) && /*#__PURE__*/React.createElement("div", {
     className: styles.searchConditions
   }, /*#__PURE__*/React.createElement("span", null, i18n.t("".concat(NS_LIBS_CMDB_INSTANCES, ":").concat(K.CURRENT_FILTER_REQUIREMENTS))), conditions.map(condition => /*#__PURE__*/React.createElement(Tag, {