@hzab/list-render 1.10.12-beta2 → 1.10.12-beta3

package/CHANGELOG.md

@@ -1,5 +1,6 @@
 # @hzab/list-render@1.10.12
 
+fix: 首次列表加载携带queryFormInitialValues的参数
 feat: schema title 支持传入 ReactNode，支持通过 schemaScope 传入
 fix: table 响应数据 去除 inTable == false 的字段
 fix: table 响应表单 FormilyField 环境变量 scenario: "tableReactionsForm"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/list-render",
-  "version": "1.10.12-beta2",
+  "version": "1.10.12-beta3",
   "description": "",
   "main": "src",
   "scripts": {

package/src/common/formily-utils.jsx

@@ -1,174 +1,174 @@
-import { observer } from "@formily/react";
-import { autorun, observable } from "@formily/reactive";
-
-export function handleTableProps(field, { scope, value, record }) {
-  if (!field) {
-    return field;
-  }
-  const opt = {
-    scope: scope,
-    $self: field,
-    $values: value,
-    $deps: record,
-  };
-  // inTable
-  // x-table-props
-  if (typeof field.inTable === "string") {
-    field.inTable = getStateFunc(field.inTable, opt)(opt);
-  }
-  const tableProps = field["x-table-props"];
-  if (tableProps) {
-    if (typeof tableProps === "string") {
-      field["x-table-props"] = getStateFunc(field.inTable, opt)(opt);
-    } else if (tableProps && typeof tableProps === "object") {
-      Object.keys(tableProps).forEach((key) => {
-        if (typeof field["x-table-props"][key] === "string") {
-          field["x-table-props"][key] = getStateFunc(field["x-table-props"][key], opt)(opt);
-        }
-      });
-    }
-  }
-  return field;
-}
-
-/**
- * 解决 render 中无法响应数据的情况
- * @param {Function} render
- * @returns
- */
-export function getColRender(render) {
-  return function (...args) {
-    const Observer = observer(function () {
-      return render(...args);
-    });
-    return <Observer />;
-  };
-}
-
-/**
- * 根据 formily 函数字符串 {{xxx}}，获取变量或可执行函数
- * @param {*} funcStr
- * @param {*} opt
- * @returns
- */
-export const getScopeVal = function (funcStr = "", opt = {}) {
-  if (typeof funcStr !== "string" || !funcStr.startsWith("{{")) {
-    return funcStr;
-  }
-  const stateStr = funcStr.replace(/^\{\{/, "").replace(/\}\}$/, "");
-  const res = opt?.scope?.[stateStr];
-  // 存在对应变量直接返回
-  if (res) {
-    return res;
-  }
-  return getFunc(stateStr, opt);
-};
-
-/**
- * 根据 formily 函数字符串 {{xxx}}，获取可执行函数
- * @param {string} funcStr
- * @param {Object} opt
- * @returns
- */
-export function getStateFunc(funcStr = "", opt) {
-  if (typeof funcStr !== "string" || !funcStr.startsWith("{{")) {
-    return funcStr;
-  }
-  const stateStr = funcStr.replace(/^\{\{/, "").replace(/\}\}$/, "");
-  return getFunc(stateStr, opt);
-}
-
-/**
- * 根据函数字符串，获取可执行函数
- * @param {string} funcStr
- * @param {Object} opt
- * @returns
- */
-export function getFunc(
-  funcStr = "",
-  // opt = {"scope", "$self", "$values"},
-  opt = {},
-) {
-  const _opt = {
-    // opt = ["scope", "$self", "$deps", "$values", "$observable", "$memo", "$effect"],
-    $observable: observable,
-    $memo: autorun.memo,
-    $effect: autorun.effect,
-    scope: {},
-    ...opt,
-  };
-  const fn = new Function(
-    "opt",
-    `const { ${Object.keys(_opt).join(", ")} } = opt || {}; const {${Object.keys(_opt.scope || {}).join(
-      ", ",
-    )}} = scope || {}; return ${funcStr}; `,
-  );
-
-  return function (opt) {
-    return fn.call(this, {
-      // opt = ["scope", "$self", "$deps", "$values", "$observable", "$memo", "$effect"],
-      $observable: observable,
-      $memo: autorun.memo,
-      $effect: autorun.effect,
-      ...opt,
-    });
-  };
-}
-
-/**
- * 根据 formily 函数字符串 {{xxx}}，获取可执行的异步函数
- * @param {string} funcStr
- * @param {Object} opt
- * @returns
- */
-export function getStateSyncFunc(funcStr = "", opt) {
-  if (typeof funcStr !== "string" || !funcStr.startsWith("{{")) {
-    return funcStr;
-  }
-  const stateStr = funcStr.replace(/^\{\{/, "").replace(/\}\}$/, "");
-  return getFuncSync(stateStr, opt);
-}
-
-/**
- * 根据函数字符串，获取可执行的异步函数
- * @param {string} funcStr
- * @param {Object} opt
- * @returns
- */
-export function getFuncSync(
-  funcStr = "",
-  // opt = {"scope", "$self", "$values"},
-  opt = {},
-) {
-  const _opt = {
-    // opt = ["scope", "$self", "$deps", "$values", "$observable", "$memo", "$effect"],
-    $observable: observable,
-    $memo: autorun.memo,
-    $effect: autorun.effect,
-    scope: {},
-    ...opt,
-  };
-
-  // 把 effectFn 字符串转为可执行函数，并传入所需的参数，支持异步
-  const getAsyncFunction = new Function(`return Object.getPrototypeOf(async function(){}).constructor;`);
-  const AsyncFunction = getAsyncFunction();
-  // 只能这样拿到 AsyncFunction
-  // 直接写 Object.getPrototypeOf(async function(){}).constructor
-  // 会被 babel 转成 Function
-  const asyncFunc = new AsyncFunction(
-    "opt",
-    `try {const {${Object.keys(_opt).join(", ")}} = opt || {};  const {${Object.keys(_opt.scope || {}).join(
-      ", ",
-    )}} = scope || {}; return ${funcStr}; } catch(err) {console.error("Error Formily Reactive Function: ", err);}`,
-  );
-
-  return function (opt) {
-    return asyncFunc.call(this, {
-      // opt = ["scope", "$self", "$deps", "$values", "$observable", "$memo", "$effect"],
-      $observable: observable,
-      $memo: autorun.memo,
-      $effect: autorun.effect,
-      ...opt,
-    });
-  };
-}
+import { observer } from "@formily/react";
+import { autorun, observable } from "@formily/reactive";
+
+export function handleTableProps(field, { scope, value, record }) {
+  if (!field) {
+    return field;
+  }
+  const opt = {
+    scope: scope,
+    $self: field,
+    $values: value,
+    $deps: record,
+  };
+  // inTable
+  // x-table-props
+  if (typeof field.inTable === "string") {
+    field.inTable = getStateFunc(field.inTable, opt)(opt);
+  }
+  const tableProps = field["x-table-props"];
+  if (tableProps) {
+    if (typeof tableProps === "string") {
+      field["x-table-props"] = getStateFunc(field.inTable, opt)(opt);
+    } else if (tableProps && typeof tableProps === "object") {
+      Object.keys(tableProps).forEach((key) => {
+        if (typeof field["x-table-props"][key] === "string") {
+          field["x-table-props"][key] = getStateFunc(field["x-table-props"][key], opt)(opt);
+        }
+      });
+    }
+  }
+  return field;
+}
+
+/**
+ * 解决 render 中无法响应数据的情况
+ * @param {Function} render
+ * @returns
+ */
+export function getColRender(render) {
+  return function (...args) {
+    const Observer = observer(function () {
+      return render(...args);
+    });
+    return <Observer />;
+  };
+}
+
+/**
+ * 根据 formily 函数字符串 {{xxx}}，获取变量或可执行函数
+ * @param {*} funcStr
+ * @param {*} opt
+ * @returns
+ */
+export const getScopeVal = function (funcStr = "", opt = {}) {
+  if (typeof funcStr !== "string" || !funcStr.startsWith("{{")) {
+    return funcStr;
+  }
+  const stateStr = funcStr.replace(/^\{\{/, "").replace(/\}\}$/, "");
+  const res = opt?.scope?.[stateStr];
+  // 存在对应变量直接返回
+  if (res) {
+    return res;
+  }
+  return getFunc(stateStr, opt);
+};
+
+/**
+ * 根据 formily 函数字符串 {{xxx}}，获取可执行函数
+ * @param {string} funcStr
+ * @param {Object} opt
+ * @returns
+ */
+export function getStateFunc(funcStr = "", opt) {
+  if (typeof funcStr !== "string" || !funcStr.startsWith("{{")) {
+    return funcStr;
+  }
+  const stateStr = funcStr.replace(/^\{\{/, "").replace(/\}\}$/, "");
+  return getFunc(stateStr, opt);
+}
+
+/**
+ * 根据函数字符串，获取可执行函数
+ * @param {string} funcStr
+ * @param {Object} opt
+ * @returns
+ */
+export function getFunc(
+  funcStr = "",
+  // opt = {"scope", "$self", "$values"},
+  opt = {},
+) {
+  const _opt = {
+    // opt = ["scope", "$self", "$deps", "$values", "$observable", "$memo", "$effect"],
+    $observable: observable,
+    $memo: autorun.memo,
+    $effect: autorun.effect,
+    scope: {},
+    ...opt,
+  };
+  const fn = new Function(
+    "opt",
+    `const { ${Object.keys(_opt).join(", ")} } = opt || {}; const {${Object.keys(_opt.scope || {}).join(
+      ", ",
+    )}} = scope || {}; return ${funcStr}; `,
+  );
+
+  return function (opt) {
+    return fn.call(this, {
+      // opt = ["scope", "$self", "$deps", "$values", "$observable", "$memo", "$effect"],
+      $observable: observable,
+      $memo: autorun.memo,
+      $effect: autorun.effect,
+      ...opt,
+    });
+  };
+}
+
+/**
+ * 根据 formily 函数字符串 {{xxx}}，获取可执行的异步函数
+ * @param {string} funcStr
+ * @param {Object} opt
+ * @returns
+ */
+export function getStateSyncFunc(funcStr = "", opt) {
+  if (typeof funcStr !== "string" || !funcStr.startsWith("{{")) {
+    return funcStr;
+  }
+  const stateStr = funcStr.replace(/^\{\{/, "").replace(/\}\}$/, "");
+  return getFuncSync(stateStr, opt);
+}
+
+/**
+ * 根据函数字符串，获取可执行的异步函数
+ * @param {string} funcStr
+ * @param {Object} opt
+ * @returns
+ */
+export function getFuncSync(
+  funcStr = "",
+  // opt = {"scope", "$self", "$values"},
+  opt = {},
+) {
+  const _opt = {
+    // opt = ["scope", "$self", "$deps", "$values", "$observable", "$memo", "$effect"],
+    $observable: observable,
+    $memo: autorun.memo,
+    $effect: autorun.effect,
+    scope: {},
+    ...opt,
+  };
+
+  // 把 effectFn 字符串转为可执行函数，并传入所需的参数，支持异步
+  const getAsyncFunction = new Function(`return Object.getPrototypeOf(async function(){}).constructor;`);
+  const AsyncFunction = getAsyncFunction();
+  // 只能这样拿到 AsyncFunction
+  // 直接写 Object.getPrototypeOf(async function(){}).constructor
+  // 会被 babel 转成 Function
+  const asyncFunc = new AsyncFunction(
+    "opt",
+    `try {const {${Object.keys(_opt).join(", ")}} = opt || {};  const {${Object.keys(_opt.scope || {}).join(
+      ", ",
+    )}} = scope || {}; return ${funcStr}; } catch(err) {console.error("Error Formily Reactive Function: ", err);}`,
+  );
+
+  return function (opt) {
+    return asyncFunc.call(this, {
+      // opt = ["scope", "$self", "$deps", "$values", "$observable", "$memo", "$effect"],
+      $observable: observable,
+      $memo: autorun.memo,
+      $effect: autorun.effect,
+      ...opt,
+    });
+  };
+}

package/src/index.js

@@ -1,5 +1,5 @@
-import ListRender from "./list-render.jsx";
-
-export * from "@hzab/data-model";
-
-export default ListRender;
+import ListRender from "./list-render.jsx";
+
+export * from "@hzab/data-model";
+
+export default ListRender;

package/src/list-render.jsx

@@ -130,7 +130,7 @@ const ListRender = forwardRef(function (props, parentRef) {
       }
     });
 
-    !props.closeAutoRequest && getList({ ...(modelQueryRef.current || {}), ...getUrlQuery });
+    !props.closeAutoRequest && getList({ ...queryFormInitialValues, ...(modelQueryRef.current || {}), ...getUrlQuery });
   }, []);
 
   useEffect(() => {