@pisell/materials 1.0.16 → 1.0.17

package/es/components/table/BasicTable/index.js

@@ -9,7 +9,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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; }
 import { Table } from "antd";
-import React, { useState, useMemo } from "react";
+import React, { useState, useMemo, useEffect } from "react";
 import Pagination from "../../Pagination";
 var BasicTable = function BasicTable(props) {
   var dataSource = props.dataSource,
@@ -23,6 +23,9 @@ var BasicTable = function BasicTable(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     pageSize = _useState4[0],
     setPageSize = _useState4[1];
+  useEffect(function () {
+    setCurrentPage(1);
+  }, [dataSource]);
 
   // 分割数据源
   var _dataSource = useMemo(function () {

package/es/components/table/Table/fields/rangePicker/Edit/index.js

@@ -33,6 +33,9 @@ var Edit = function Edit(props, ref) {
     return value;
   }, [value]);
   var rangePresets = [{
+    label: "Today",
+    value: [dayjs().startOf('day'), dayjs().endOf('day')]
+  }, {
     label: "Last 3 Days",
     value: [dayjs().add(-3, "d").startOf('day'), dayjs().endOf('day')]
   }, {

package/es/components/table/index.js

@@ -1,4 +1,10 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _excluded = ["dataSource", "columns", "dispatch", "style", "filter", "sort", "buttons", "title", "summary", "onValuesChange"];
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -7,7 +13,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect } from "react";
+import React, { useEffect, useMemo } from "react";
 import { Form } from "antd";
 import Header from "./Header";
 import Actions from "./Actions";
@@ -55,10 +61,17 @@ var GridView = Provider(function (props) {
       payload: (filter === null || filter === void 0 ? void 0 : (_filter$list2 = filter.list) === null || _filter$list2 === void 0 ? void 0 : (_filter$list2$slice = _filter$list2.slice) === null || _filter$list2$slice === void 0 ? void 0 : _filter$list2$slice.call(_filter$list2, 3)) || []
     });
   }, [filter]);
+  var initialValues = useMemo(function () {
+    return (filter.list || []).reduce(function (p, c) {
+      var _c$other;
+      return _objectSpread(_objectSpread({}, p), {}, _defineProperty({}, c.name, c === null || c === void 0 ? void 0 : (_c$other = c.other) === null || _c$other === void 0 ? void 0 : _c$other.defaultValue));
+    }, {});
+  }, [filter.list]);
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
     layout: "vertical",
-    onValuesChange: onValuesChange
+    onValuesChange: onValuesChange,
+    initialValues: initialValues
   }, /*#__PURE__*/React.createElement("div", {
     className: "materials-grid",
     style: style

package/lib/components/table/BasicTable/index.js

@@ -39,6 +39,9 @@ var BasicTable = (props) => {
   const { dataSource, pagination, ...other } = props;
   const [currentPage, setCurrentPage] = (0, import_react.useState)(1);
   const [pageSize, setPageSize] = (0, import_react.useState)(10);
+  (0, import_react.useEffect)(() => {
+    setCurrentPage(1);
+  }, [dataSource]);
   const _dataSource = (0, import_react.useMemo)(() => {
     let list = (dataSource == null ? void 0 : dataSource.list) || [];
     let total2 = (dataSource == null ? void 0 : dataSource.total) || 0;

package/lib/components/table/Table/fields/rangePicker/Edit/index.js

@@ -61,6 +61,7 @@ var Edit = (props, ref) => {
     return value;
   }, [value]);
   const rangePresets = [
+    { label: "Today", value: [(0, import_dayjs.default)().startOf("day"), (0, import_dayjs.default)().endOf("day")] },
     { label: "Last 3 Days", value: [(0, import_dayjs.default)().add(-3, "d").startOf("day"), (0, import_dayjs.default)().endOf("day")] },
     { label: "Last 7 Days", value: [(0, import_dayjs.default)().add(-7, "d").startOf("day"), (0, import_dayjs.default)().endOf("day")] },
     { label: "Last 14 Days", value: [(0, import_dayjs.default)().add(-14, "d").startOf("day"), (0, import_dayjs.default)().endOf("day")] },

package/lib/components/table/index.js

@@ -81,6 +81,28 @@ var GridView = (0, import_model.Provider)((props) => {
       payload: ((_d = (_c = filter == null ? void 0 : filter.list) == null ? void 0 : _c.slice) == null ? void 0 : _d.call(_c, 3)) || []
     });
   }, [filter]);
-  return /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { form, layout: "vertical", onValuesChange }, /* @__PURE__ */ import_react.default.createElement("div", { className: "materials-grid", style }, /* @__PURE__ */ import_react.default.createElement(import_Header.default, { title, buttons }), /* @__PURE__ */ import_react.default.createElement(import_Actions.default, { filter, sort }), /* @__PURE__ */ import_react.default.createElement(import_Summary.default, { summary }), /* @__PURE__ */ import_react.default.createElement(import_Table.default, { tableProps: other })));
+  const initialValues = (0, import_react.useMemo)(
+    () => (filter.list || []).reduce(
+      (p, c) => {
+        var _a;
+        return {
+          ...p,
+          [c.name]: (_a = c == null ? void 0 : c.other) == null ? void 0 : _a.defaultValue
+        };
+      },
+      {}
+    ),
+    [filter.list]
+  );
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Form,
+    {
+      form,
+      layout: "vertical",
+      onValuesChange,
+      initialValues
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "materials-grid", style }, /* @__PURE__ */ import_react.default.createElement(import_Header.default, { title, buttons }), /* @__PURE__ */ import_react.default.createElement(import_Actions.default, { filter, sort }), /* @__PURE__ */ import_react.default.createElement(import_Summary.default, { summary }), /* @__PURE__ */ import_react.default.createElement(import_Table.default, { tableProps: other }))
+  );
 });
 var table_default = GridView;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -14,7 +14,7 @@
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "@alib/build-scripts": "^0.1.32",
-    "@pisell/build-plugin-lowcode": "^1.0.8",
+    "@pisell/build-plugin-lowcode": "1.0.3",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "@alilc/lowcode-utils": "1.1.6",
@@ -62,6 +62,7 @@
   "scripts": {
     "dev": "father dev",
     "build": "father build && build-scripts build --config ./build.lowcode.js",
-    "lowcode:dev": "build-scripts start --config ./build.lowcode.js"
+    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
+    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
   }
 }