@hzab/list-render 0.0.11 → 0.0.12

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "@hzab/list-render",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "",
   "main": "lib",
   "scripts": {
     "dev": "webpack serve -c ./config/webpack.config.js --env development",
-    "build": "webpack -c ./config/webpack.config.js --env production"
+    "build": "webpack -c ./config/webpack.config.js --env production",
+    "publish-patch": "npm run build && npm version patch && npm publish --access public",
+    "publish-minor": "npm run build && npm version minor && npm publish --access public",
+    "publish-major": "npm run build && npm version major && npm publish --access public"
   },
   "files": [
     "lib",
-    "src"
+    "src",
+    "example"
   ],
   "keywords": [],
   "author": "CaiYansong",

package/src/common/utils.js

@@ -94,3 +94,20 @@ export function getFieldList(_schema, fieldList = []) {
     });
   return fieldList;
 }
+
+export function getFieldMap(_schema, fieldMap = {}) {
+  // const fieldMap = _.keyBy(getFieldList(_schema), "name");
+  const schema = _schema?.schema || _schema;
+  schema?.properties &&
+    Object.keys(schema?.properties).forEach((key) => {
+      const field = schema?.properties[key];
+      if (field["x-component"] === "FormGrid") {
+        getFieldMap(field, fieldMap);
+      } else if (field["x-component"] === "FormGrid.GridColumn") {
+        getFieldMap(field, fieldMap);
+      } else {
+        fieldMap[key] = field;
+      }
+    });
+  return fieldMap;
+}

package/src/data-model.js

@@ -1,6 +1,8 @@
 import _ from "lodash";
 import axios from "axios";
 
+const _$Temp = {};
+
 class DataModel {
   constructor(params) {
     const {
@@ -23,7 +25,7 @@ class DataModel {
 
     this.ctx = ctx || {};
     this.query = query || {};
-    this.axios = as || axios;
+    this.axios = as || _$Temp.axios || axios;
     this.axiosConf = axiosConf || {};
 
     this.createApi = createApi;
@@ -41,7 +43,7 @@ class DataModel {
 
   getApiUrl(api, record, ctx = this.ctx) {
     if (!api) {
-      throw new Error("Error getApiUrl api 不能为空", api, record, ctx);
+      throw new Error("Error api 不能为空", api, record, ctx);
     }
     let apiUrl = api;
     const params = _.merge({}, record, ctx);
@@ -215,6 +217,12 @@ class DataModel {
   }
 }
 
-export { axios };
+function setDefaultAxios(ax) {
+  if (ax) {
+    _$Temp.axios = ax;
+  }
+}
+
+export { axios, DataModel, setDefaultAxios };
 
 export default DataModel;

package/src/form-dialog/index.jsx

@@ -27,7 +27,6 @@ function FormDialog(props, parentRef) {
     } else {
       _formData = formData;
     }
-    console.log("formRef.current?.formRender", formRef.current?.formRender);
     setTitle(title || "新增");
     return new Promise((resolve, reject) => {
       resolveCB.current = resolve;

package/src/index.js

@@ -1,9 +1,5 @@
 import ListRender from "./list-render.jsx";
 
-import DataModel from "./data-model.js";
-
-console.log('DataModel', DataModel);
-
-export { DataModel };
+export * from "./data-model.js";
 
 export default ListRender;

package/src/list-render.jsx

@@ -72,14 +72,13 @@ const ListRender = forwardRef(function (props, parentRef) {
     model
       ?.getList(_q)
       .then((res) => {
-        console.log("list res", res);
         setList(res.list);
         setTotal(res.pagination?.total);
         props.onGetListEnd && props.onGetListEnd(res);
         setListLoading(false);
       })
       .catch((err) => {
-        console.log(err);
+        console.error(err);
         message.error(err._message || "未知错误");
         setListLoading(false);
       });
@@ -111,11 +110,9 @@ const ListRender = forwardRef(function (props, parentRef) {
   }
 
   function onCreate() {
-    console.log("onCreate");
     formDialogRef.current
       .show()
       .then(async (form) => {
-        console.log("onCreate", form);
         const data = form;
 
         model
@@ -130,7 +127,7 @@ const ListRender = forwardRef(function (props, parentRef) {
           });
       })
       .catch((e) => {
-        console.log("dialog close");
+        console.warn("Dialog close");
       });
   }
 
@@ -173,7 +170,7 @@ const ListRender = forwardRef(function (props, parentRef) {
           });
       })
       .catch((e) => {
-        console.log("dialog close");
+        console.warn("Dialog close");
       });
   }
 

package/src/query-render/index.jsx

@@ -4,6 +4,7 @@ import dayjs from "dayjs";
 import _ from "lodash";
 
 import FormRender from "@hzab/form-render";
+import { getFieldMap } from "../common/utils";
 
 import "./index.less";
 
@@ -36,10 +37,9 @@ function QueryRender(props, parentRef) {
       index += 1;
     }
 
-    const { properties = {} } = props.schema?.schema || {};
-    console.log("props.filters", props.filters);
+    const fieldMap = getFieldMap(props.schema);
     props.filters?.forEach((key) => {
-      const item = properties[key];
+      const item = fieldMap[key];
       if (item) {
         // TODO: 优化
         const itemConf = {
@@ -79,8 +79,6 @@ function QueryRender(props, parentRef) {
       }
     });
 
-    console.log("queryProperties", queryProperties);
-
     setSchema({
       form: {},
       schema: {
@@ -94,7 +92,6 @@ function QueryRender(props, parentRef) {
   function onSearch() {
     let query = _.cloneDeep(formRef?.current?.formRender?.values);
     if (props.filters?.includes("$timerange")) {
-      console.log("query.$timerange?.[0]", query.$timerange?.[0]);
       if (query.$timerange?.[0] instanceof dayjs) {
         query.beginTime = query.$timerange?.[0]?.format("YYYY-MM-DD HH:mm:ss");
         query.endTime = query.$timerange?.[1]?.format("YYYY-MM-DD HH:mm:ss");

package/CHANGELOG

@@ -1,27 +0,0 @@
-# @hzab/list-render@0.0.9
-
-- DataModel response.data.data 为空报错问题处理
-
-# @hzab/list-render@0.0.8
-
-- 编辑中的详情请求，支持配置是否使用 id 作为入参的
-
-# @hzab/list-render@0.0.7
-
-- 修复 query display 问题
-- query allowClear: true
-
-# @hzab/list-render@0.0.3
-
-- 支持 FormGrid 表单项
-
-# @hzab/list-render@0.0.2
-
-- DidMount 问题修复
-- dialog catch
-- form render components
-- data-model
-
-# @hzab/list-render@0.0.1
-
-组件初始化