ns-base-module 1.0.18 → 1.0.20

package/README.md

@@ -13,8 +13,8 @@
 ```
 npm unlink
 npm run build:watch
-npm link
+yarn link // npm link 经常丢链接
 
 在需要引入的项目中ns-rams-ui运行：
-npm link ns-base-module
+yarn link ns-base-module
 ```

package/dist/FilterPopover/Filter.d.ts.map

@@ -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,CAqbhC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"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,CAsbhC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/FilterPopover/Filter.js

@@ -24,7 +24,7 @@ import InfiniteScroll from "react-infinite-scroll-component";
 import Checkbox from "../Entry/components/Checkbox";
 import Input from "../Entry/components/Input";
 import CopyCol from "../CopyCol";
-import { cloneDeep, get } from "lodash";
+import { cloneDeep, flattenDeep, get } from "lodash";
 import "../../style/components/FilterPopover.scss";
 import { initLang } from "../utils/language";
 // import request from "../utils/request";
@@ -251,7 +251,8 @@ var Filter = function Filter(props) {
     // const haDict = entryType === "MultSelect" || entryType === "Select";
     var haDict = dictItems && dictItems.length;
     if (haDict && lastChecked.length && dictItems) {
-      lastChecked.forEach(function (item) {
+      var _lastChecked = flattenDeep(lastChecked);
+      _lastChecked.forEach(function (item) {
         for (var i = 0, l = dictItems.length; i < l; i++) {
           if (dictItems[i].label === item) {
             multChecked.push(dictItems[i].value);

package/dist/TableHeaderConfigPopover/index.d.ts

@@ -12,6 +12,7 @@ interface Icolumns {
     request: any;
     saveColumn: any;
     crossQuery?: Boolean;
+    init: boolean;
 }
 interface IProps extends Icolumns {
     menuCode: string;

package/dist/TableHeaderConfigPopover/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AA8BA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,sDAAsD,CAAC;AAK9D,UAAU,QAAQ;IAChB,OAAO,EAAE,GAAG,CAAC;IACb,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACtC,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;IAC5D,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AACD,UAAU,MAAO,SAAQ,QAAQ;IAC/B,QAAQ,EAAE,MAAM,CAAC;CAClB;AA6+BD,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAc3B,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AA8BA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,sDAAsD,CAAC;AAK9D,UAAU,QAAQ;IAChB,OAAO,EAAE,GAAG,CAAC;IACb,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACtC,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;IAC5D,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;CACf;AACD,UAAU,MAAO,SAAQ,QAAQ;IAC/B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAi/BD,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAmD3B,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/dist/TableHeaderConfigPopover/index.js

@@ -45,7 +45,8 @@ import { initColumns, sortColums } from "./utils";
 var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
   var columns = props.columns,
     updateColumns = props.updateColumns,
-    newColumns = props.newColumns;
+    newColumns = props.newColumns,
+    init = props.init;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     columnsTree = _useState2[0],
@@ -771,6 +772,10 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
                   _template.push(item);
                 }
                 if (item.is_default === "Y") {
+                  // if (props.init) {
+                  //   props.updateColumns(JSON.parse(item.define));
+                  // }
+
                   setValue(item.value);
                   setCurItem(item);
                 }
@@ -1133,7 +1138,64 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
 };
 var Index = function Index(_ref9) {
   var props = Object.assign({}, (_objectDestructuringEmpty(_ref9), _ref9));
-  return /*#__PURE__*/React.createElement(Popover, {
+  useEffect(function () {
+    if (props.init) {
+      getColumnsFilter();
+    }
+  }, []);
+  var getColumnsFilter = /*#__PURE__*/function () {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var _res3;
+      var res, _res4, _templateUser, _template;
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
+          case 0:
+            res = {}; // debugger;
+            if (!(props !== null && props !== void 0 && props.request)) {
+              _context7.next = 8;
+              break;
+            }
+            _context7.next = 4;
+            return props === null || props === void 0 ? void 0 : props.request();
+          case 4:
+            res = _context7.sent;
+            res = {
+              data: {
+                data: res
+              }
+            };
+            _context7.next = 11;
+            break;
+          case 8:
+            _context7.next = 10;
+            return queryColumnsConfig({
+              menuCode: props.menuCode,
+              formTemplateCode: props.formTemplateCode,
+              queryType: props.crossQuery ? "cross" : "list"
+            });
+          case 10:
+            res = _context7.sent;
+          case 11:
+            if ((_res3 = res) !== null && _res3 !== void 0 && (_res3 = _res3.data) !== null && _res3 !== void 0 && _res3.data) {
+              _templateUser = [];
+              _template = [];
+              (_res4 = res) === null || _res4 === void 0 || (_res4 = _res4.data) === null || _res4 === void 0 || _res4.data.forEach(function (item) {
+                if (item.is_default === "Y") {
+                  props.updateColumns(JSON.parse(item.define));
+                }
+              });
+            }
+          case 12:
+          case "end":
+            return _context7.stop();
+        }
+      }, _callee7);
+    }));
+    return function getColumnsFilter() {
+      return _ref10.apply(this, arguments);
+    };
+  }();
+  return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Popover, {
     placement: "bottomLeft",
     trigger: "click",
     title: "",
@@ -1145,6 +1207,6 @@ var Index = function Index(_ref9) {
     })
   }, /*#__PURE__*/React.createElement(SettingOutlined, {
     className: "icon-button-wrapper"
-  })));
+  }))));
 };
 export default Index;

package/dist/TableHeaderConfigPopover/updateColumns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateColumns.d.ts","sourceRoot":"","sources":["updateColumns.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,aAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,GAAG,CAAC;IACb,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;CACtD,CAAC;AAEF,QAAA,MAAM,KAAK,UAAW,aAAa,sBAoBlC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"updateColumns.d.ts","sourceRoot":"","sources":["updateColumns.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,aAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,GAAG,CAAC;IACb,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;CACtD,CAAC;AAEF,QAAA,MAAM,KAAK,UAAW,aAAa,sBAwBlC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/dist/TableHeaderConfigPopover/updateColumns.js

@@ -1,3 +1,13 @@
+var _excluded = ["menuCode", "formTemplateCode", "columns", "updateColumns"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+/*
+ * @description:
+ * @author chenchangfu
+ * Copyright (c) 2019, AUTHOR. All rights reserved.
+ * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ */
 import React from "react";
 import TableHeaderConfigPopover from "../TableHeaderConfigPopover";
 import { adapterColumns } from "./utils";
@@ -5,7 +15,8 @@ var Index = function Index(props) {
   var menuCode = props.menuCode,
     formTemplateCode = props.formTemplateCode,
     columns = props.columns,
-    updateColumns = props.updateColumns;
+    updateColumns = props.updateColumns,
+    otherParam = _objectWithoutProperties(props, _excluded);
 
   // 新columns 和旧的模板对比 返回处理后数据
   var changeColumns = function changeColumns(tree) {
@@ -16,11 +27,13 @@ var Index = function Index(props) {
       JsonPares = _adapterColumns.JsonPares;
     updateColumns(JsonPares);
   };
-  return /*#__PURE__*/React.createElement(TableHeaderConfigPopover, {
+  return /*#__PURE__*/React.createElement(TableHeaderConfigPopover, _extends({
+    request: otherParam.request,
+    saveColumn: otherParam.saveColumn,
     menuCode: menuCode,
     formTemplateCode: formTemplateCode,
     columns: columns,
     updateColumns: changeColumns
-  });
+  }, otherParam));
 };
 export default Index;