szld-libs 0.3.66 → 0.3.68

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

@@ -18,6 +18,7 @@ interface IDynamicFormProps {
     isEdit?: boolean;
     formShowType?: 'form' | 'table';
     langId?: string;
+    getTitle?: (pageID: string, dataID: string) => string;
 }
 type NestedFormListFieldData = FormListFieldData & {
     parentName?: (string | number)[];

package/lib/components/DynamicForm/useDynamicForm.js

@@ -31,7 +31,8 @@ function useDynamicForm(props) {
     CustomModalComponent,
     isEdit,
     formShowType = "form",
-    langId
+    langId,
+    getTitle
   } = props;
   const formConfigRef = react.useRef([]);
   const { message } = antd.App.useApp();
@@ -116,9 +117,13 @@ function useDynamicForm(props) {
           break;
         case "range-picker":
           baseProps.getValueFromEvent = (date) => date == null ? void 0 : date.map((d) => d == null ? void 0 : d.format(format || "YYYY-MM-DD"));
-          baseProps.getValueProps = (value) => ({
-            value: (value == null ? void 0 : value.map((v) => dayjs(v))) || null
-          });
+          baseProps.getValueProps = (value) => {
+            if (!(value == null ? void 0 : value.length) && !Array.isArray(value))
+              return { value: null };
+            return {
+              value: (value == null ? void 0 : value.map((v) => dayjs(v))) || null
+            };
+          };
           break;
         case "multiple-date-picker":
           baseProps.getValueFromEvent = (date) => date == null ? void 0 : date.map((d) => d == null ? void 0 : d.format(format || "YYYY-MM-DD"));
@@ -553,6 +558,7 @@ function useDynamicForm(props) {
             item: item.json,
             form,
             attrid,
+            getTitle,
             value: item.attrvalue || item.json.default || "",
             commonRequestWidthParams,
             commonRequest,

package/lib/hooks/useUniversalTable.d.ts

@@ -6,13 +6,13 @@ declare function useUniversalTable(): {
         extraBtn?: ((record: any, content: string, item: any) => ReactNode) | undefined;
         operationColumnConfig?: any;
         attributeSetId?: string | undefined;
-        getTitle?: ((commonId: string, code: string) => string) | undefined;
+        getTitle?: ((pageID: string, dataID: string) => string) | undefined;
         downloadText?: string | undefined;
         isDefaultWidth?: boolean | undefined;
         otherLangPageId?: string | undefined;
         objDefaultLangPageId?: string | undefined;
     }) => any[] | import("antd/es/message/interface").MessageType;
-    handleSelListToFormItems: ({ selListData, handleSearch, handleReset, detail, styles, attributeSetId, commonRequest, commonRequestWidthParams, getTitle, searchText, resetText, }: {
+    handleSelListToFormItems: ({ selListData, handleSearch, handleReset, detail, styles, attributeSetId, commonRequest, commonRequestWidthParams, getTitle, searchText, resetText, langConfig, }: {
         selListData: any[];
         handleSearch: (values: any, selListData: any[]) => void;
         handleReset: (values: any) => void;
@@ -24,6 +24,7 @@ declare function useUniversalTable(): {
         getTitle?: ((commonId: string, code: string, defaultTitle?: string) => string) | undefined;
         searchText?: string | undefined;
         resetText?: string | undefined;
+        langConfig?: any;
     }) => Promise<{
         formItems: import("szld-libs/lib/components/CreateForm").CreateFormItemProps<import("szld-libs/lib/components/CreateForm").ValueType>[];
         selList: any[];

package/lib/hooks/useUniversalTable.js

@@ -6,6 +6,7 @@ const antd = require("antd");
 const download = require("../utils/download");
 function useUniversalTable() {
   const { message, modal } = antd.App.useApp();
+  const attrListCache = {};
   const handleSelListToFormItems = async ({
     selListData,
     handleSearch,
@@ -17,181 +18,196 @@ function useUniversalTable() {
     commonRequestWidthParams,
     getTitle,
     searchText = "搜索",
-    resetText = "重置"
+    resetText = "重置",
+    langConfig = []
   }) => {
-    if ((selListData == null ? void 0 : selListData.length) && detail) {
-      selListData.forEach((item) => {
-        var _a;
-        const key = ((_a = item["default-render-data"]) == null ? void 0 : _a.key) || "";
-        if (key) {
-          item.attrvalue = (detail == null ? void 0 : detail[key]) || "";
-        }
-      });
-    }
-    const searchItems = selListData.filter((item) => {
-      var _a;
-      return ((_a = item.renderdata) == null ? void 0 : _a.input) !== "tab";
-    });
-    const selectItems = searchItems.filter(
-      (item) => {
-        var _a;
-        return ["select", "checkbox", "radio", "mult-select", "cascader"].includes((_a = item.renderdata) == null ? void 0 : _a.input);
+    var _a;
+    try {
+      if ((selListData == null ? void 0 : selListData.length) && detail) {
+        selListData.forEach((item) => {
+          var _a2;
+          const key = ((_a2 = item["default-render-data"]) == null ? void 0 : _a2.key) || "";
+          if (key) {
+            item.attrvalue = (detail == null ? void 0 : detail[key]) || "";
+          }
+        });
       }
-    );
-    let attrList = [];
-    if (selectItems == null ? void 0 : selectItems.length) {
-      const list = await szxkFunc.handleGetAttrList(
-        {
-          asid: attributeSetId
-        },
-        commonRequest
+      const searchItems = selListData.filter(
+        (item) => {
+          var _a2;
+          return ((_a2 = item.renderdata) == null ? void 0 : _a2.input) !== "tab" && !(item == null ? void 0 : item["default-render-data"]);
+        }
       );
-      attrList = method.handleBaseAttrList(list) || [];
-    }
-    const formItems = await Promise.all(
-      searchItems.map(async (item) => {
-        var _a;
-        const renderdata = item.renderdata || {};
-        const { input, width } = renderdata || {};
-        const labelCol = (renderdata == null ? void 0 : renderdata["label-col"]) || 6;
-        const renderPlaceholder = () => {
-          const value = renderdata["default-prompt"];
-          if (getTitle) {
-            if (typeof value === "string") {
-              return getTitle(attributeSetId, item.attrid, value);
-            } else if (Array.isArray(value)) {
-              return [
-                getTitle(attributeSetId, `${item.attrid}_1`, value[0]),
-                getTitle(attributeSetId, `${item.attrid}_2`, value[1])
-              ];
-            }
-          } else {
-            return value || "";
-          }
-        };
-        let valueType = "input";
-        switch (input) {
-          case "range-picker":
-            valueType = "rangePicker";
-            break;
-          case "number":
-            valueType = "inputNumber";
-            break;
-          case "select":
-          case "checkbox":
-          case "radio":
-          case "textarea":
-            valueType = input;
-            break;
-          case "mult-select":
-            valueType = "select";
-            break;
-          case "time-picker":
-            valueType = "timePicker";
-            break;
-          case "date-picker":
-            valueType = "datePicker";
-            break;
-          case "cascader":
-            valueType = "cascader";
-            break;
-          default:
-            valueType = "input";
-            break;
+      const selectItems = searchItems.filter(
+        (item) => {
+          var _a2;
+          return ["select", "checkbox", "radio", "mult-select", "cascader"].includes((_a2 = item.renderdata) == null ? void 0 : _a2.input);
         }
-        const formItem = {
-          dataIndex: item.attrid,
-          title: item.attrname || "",
-          valueType,
-          valueProps: {
-            placeholder: renderPlaceholder()
-          },
-          colProps: {},
-          formItemProps: {
-            style: { marginBottom: 10, width: typeof width === "string" ? `${width}px` : width || 240 },
-            labelCol: { span: labelCol }
-          }
-        };
-        if (["select", "checkbox", "radio", "mult-select", "cascader"].includes(input)) {
-          const attrid = item.attrid || "";
-          const attrItem = attrList.find((attrItem2) => attrItem2.attrid === attrid);
-          let json = (attrItem == null ? void 0 : attrItem.json) || {};
-          if (!(json == null ? void 0 : json.inputType) && (renderdata == null ? void 0 : renderdata["input-type"])) {
-            json = {
-              ...json,
-              inputType: renderdata == null ? void 0 : renderdata["input-type"],
-              "action-url": renderdata == null ? void 0 : renderdata["action-url"],
-              "field-names": renderdata == null ? void 0 : renderdata["field-names"],
-              "key-field": {
-                ...renderdata == null ? void 0 : renderdata["key-field"]
+      );
+      let attrList = [];
+      if (selectItems == null ? void 0 : selectItems.length) {
+        if ((_a = attrListCache[attributeSetId]) == null ? void 0 : _a.length) {
+          attrList = attrListCache[attributeSetId];
+        } else {
+          const list = await szxkFunc.handleGetAttrList(
+            {
+              asid: attributeSetId
+            },
+            commonRequest
+          );
+          attrList = method.handleBaseAttrList(list) || [];
+          attrListCache[attributeSetId] = attrList || [];
+        }
+      }
+      const formItems = await Promise.all(
+        searchItems.map(async (item) => {
+          var _a2;
+          const renderdata = item.renderdata || {};
+          const { input, width } = renderdata || {};
+          const labelCol = (renderdata == null ? void 0 : renderdata["label-col"]) || 6;
+          const renderPlaceholder = () => {
+            const value = renderdata["default-prompt"];
+            if (getTitle) {
+              if (typeof value === "string") {
+                const getTitleResult = getTitle(attributeSetId || "", value);
+                const isGetTitleArrayStr = isArrayString(getTitleResult);
+                if (input === "range-picker" && value && isGetTitleArrayStr) {
+                  return JSON.parse(getTitleResult);
+                } else {
+                  return getTitleResult;
+                }
               }
-            };
+            } else {
+              return value || "";
+            }
+          };
+          let valueType = "input";
+          switch (input) {
+            case "range-picker":
+              valueType = "rangePicker";
+              break;
+            case "number":
+              valueType = "inputNumber";
+              break;
+            case "select":
+            case "checkbox":
+            case "radio":
+            case "textarea":
+              valueType = input;
+              break;
+            case "mult-select":
+              valueType = "select";
+              break;
+            case "time-picker":
+              valueType = "timePicker";
+              break;
+            case "date-picker":
+              valueType = "datePicker";
+              break;
+            case "cascader":
+              valueType = "cascader";
+              break;
+            default:
+              valueType = "input";
+              break;
           }
-          let options = await method.handleSelectOptions({
-            item: json || {},
-            commonRequest,
-            commonRequestWidthParams
-          });
-          if (!(options == null ? void 0 : options.length)) {
-            const { data = [] } = renderdata || {};
-            if (data == null ? void 0 : data.length) {
-              options = data == null ? void 0 : data.map((v) => ({
-                label: v || "",
-                value: v || ""
-              }));
+          const formItem = {
+            dataIndex: item.attrid,
+            title: item.attrname || "",
+            valueType,
+            valueProps: {
+              placeholder: renderPlaceholder()
+            },
+            colProps: {},
+            formItemProps: {
+              style: { marginBottom: 10, width: typeof width === "string" ? `${width}px` : width || 240 },
+              labelCol: { span: labelCol }
+            }
+          };
+          if (["select", "checkbox", "radio", "mult-select", "cascader"].includes(input)) {
+            const attrid = item.attrid || "";
+            const attrItem = attrList.find((attrItem2) => attrItem2.attrid === attrid);
+            let json = (attrItem == null ? void 0 : attrItem.json) || {};
+            if (!(json == null ? void 0 : json.inputType) && (renderdata == null ? void 0 : renderdata["input-type"])) {
+              json = {
+                ...json,
+                inputType: renderdata == null ? void 0 : renderdata["input-type"],
+                "action-url": renderdata == null ? void 0 : renderdata["action-url"],
+                "field-names": renderdata == null ? void 0 : renderdata["field-names"],
+                "key-field": {
+                  ...renderdata == null ? void 0 : renderdata["key-field"]
+                }
+              };
             }
-            if ((_a = renderdata == null ? void 0 : renderdata.options) == null ? void 0 : _a.length) {
-              options = (renderdata == null ? void 0 : renderdata.options) || [];
+            let options = await method.handleSelectOptions({
+              item: json || {},
+              commonRequest,
+              commonRequestWidthParams,
+              langConfig: langConfig || []
+            });
+            if (!(options == null ? void 0 : options.length)) {
+              const { data = [] } = renderdata || {};
+              if (data == null ? void 0 : data.length) {
+                options = data == null ? void 0 : data.map((v) => ({
+                  label: v || "",
+                  value: v || ""
+                }));
+              }
+              if ((_a2 = renderdata == null ? void 0 : renderdata.options) == null ? void 0 : _a2.length) {
+                options = (renderdata == null ? void 0 : renderdata.options) || [];
+              }
+            }
+            if (input === "cascader") {
+              const _options = handleCascaderOptions(options, renderdata == null ? void 0 : renderdata["field-names"]);
+              formItem.valueProps.options = _options || [];
+            } else {
+              formItem.valueProps.options = options || [];
             }
           }
-          if (input === "cascader") {
-            const _options = handleCascaderOptions(options, renderdata == null ? void 0 : renderdata["field-names"]);
-            formItem.valueProps.options = _options || [];
-          } else {
-            formItem.valueProps.options = options || [];
+          return formItem;
+        })
+      );
+      let defaultSearchStyle = {
+        color: "#ffffff",
+        borderRadius: 4,
+        fontSize: 14,
+        height: 32
+      };
+      let defaultResetStyle = {
+        color: "#333333",
+        borderRadius: 4,
+        fontSize: 14,
+        height: 32,
+        borderColor: "#D9D9D9"
+      };
+      formItems.push({
+        dataIndex: "btns",
+        valueType: "btns",
+        valueProps: [
+          {
+            btnType: "submit",
+            title: searchText,
+            type: "primary",
+            shape: "default",
+            style: { ...defaultSearchStyle, ...styles == null ? void 0 : styles.searchStyle },
+            onClick: (values) => handleSearch(values, selListData)
+          },
+          {
+            btnType: "reset",
+            title: resetText,
+            style: { ...defaultResetStyle, ...styles == null ? void 0 : styles.resetStyle },
+            onClick: () => handleReset(selListData)
           }
-        }
-        return formItem;
-      })
-    );
-    let defaultSearchStyle = {
-      color: "#ffffff",
-      borderRadius: 4,
-      fontSize: 14,
-      height: 32
-    };
-    let defaultResetStyle = {
-      color: "#333333",
-      borderRadius: 4,
-      fontSize: 14,
-      height: 32,
-      borderColor: "#D9D9D9"
-    };
-    formItems.push({
-      dataIndex: "btns",
-      valueType: "btns",
-      valueProps: [
-        {
-          btnType: "submit",
-          title: searchText,
-          type: "primary",
-          shape: "default",
-          style: { ...defaultSearchStyle, ...styles == null ? void 0 : styles.searchStyle },
-          onClick: (values) => handleSearch(values, selListData)
+        ],
+        colProps: {
+          flex: "none"
         },
-        {
-          btnType: "reset",
-          title: resetText,
-          style: { ...defaultResetStyle, ...styles == null ? void 0 : styles.resetStyle },
-          onClick: () => handleReset(selListData)
-        }
-      ],
-      colProps: {
-        flex: "none"
-      },
-      formItemProps: { style: { marginBottom: 10, minWidth: 127 } }
-    });
-    return { formItems, selList: selListData };
+        formItemProps: { style: { marginBottom: 10, minWidth: 127 } }
+      });
+      return { formItems, selList: selListData };
+    } catch (error) {
+      return { formItems: [], selList: [] };
+    }
   };
   const handleUniversalHeaderToColumns = ({
     universalHeader,

package/package.json

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