npm - @next-libs/cmdb-instances - Versions diffs - 7.0.20 → 7.1.0 - Mend

@next-libs/cmdb-instances 7.0.20 → 7.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/cjs/instance-list-table/AdvancedSearchCondition.js CHANGED Viewed

@@ -144,7 +144,7 @@ function AdvancedSearchCondition(props) {
   const conditions = translateAqConditions(state.aqToShow, state.fields);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: _AdvancedSearchConditionModule.default.advancedSearchWrapper
-  }, /*#__PURE__*/_react.default.createElement("div", {
+  }, !(props !== null && props !== void 0 && props.hideDynamicSearch) && /*#__PURE__*/_react.default.createElement("div", {
     style: {
       marginBottom: "18px"
     }

package/dist/cjs/instance-list-table/AdvancedSearchCondition.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AdvancedSearchCondition.js","names":["newKey","fieldIds","aq","key","isEmpty","join","length","reducer","prevState","updatedProperty","formatAqToShow","newAqToShow","forEach","query","aqToShow","Object","entries","map","expressions","newExpressions","LogicalOperators","Or","And","translateAqConditions","fields","conditions","queries","keys","value","values","attr","find","v","id","contain","i18n","t","NS_LIBS_CMDB_INSTANCES","K","OPERATOR_CONTAIN_DEFINE","condition","name","replace","curCondition","attrId","valuesStr","push","AdvancedSearchCondition","props","state","setState","useReducer","undefined","onAdvancedSearch","queriesToShow","fieldToShow","onAdvancedSearchCloseGen","isValueEqual","filterAq","filter","specialQueryHandler","isSpecial","some","formatAqQuery","querys","isAq","isKey","isStart","startsWith","filteredSubQueries","isInstanceFilterForm","styles","advancedSearchWrapper","marginBottom","hideSearchConditions","searchConditions","CURRENT_FILTER_REQUIREMENTS","uniqueId"],"sources":["../../../src/instance-list-table/AdvancedSearchCondition.tsx"],"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"],"mappings":"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"}
1	+ {"version":3,"file":"AdvancedSearchCondition.js","names":["newKey","fieldIds","aq","key","isEmpty","join","length","reducer","prevState","updatedProperty","formatAqToShow","newAqToShow","forEach","query","aqToShow","Object","entries","map","expressions","newExpressions","LogicalOperators","Or","And","translateAqConditions","fields","conditions","queries","keys","value","values","attr","find","v","id","contain","i18n","t","NS_LIBS_CMDB_INSTANCES","K","OPERATOR_CONTAIN_DEFINE","condition","name","replace","curCondition","attrId","valuesStr","push","AdvancedSearchCondition","props","state","setState","useReducer","undefined","onAdvancedSearch","queriesToShow","fieldToShow","onAdvancedSearchCloseGen","isValueEqual","filterAq","filter","specialQueryHandler","isSpecial","some","formatAqQuery","querys","isAq","isKey","isStart","startsWith","filteredSubQueries","isInstanceFilterForm","styles","advancedSearchWrapper","hideDynamicSearch","marginBottom","hideSearchConditions","searchConditions","CURRENT_FILTER_REQUIREMENTS","uniqueId"],"sources":["../../../src/instance-list-table/AdvancedSearchCondition.tsx"],"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 hideDynamicSearch?: boolean;\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 return (\n <div className={styles.advancedSearchWrapper}>\n {!props?.hideDynamicSearch && (\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 )}\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"],"mappings":"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"}

package/dist/esm/instance-list-table/AdvancedSearchCondition.js CHANGED Viewed

@@ -133,7 +133,7 @@ export function AdvancedSearchCondition(props) {
   var conditions = translateAqConditions(state.aqToShow, state.fields);
   return /*#__PURE__*/React.createElement("div", {
     className: styles.advancedSearchWrapper
-  }, /*#__PURE__*/React.createElement("div", {
+  }, !(props !== null && props !== void 0 && props.hideDynamicSearch) && /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: "18px"
     }

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

	@@ -1 +1 @@
1	- {"version":3,"file":"AdvancedSearchCondition.js","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"],"sources":["../../../src/instance-list-table/AdvancedSearchCondition.tsx"],"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"],"mappings":"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"}
1	+ {"version":3,"file":"AdvancedSearchCondition.js","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","hideDynamicSearch","marginBottom","hideSearchConditions","searchConditions","CURRENT_FILTER_REQUIREMENTS"],"sources":["../../../src/instance-list-table/AdvancedSearchCondition.tsx"],"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 hideDynamicSearch?: boolean;\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 return (\n <div className={styles.advancedSearchWrapper}>\n {!props?.hideDynamicSearch && (\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 )}\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"],"mappings":"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"}

package/dist/types/instance-list-table/AdvancedSearchCondition.d.ts CHANGED Viewed

@@ -6,6 +6,7 @@ export interface AdvancedSearchConditionProps {
     isInstanceFilterForm?: boolean;
     aq?: Query[];
     aqToShow?: Query[];
+    hideDynamicSearch?: boolean;
     hideSearchConditions?: boolean;
 }
 export declare const formatAqToShow: (aq: Query[]) => any[];

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@next-libs/cmdb-instances",
-  "version": "7.0.20",
+  "version": "7.1.0",
   "description": "> TODO: description",
   "homepage": "https://github.com/easyops-cn/next-libs/tree/master/libs/cmdb-instances",
   "license": "GPL-3.0",
@@ -50,5 +50,5 @@
     "immutability-helper": "^3.1.1",
     "marked": "^2.1.3"
   },
-  "gitHead": "27b8178e6fa721854a64abece4b93c7c2c2d8d44"
+  "gitHead": "7f68fa2653dca30467ba264bdb9fbaa2a69062d9"
 }