ns-base-module 1.0.31 → 1.0.33

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 (7) hide show
  1. package/dist/ClassFilter/index.d.ts.map +1 -1
  2. package/dist/ClassFilter/index.js +6 -8
  3. package/dist/ClassFilter/util.js +2 -2
  4. package/dist/FilterPopover/Filter.d.ts.map +1 -1
  5. package/dist/FilterPopover/Filter.js +6 -1
  6. package/dist/umd/ns-base-module.min.js +1 -1
  7. package/package.json +1 -1
package/dist/ClassFilter/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,yCAAyC,CAAC;AAKjD,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,CACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAChC,IAAI,CAAC;IACV,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,QAAA,MAAM,KAAK,8BAA+B,YAAY,6BAuHrD,CAAC;AAEF,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,yCAAyC,CAAC;AAKjD,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,CACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAChC,IAAI,CAAC;IACV,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,QAAA,MAAM,KAAK,8BAA+B,YAAY,6BAsHrD,CAAC;AAEF,eAAe,KAAK,CAAC"}
package/dist/ClassFilter/index.js CHANGED
@@ -11,7 +11,7 @@ import { adapterFilter } from "./util";
11
11
  // 分类过滤
12
12
 
13
13
  var Index = function Index(_ref) {
14
- var _props$statusTagItem4;
14
+ var _props$statusTagItem3;
15
15
  var classFilter = _ref.classFilter,
16
16
  props = _objectWithoutProperties(_ref, _excluded);
17
17
  var handleStatus = function handleStatus(item) {
@@ -34,10 +34,8 @@ var Index = function Index(_ref) {
34
34
  return _style;
35
35
  };
36
36
  var loopSetLabel = function loopSetLabel(tree) {
37
- var _props$statusTagItem2;
38
- console.log("props?.statusTagItem?.key", props === null || props === void 0 || (_props$statusTagItem2 = props.statusTagItem) === null || _props$statusTagItem2 === void 0 ? void 0 : _props$statusTagItem2.key);
39
37
  var _loop = function _loop() {
40
- var _props$statusTagItem3, _props$statusTagCount, _props$statusTagCount2;
38
+ var _props$statusTagItem2, _props$statusTagCount, _props$statusTagCount2;
41
39
  var d = tree[i];
42
40
  tree[i].label = /*#__PURE__*/React.createElement("div", {
43
41
  style: {
@@ -47,7 +45,7 @@ var Index = function Index(_ref) {
47
45
  onClick: function onClick() {
48
46
  return handleStatus(d);
49
47
  },
50
- className: "".concat(d.key === (props === null || props === void 0 || (_props$statusTagItem3 = props.statusTagItem) === null || _props$statusTagItem3 === void 0 ? void 0 : _props$statusTagItem3.key) ? "actionMenu" : "")
48
+ className: "".concat(d.key === (props === null || props === void 0 || (_props$statusTagItem2 = props.statusTagItem) === null || _props$statusTagItem2 === void 0 ? void 0 : _props$statusTagItem2.key) ? "actionMenu" : "")
51
49
  }, d.remark && /*#__PURE__*/React.createElement(Tooltip, {
52
50
  title: d.remark
53
51
  }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, {
@@ -80,14 +78,14 @@ var Index = function Index(_ref) {
80
78
  }
81
79
  }
82
80
  return _classFilter;
83
- }, [classFilter, props.statusTagCounts, props === null || props === void 0 || (_props$statusTagItem4 = props.statusTagItem) === null || _props$statusTagItem4 === void 0 ? void 0 : _props$statusTagItem4.key]);
81
+ }, [classFilter, props.statusTagCounts, props === null || props === void 0 || (_props$statusTagItem3 = props.statusTagItem) === null || _props$statusTagItem3 === void 0 ? void 0 : _props$statusTagItem3.key]);
84
82
  if (!classFilter) return null;
85
83
  return /*#__PURE__*/React.createElement("span", {
86
84
  className: "tags-wrap class-filter-component"
87
85
  }, datas === null || datas === void 0 ? void 0 : datas.map(function (item) {
88
- var _props$statusTagItem5, _props$statusTagCount3, _props$statusTagCount4;
86
+ var _props$statusTagItem4, _props$statusTagCount3, _props$statusTagCount4;
89
87
  var baseDom = /*#__PURE__*/React.createElement("span", {
90
- className: "tags-list".concat(" ", item.key === (props === null || props === void 0 || (_props$statusTagItem5 = props.statusTagItem) === null || _props$statusTagItem5 === void 0 ? void 0 : _props$statusTagItem5.key) ? "action" : ""),
88
+ className: "tags-list".concat(" ", item.key === (props === null || props === void 0 || (_props$statusTagItem4 = props.statusTagItem) === null || _props$statusTagItem4 === void 0 ? void 0 : _props$statusTagItem4.key) ? "action" : ""),
91
89
  key: item.key,
92
90
  onClick: function onClick() {
93
91
  return handleStatus(item);
package/dist/ClassFilter/util.js CHANGED
@@ -22,7 +22,7 @@ function getTileParent(item, arr) {
22
22
  //字段名
23
23
  argument: {
24
24
  //查询条件
25
- criteriaType: "In",
25
+ criteriaType: item.fieldType || "In",
26
26
  value: item.value,
27
27
  necessary: true
28
28
  }
@@ -40,7 +40,7 @@ function getSearchObj(_item) {
40
40
  fields: [{
41
41
  field: _item.field,
42
42
  argument: {
43
- criteriaType: "In",
43
+ criteriaType: _item.fieldType || "In",
44
44
  value: isEmpty(_item.value) ? null : _item.value,
45
45
  necessary: true
46
46
  }
package/dist/FilterPopover/Filter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["Filter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAOrC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,2CAA2C,CAAC;AAOnD,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAE1B,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,QAAQ,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAC;IACtD,cAAc,CAAC,EAAE,CACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,MAAM,KACjB,IAAI,CAAC;IACV,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAE1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE/B,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAWD,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CA+chC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["Filter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAOrC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,2CAA2C,CAAC;AAOnD,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAE1B,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,QAAQ,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAC;IACtD,cAAc,CAAC,EAAE,CACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,MAAM,KACjB,IAAI,CAAC;IACV,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAE1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE/B,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAWD,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CAodhC,CAAC;AAEF,eAAe,MAAM,CAAC"}
package/dist/FilterPopover/Filter.js CHANGED
@@ -212,7 +212,7 @@ var Filter = function Filter(props) {
212
212
  searchValue.current = value; // 过滤用 前端过滤时
213
213
 
214
214
  // 枚举 前端搜索label 找出value 给后端搜索
215
- if (dictItems && dictItems.length || !(menuCode && formTemplateCode)) {
215
+ if (dictItems && dictItems.length) {
216
216
  // 找枚举的value
217
217
  if (value) {
218
218
  var _values = [];
@@ -227,6 +227,11 @@ var Filter = function Filter(props) {
227
227
  searchEmnuValue.current = [];
228
228
  }
229
229
  }
230
+ // 编辑表格2 前端过滤
231
+ if (!(menuCode && formTemplateCode)) {
232
+ setSearchval(value); // 搜索用
233
+ return;
234
+ }
230
235
  getDates();
231
236
  };
232
237
  var allChecked = useMemo(function () {