szld-libs 0.2.59 → 0.2.63

package/es/components/DynamicForm/index.js

@@ -22,7 +22,8 @@ const DynamicForm = forwardRef((props, ref) => {
     interfaceTypeDict = "YLZDDictList",
     relatedidKey = "relatedid",
     actionUrlKey = "action-url",
-    actionUrlExtraParams = {}
+    actionUrlExtraParams = {},
+    CustomModalComponent
   } = props;
   const delFileListRef = useRef([]);
   const updateDelFileList = (file) => {
@@ -39,7 +40,8 @@ const DynamicForm = forwardRef((props, ref) => {
     interfaceTypeDict,
     relatedidKey,
     actionUrlKey,
-    actionUrlExtraParams
+    actionUrlExtraParams,
+    CustomModalComponent
   });
   useImperativeHandle(ref, () => ({
     getDelFileList: () => {

package/es/components/DynamicForm/selectModel/index.d.ts

@@ -9,6 +9,7 @@ interface SelectModelProps {
     style?: React.CSSProperties;
     commonRequestWidthParams: (params: object, data?: any) => Promise<AxiosResponse<any, any>>;
     commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
+    CustomModalComponent?: React.FC<ICustomModal>;
 }
 declare function SelectModel(props: SelectModelProps): import("react/jsx-runtime").JSX.Element;
 /**

package/es/components/DynamicForm/selectModel/index.js

@@ -1,8 +1,8 @@
 import { jsxs, Fragment, jsx } from "react/jsx-runtime";
-import { App, Select, Modal, Table } from "antd";
+import { App, Select, Table, Modal } from "antd";
 import { useState, useEffect } from "react";
 function SelectModel(props) {
-  const { item, disabled, style, commonRequestWidthParams } = props;
+  const { item, disabled, style, commonRequestWidthParams, CustomModalComponent } = props;
   const { message } = App.useApp();
   const mode = item.input;
   const [value, setValue] = useState(props.value);
@@ -12,14 +12,17 @@ function SelectModel(props) {
   const [loading, setLoading] = useState(false);
   const [params, setParams] = useState({
     PageNum: 1,
-    PageSize: 10
+    PageSize: 6
   });
   const [dataSource, setDataSource] = useState([]);
   const [total, setTotal] = useState(0);
   const columns = buildColumns();
   useEffect(() => {
+    if (!modalVisible) {
+      return;
+    }
     getData();
-  }, [modalVisible]);
+  }, [modalVisible, params]);
   const onSelectChange = (keys, selectedRows) => {
     setSelectedRowKeys(keys);
     setSelectedRecords(selectedRows);
@@ -67,7 +70,7 @@ function SelectModel(props) {
     message.error("请配置action-url");
   };
   const openModal = () => {
-    var _a, _b, _c;
+    var _a, _b;
     if (disabled) {
       return;
     }
@@ -80,15 +83,16 @@ function SelectModel(props) {
       }
       switch (mode) {
         case "modal-select":
-          const id = (_c = value == null ? void 0 : value.split("-")) == null ? void 0 : _c[0];
-          const index = dataSource == null ? void 0 : dataSource.findIndex((item2) => item2.typeid === id);
+          const id = value == null ? void 0 : value.split("-");
+          const index = dataSource == null ? void 0 : dataSource.findIndex((item2) => id.includes((item2 == null ? void 0 : item2.typeid) || (item2 == null ? void 0 : item2.instanceid)));
           setSelectedRowKeys([index]);
+          break;
         case "modal-mult-select":
           const values = value == null ? void 0 : value.split(",");
           const tempKeys = values == null ? void 0 : values.map((item2) => {
             var _a2;
             const id2 = (_a2 = item2.split(delimiter)) == null ? void 0 : _a2[0];
-            return dataSource == null ? void 0 : dataSource.findIndex((item3) => item3.typeid === id2);
+            return dataSource == null ? void 0 : dataSource.findIndex((item3) => id2.includes((item3 == null ? void 0 : item3.typeid) || (item3 == null ? void 0 : item3.instanceid)));
           });
           setSelectedRowKeys(tempKeys);
           break;
@@ -107,6 +111,10 @@ function SelectModel(props) {
     }
   };
   const handleCancel = () => {
+    setParams({
+      ...params,
+      PageNum: 1
+    });
     setModalVisible(false);
   };
   function buildColumns() {
@@ -137,7 +145,37 @@ function SelectModel(props) {
         style
       }
     ),
-    /* @__PURE__ */ jsx(
+    CustomModalComponent && /* @__PURE__ */ jsx(
+      CustomModalComponent,
+      {
+        title: item["modal-caption"] || "",
+        open: modalVisible,
+        onOk: handleOk,
+        onCancel: handleCancel,
+        modalStyle: { width: item["modal-width"] ?? 600, minHeight: item["modal-height"] ?? 400 },
+        children: /* @__PURE__ */ jsx(
+          Table,
+          {
+            columns,
+            loading,
+            dataSource,
+            rowKey: (record) => record._rowKey,
+            scroll: { y: "calc(80vh - 300px)" },
+            rowSelection: {
+              type: mode === "modal-select" ? "radio" : "checkbox",
+              selectedRowKeys,
+              onChange: onSelectChange
+            },
+            pagination: {
+              total,
+              current: params.PageNum,
+              pageSize: params.PageSize,
+              onChange: onPageChange
+            }
+          }
+        )
+      }
+    ) || /* @__PURE__ */ jsx(
       Modal,
       {
         title: item["modal-caption"],

package/es/components/DynamicForm/useDynamicForm.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { IformConfigItem, IformItemStyle } from './index.d';
 import { AxiosResponse } from 'axios';
 import { FormInstance, UploadFile } from 'antd';
@@ -13,6 +14,7 @@ interface IDynamicFormProps {
     relatedidKey: string;
     actionUrlKey: string;
     actionUrlExtraParams: object;
+    CustomModalComponent?: React.FC<ICustomModal>;
 }
 declare function useDynamicForm(props: IDynamicFormProps): {
     handleRenderItem: ({ item, readonly, colNum, instructionShowMode, relatedid, form, defaultWidth, formItemStyle, radioAlign, }: {

package/es/components/DynamicForm/useDynamicForm.js

@@ -26,7 +26,8 @@ function useDynamicForm(props) {
     interfaceTypeDict,
     relatedidKey,
     actionUrlKey,
-    actionUrlExtraParams
+    actionUrlExtraParams,
+    CustomModalComponent
   } = props;
   const formConfigRef = useRef([]);
   const { message } = App.useApp();
@@ -253,6 +254,27 @@ function useDynamicForm(props) {
       }
       if (itemWithJson.attrtype === 0) {
         let initialValue = handleSetFormItemInitialValue(itemWithJson);
+        let placeholder = "请输入";
+        const { input = "" } = itemWithJson.json || {};
+        if ([
+          "radio",
+          "checkbox",
+          "select",
+          "mult-select",
+          "modal-select",
+          "date-picker",
+          "time-picker",
+          "week-picker",
+          "month-picker",
+          "quarter-picker",
+          "year-picker",
+          "second-picker"
+        ].includes(input)) {
+          placeholder = "请选择";
+        }
+        if (["image", "file", "video", "audio"].includes(input)) {
+          placeholder = "请上传";
+        }
         return /* @__PURE__ */ jsx(Col, { span: 24 / colNum, children: /* @__PURE__ */ jsx(
           Form.Item,
           {
@@ -263,7 +285,7 @@ function useDynamicForm(props) {
               ...((_b = itemWithJson.json) == null ? void 0 : _b.must) ? [
                 {
                   required: true,
-                  message: `请输入${itemWithJson.attrname}`
+                  message: `${placeholder}${itemWithJson.attrname}`
                 }
               ] : []
             ],
@@ -403,7 +425,8 @@ function useDynamicForm(props) {
             onSure: async (value) => {
               form.setFieldValue(item.attrid, value);
             },
-            disabled: readonly
+            disabled: readonly,
+            CustomModalComponent
           }
         );
       }

package/es/vite-env.d.ts

@@ -1 +1,14 @@
 /// <reference types="vite/client" />
+
+interface ICustomModal {
+  open: boolean;
+  title: string;
+  children: React.ReactNode;
+  onCancel: () => void;
+  onOk: () => void;
+  confirmLoading?: boolean;
+  closable?: boolean;
+  maskClosable?: boolean;
+  footer?: React.ReactNode;
+  modalStyle?: React.CSSProperties;
+}

package/lib/components/DynamicForm/index.js

@@ -23,7 +23,8 @@ const DynamicForm = react.forwardRef((props, ref) => {
     interfaceTypeDict = "YLZDDictList",
     relatedidKey = "relatedid",
     actionUrlKey = "action-url",
-    actionUrlExtraParams = {}
+    actionUrlExtraParams = {},
+    CustomModalComponent
   } = props;
   const delFileListRef = react.useRef([]);
   const updateDelFileList = (file) => {
@@ -40,7 +41,8 @@ const DynamicForm = react.forwardRef((props, ref) => {
     interfaceTypeDict,
     relatedidKey,
     actionUrlKey,
-    actionUrlExtraParams
+    actionUrlExtraParams,
+    CustomModalComponent
   });
   react.useImperativeHandle(ref, () => ({
     getDelFileList: () => {

package/lib/components/DynamicForm/selectModel/index.d.ts

@@ -9,6 +9,7 @@ interface SelectModelProps {
     style?: React.CSSProperties;
     commonRequestWidthParams: (params: object, data?: any) => Promise<AxiosResponse<any, any>>;
     commonRequest: (InterfaceType: string, data?: any) => Promise<AxiosResponse<any, any>>;
+    CustomModalComponent?: React.FC<ICustomModal>;
 }
 declare function SelectModel(props: SelectModelProps): import("react/jsx-runtime").JSX.Element;
 /**

package/lib/components/DynamicForm/selectModel/index.js

@@ -4,7 +4,7 @@ const jsxRuntime = require("react/jsx-runtime");
 const antd = require("antd");
 const react = require("react");
 function SelectModel(props) {
-  const { item, disabled, style, commonRequestWidthParams } = props;
+  const { item, disabled, style, commonRequestWidthParams, CustomModalComponent } = props;
   const { message } = antd.App.useApp();
   const mode = item.input;
   const [value, setValue] = react.useState(props.value);
@@ -14,14 +14,17 @@ function SelectModel(props) {
   const [loading, setLoading] = react.useState(false);
   const [params, setParams] = react.useState({
     PageNum: 1,
-    PageSize: 10
+    PageSize: 6
   });
   const [dataSource, setDataSource] = react.useState([]);
   const [total, setTotal] = react.useState(0);
   const columns = buildColumns();
   react.useEffect(() => {
+    if (!modalVisible) {
+      return;
+    }
     getData();
-  }, [modalVisible]);
+  }, [modalVisible, params]);
   const onSelectChange = (keys, selectedRows) => {
     setSelectedRowKeys(keys);
     setSelectedRecords(selectedRows);
@@ -69,7 +72,7 @@ function SelectModel(props) {
     message.error("请配置action-url");
   };
   const openModal = () => {
-    var _a, _b, _c;
+    var _a, _b;
     if (disabled) {
       return;
     }
@@ -82,15 +85,16 @@ function SelectModel(props) {
       }
       switch (mode) {
         case "modal-select":
-          const id = (_c = value == null ? void 0 : value.split("-")) == null ? void 0 : _c[0];
-          const index = dataSource == null ? void 0 : dataSource.findIndex((item2) => item2.typeid === id);
+          const id = value == null ? void 0 : value.split("-");
+          const index = dataSource == null ? void 0 : dataSource.findIndex((item2) => id.includes((item2 == null ? void 0 : item2.typeid) || (item2 == null ? void 0 : item2.instanceid)));
           setSelectedRowKeys([index]);
+          break;
         case "modal-mult-select":
           const values = value == null ? void 0 : value.split(",");
           const tempKeys = values == null ? void 0 : values.map((item2) => {
             var _a2;
             const id2 = (_a2 = item2.split(delimiter)) == null ? void 0 : _a2[0];
-            return dataSource == null ? void 0 : dataSource.findIndex((item3) => item3.typeid === id2);
+            return dataSource == null ? void 0 : dataSource.findIndex((item3) => id2.includes((item3 == null ? void 0 : item3.typeid) || (item3 == null ? void 0 : item3.instanceid)));
           });
           setSelectedRowKeys(tempKeys);
           break;
@@ -109,6 +113,10 @@ function SelectModel(props) {
     }
   };
   const handleCancel = () => {
+    setParams({
+      ...params,
+      PageNum: 1
+    });
     setModalVisible(false);
   };
   function buildColumns() {
@@ -139,7 +147,37 @@ function SelectModel(props) {
         style
       }
     ),
-    /* @__PURE__ */ jsxRuntime.jsx(
+    CustomModalComponent && /* @__PURE__ */ jsxRuntime.jsx(
+      CustomModalComponent,
+      {
+        title: item["modal-caption"] || "",
+        open: modalVisible,
+        onOk: handleOk,
+        onCancel: handleCancel,
+        modalStyle: { width: item["modal-width"] ?? 600, minHeight: item["modal-height"] ?? 400 },
+        children: /* @__PURE__ */ jsxRuntime.jsx(
+          antd.Table,
+          {
+            columns,
+            loading,
+            dataSource,
+            rowKey: (record) => record._rowKey,
+            scroll: { y: "calc(80vh - 300px)" },
+            rowSelection: {
+              type: mode === "modal-select" ? "radio" : "checkbox",
+              selectedRowKeys,
+              onChange: onSelectChange
+            },
+            pagination: {
+              total,
+              current: params.PageNum,
+              pageSize: params.PageSize,
+              onChange: onPageChange
+            }
+          }
+        )
+      }
+    ) || /* @__PURE__ */ jsxRuntime.jsx(
       antd.Modal,
       {
         title: item["modal-caption"],

package/lib/components/DynamicForm/useDynamicForm.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { IformConfigItem, IformItemStyle } from './index.d';
 import { AxiosResponse } from 'axios';
 import { FormInstance, UploadFile } from 'antd';
@@ -13,6 +14,7 @@ interface IDynamicFormProps {
     relatedidKey: string;
     actionUrlKey: string;
     actionUrlExtraParams: object;
+    CustomModalComponent?: React.FC<ICustomModal>;
 }
 declare function useDynamicForm(props: IDynamicFormProps): {
     handleRenderItem: ({ item, readonly, colNum, instructionShowMode, relatedid, form, defaultWidth, formItemStyle, radioAlign, }: {

package/lib/components/DynamicForm/useDynamicForm.js

@@ -27,7 +27,8 @@ function useDynamicForm(props) {
     interfaceTypeDict,
     relatedidKey,
     actionUrlKey,
-    actionUrlExtraParams
+    actionUrlExtraParams,
+    CustomModalComponent
   } = props;
   const formConfigRef = react.useRef([]);
   const { message } = antd.App.useApp();
@@ -254,6 +255,27 @@ function useDynamicForm(props) {
       }
       if (itemWithJson.attrtype === 0) {
         let initialValue = handleSetFormItemInitialValue(itemWithJson);
+        let placeholder = "请输入";
+        const { input = "" } = itemWithJson.json || {};
+        if ([
+          "radio",
+          "checkbox",
+          "select",
+          "mult-select",
+          "modal-select",
+          "date-picker",
+          "time-picker",
+          "week-picker",
+          "month-picker",
+          "quarter-picker",
+          "year-picker",
+          "second-picker"
+        ].includes(input)) {
+          placeholder = "请选择";
+        }
+        if (["image", "file", "video", "audio"].includes(input)) {
+          placeholder = "请上传";
+        }
         return /* @__PURE__ */ jsxRuntime.jsx(antd.Col, { span: 24 / colNum, children: /* @__PURE__ */ jsxRuntime.jsx(
           antd.Form.Item,
           {
@@ -264,7 +286,7 @@ function useDynamicForm(props) {
               ...((_b = itemWithJson.json) == null ? void 0 : _b.must) ? [
                 {
                   required: true,
-                  message: `请输入${itemWithJson.attrname}`
+                  message: `${placeholder}${itemWithJson.attrname}`
                 }
               ] : []
             ],
@@ -404,7 +426,8 @@ function useDynamicForm(props) {
             onSure: async (value) => {
               form.setFieldValue(item.attrid, value);
             },
-            disabled: readonly
+            disabled: readonly,
+            CustomModalComponent
           }
         );
       }

package/lib/vite-env.d.ts

@@ -1 +1,14 @@
 /// <reference types="vite/client" />
+
+interface ICustomModal {
+  open: boolean;
+  title: string;
+  children: React.ReactNode;
+  onCancel: () => void;
+  onOk: () => void;
+  confirmLoading?: boolean;
+  closable?: boolean;
+  maskClosable?: boolean;
+  footer?: React.ReactNode;
+  modalStyle?: React.CSSProperties;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "szld-libs",
   "private": false,
-  "version": "0.2.59",
+  "version": "0.2.63",
   "type": "module",
   "scripts": {
     "dev": "vite",