openxiangda 1.0.220 → 1.0.221

package/packages/sdk/dist/runtime/react.mjs

@@ -43345,7 +43345,6 @@ var isUnauthorizedPublicSessionError = (error) => {
 import {
   Alert as Alert5,
   Button as Button9,
-  Card as Card2,
   Checkbox as Checkbox2,
   DatePicker,
   Drawer,
@@ -43366,6 +43365,16 @@ import {
   message as message3,
   notification
 } from "antd";
+import {
+  DeleteOutlined,
+  DownOutlined,
+  DownloadOutlined as DownloadOutlined5,
+  HolderOutlined,
+  PlusOutlined as PlusOutlined2,
+  ReloadOutlined as ReloadOutlined5,
+  SettingOutlined,
+  UpOutlined
+} from "@ant-design/icons";
 import {
   useCallback as useCallback12,
   useEffect as useEffect14,
@@ -43521,7 +43530,8 @@ function renderSearchControl(field) {
         disabled: field.disabled,
         mode: field.type === "multiSelect" ? "multiple" : void 0,
         options: field.options,
-        placeholder
+        placeholder,
+        showSearch: { optionFilterProp: "label" }
       }
     );
   }
@@ -43597,6 +43607,7 @@ function AdminList(props) {
   const [form] = Form3.useForm();
   const [messageApi, messageHolder] = message3.useMessage();
   const [notificationApi, notificationHolder] = notification.useNotification();
+  const [modalApi, modalHolder] = Modal6.useModal();
   const sourceKey = dataSource.key || "anonymous";
   const [rawPreference, setRawPreference] = useState15(null);
   const [preference, setPreference] = useState15(
@@ -43640,7 +43651,11 @@ function AdminList(props) {
   const [draggedSearchKey, setDraggedSearchKey] = useState15("");
   const selectedKeysRef = useRef8([]);
   const dataSourceRef = useRef8(dataSource);
+  const onQueryChangeRef = useRef8(onQueryChange);
+  const onSelectionChangeRef = useRef8(onSelectionChange);
   dataSourceRef.current = dataSource;
+  onQueryChangeRef.current = onQueryChange;
+  onSelectionChangeRef.current = onSelectionChange;
   const definitionFingerprint = JSON.stringify({
     columns: columns.map((column) => ({
       key: column.key,
@@ -43669,9 +43684,9 @@ function AdminList(props) {
       selectedRowsRef.current.clear();
       selectedKeysRef.current = [];
       setSelectedKeys([]);
-      onSelectionChange?.({ rowKeys: [], rows: [] });
+      onSelectionChangeRef.current?.({ rowKeys: [], rows: [] });
     },
-    [messageApi, onSelectionChange]
+    [messageApi]
   );
   useEffect14(() => {
     if (!controlledSelectedKeys) return;
@@ -43702,11 +43717,11 @@ function AdminList(props) {
     for (const key of disabledKeys) selectedRowsRef.current.delete(key);
     selectedKeysRef.current = nextKeys;
     setSelectedKeys(nextKeys);
-    onSelectionChange?.({
+    onSelectionChangeRef.current?.({
       rowKeys: nextKeys,
       rows: nextKeys.map((key) => selectedRowsRef.current.get(key)).filter(Boolean)
     });
-  }, [onSelectionChange, rowKey, rowSelectable, rows]);
+  }, [rowKey, rowSelectable, rows]);
   useEffect14(() => {
     let active = true;
     setReady(false);
@@ -43790,7 +43805,7 @@ function AdminList(props) {
     if (!ready) return;
     setLoading(true);
     setError(null);
-    onQueryChange?.(query);
+    onQueryChangeRef.current?.(query);
     try {
       const result = await dataSourceRef.current.query(query);
       setRows(result.rows || []);
@@ -43806,7 +43821,7 @@ function AdminList(props) {
     } finally {
       setLoading(false);
     }
-  }, [onQueryChange, query, ready]);
+  }, [query, ready]);
   useEffect14(() => {
     if (!ready) return;
     const fingerprint = queryFingerprint(query, sourceKey);
@@ -43855,7 +43870,7 @@ function AdminList(props) {
       );
       const title = definition.sortable ? /* @__PURE__ */ jsxs13(Space4, { size: 4, children: [
         /* @__PURE__ */ jsx17("span", { children: definition.title }),
-        sortablePriority.has(sortField) ? /* @__PURE__ */ jsx17(Tag4, { bordered: false, color: "blue", children: sortablePriority.get(sortField) }) : null
+        sortablePriority.has(sortField) ? /* @__PURE__ */ jsx17(Tag4, { color: "blue", variant: "filled", children: sortablePriority.get(sortField) }) : null
       ] }) : definition.title;
       return {
         key: definition.key,
@@ -43953,7 +43968,7 @@ function AdminList(props) {
     }
     setSelectedKeys(nextKeys);
     selectedKeysRef.current = nextKeys;
-    onSelectionChange?.({
+    onSelectionChangeRef.current?.({
       rowKeys: nextKeys,
       rows: nextKeys.map((key) => selectedRowsRef.current.get(key)).filter(Boolean)
     });
@@ -44153,7 +44168,7 @@ function AdminList(props) {
         {
           key: "search",
           label: "\u641C\u7D22\u9879",
-          children: /* @__PURE__ */ jsxs13(Space4, { direction: "vertical", size: 12, style: { width: "100%" }, children: [
+          children: /* @__PURE__ */ jsxs13(Space4, { orientation: "vertical", size: 12, style: { width: "100%" }, children: [
             /* @__PURE__ */ jsxs13(Space4, { children: [
               /* @__PURE__ */ jsx17("span", { children: "\u9ED8\u8BA4\u5C55\u793A" }),
               /* @__PURE__ */ jsx17(
@@ -44189,12 +44204,11 @@ function AdminList(props) {
                   ),
                   style: {
                     alignItems: "center",
-                    border: "1px solid rgba(5, 5, 5, 0.08)",
-                    borderRadius: 8,
+                    borderBottom: "1px solid rgba(5, 5, 5, 0.06)",
                     display: "grid",
-                    gap: 8,
-                    gridTemplateColumns: "28px 1fr auto",
-                    padding: "10px 12px"
+                    gap: 12,
+                    gridTemplateColumns: "24px 1fr auto",
+                    padding: "12px 4px"
                   },
                   children: [
                     /* @__PURE__ */ jsx17(
@@ -44202,7 +44216,7 @@ function AdminList(props) {
                       {
                         "aria-label": `\u62D6\u52A8\u7B2C ${index + 1} \u9879`,
                         style: { color: "#8c8c8c", cursor: "grab" },
-                        children: "\u62D6\u52A8"
+                        children: /* @__PURE__ */ jsx17(HolderOutlined, {})
                       }
                     ),
                     /* @__PURE__ */ jsx17("span", { children: definition.label }),
@@ -44233,7 +44247,7 @@ function AdminList(props) {
         {
           key: "columns",
           label: "\u5217\u8BBE\u7F6E",
-          children: /* @__PURE__ */ jsxs13(Space4, { direction: "vertical", size: 12, style: { width: "100%" }, children: [
+          children: /* @__PURE__ */ jsxs13(Space4, { orientation: "vertical", size: 12, style: { width: "100%" }, children: [
             /* @__PURE__ */ jsx17(
               Input4,
               {
@@ -44267,12 +44281,11 @@ function AdminList(props) {
                   ),
                   style: {
                     alignItems: "center",
-                    border: "1px solid rgba(5, 5, 5, 0.08)",
-                    borderRadius: 8,
+                    borderBottom: "1px solid rgba(5, 5, 5, 0.06)",
                     display: "grid",
-                    gap: 8,
-                    gridTemplateColumns: "32px 1fr 72px 116px",
-                    padding: "8px 10px"
+                    gap: 12,
+                    gridTemplateColumns: "24px minmax(0, 1fr) 76px 116px",
+                    padding: "12px 4px"
                   },
                   children: [
                     /* @__PURE__ */ jsx17(
@@ -44280,7 +44293,7 @@ function AdminList(props) {
                       {
                         "aria-label": `\u62D6\u52A8\u7B2C ${index + 1} \u5217`,
                         style: { color: "#8c8c8c", cursor: "grab" },
-                        children: "\u62D6\u52A8"
+                        children: /* @__PURE__ */ jsx17(HolderOutlined, {})
                       }
                     ),
                     /* @__PURE__ */ jsxs13(
@@ -44293,7 +44306,7 @@ function AdminList(props) {
                         }),
                         children: [
                           definition.title,
-                          locked ? /* @__PURE__ */ jsx17(Tag4, { bordered: false, style: { marginInlineStart: 4 }, children: "\u9501\u5B9A" }) : null
+                          locked ? /* @__PURE__ */ jsx17(Tag4, { variant: "filled", style: { marginInlineStart: 4 }, children: "\u9501\u5B9A" }) : null
                         ]
                       }
                     ),
@@ -44334,7 +44347,7 @@ function AdminList(props) {
         {
           key: "sort",
           label: "\u6392\u5E8F",
-          children: /* @__PURE__ */ jsxs13(Space4, { direction: "vertical", size: 12, style: { width: "100%" }, children: [
+          children: /* @__PURE__ */ jsxs13(Space4, { orientation: "vertical", size: 12, style: { width: "100%" }, children: [
             /* @__PURE__ */ jsx17(
               Alert5,
               {
@@ -44348,15 +44361,14 @@ function AdminList(props) {
               {
                 style: {
                   alignItems: "center",
-                  border: "1px solid rgba(5, 5, 5, 0.08)",
-                  borderRadius: 8,
+                  borderBottom: "1px solid rgba(5, 5, 5, 0.06)",
                   display: "grid",
-                  gap: 8,
+                  gap: 12,
                   gridTemplateColumns: "28px 1fr 100px auto",
-                  padding: 10
+                  padding: "12px 4px"
                 },
                 children: [
-                  /* @__PURE__ */ jsx17(Tag4, { bordered: false, color: "blue", children: index + 1 }),
+                  /* @__PURE__ */ jsx17(Tag4, { color: "blue", variant: "filled", children: index + 1 }),
                   /* @__PURE__ */ jsx17(
                     Select3,
                     {
@@ -44393,8 +44405,9 @@ function AdminList(props) {
                     Button9,
                     {
                       danger: true,
+                      icon: /* @__PURE__ */ jsx17(DeleteOutlined, {}),
                       size: "small",
-                      type: "link",
+                      type: "text",
                       onClick: () => setSettingsDraft((current) => ({
                         ...current,
                         sorts: (current.sorts || []).filter(
@@ -44413,6 +44426,8 @@ function AdminList(props) {
               {
                 block: true,
                 disabled: (settingsDraft.sorts || []).length >= columns.filter((column) => column.sortable).length,
+                icon: /* @__PURE__ */ jsx17(PlusOutlined2, {}),
+                type: "text",
                 onClick: () => {
                   const used = new Set(
                     (settingsDraft.sorts || []).map((sort) => sort.field)
@@ -44440,8 +44455,8 @@ function AdminList(props) {
         {
           key: "display",
           label: "\u663E\u793A",
-          children: /* @__PURE__ */ jsxs13(Space4, { direction: "vertical", size: 20, style: { width: "100%" }, children: [
-            /* @__PURE__ */ jsxs13(Space4, { direction: "vertical", children: [
+          children: /* @__PURE__ */ jsxs13(Space4, { orientation: "vertical", size: 20, style: { width: "100%" }, children: [
+            /* @__PURE__ */ jsxs13(Space4, { orientation: "vertical", children: [
               /* @__PURE__ */ jsx17("span", { children: "\u8868\u683C\u5BC6\u5EA6" }),
               /* @__PURE__ */ jsx17(
                 Segmented,
@@ -44459,7 +44474,7 @@ function AdminList(props) {
                 }
               )
             ] }),
-            /* @__PURE__ */ jsxs13(Space4, { direction: "vertical", children: [
+            /* @__PURE__ */ jsxs13(Space4, { orientation: "vertical", children: [
               /* @__PURE__ */ jsx17("span", { children: "\u9ED8\u8BA4\u6BCF\u9875" }),
               /* @__PURE__ */ jsx17(
                 Segmented,
@@ -44557,59 +44572,87 @@ function AdminList(props) {
   return /* @__PURE__ */ jsxs13("div", { className, style, children: [
     messageHolder,
     notificationHolder,
-    /* @__PURE__ */ jsxs13(Space4, { direction: "vertical", size: 12, style: { width: "100%" }, children: [
-      searchFields.length ? /* @__PURE__ */ jsx17(Card2, { size: "small", children: /* @__PURE__ */ jsx17(
-        Form3,
+    modalHolder,
+    /* @__PURE__ */ jsxs13(Space4, { orientation: "vertical", size: 16, style: { width: "100%" }, children: [
+      searchFields.length ? /* @__PURE__ */ jsx17(
+        "div",
         {
-          form,
-          layout: "vertical",
-          onFinish: applySearch,
-          children: /* @__PURE__ */ jsxs13(
-            "div",
+          style: {
+            background: "#fff",
+            border: "1px solid #e8edf3",
+            borderRadius: 8,
+            overflowX: "auto",
+            padding: "18px 20px"
+          },
+          children: /* @__PURE__ */ jsx17(
+            Form3,
             {
-              style: {
-                alignItems: "end",
-                display: "grid",
-                gap: 12,
-                gridTemplateColumns: "repeat(auto-fit, minmax(180px, 1fr))"
-              },
-              children: [
-                visibleSearchFields.map((field) => /* @__PURE__ */ jsx17(
-                  Form3.Item,
-                  {
-                    label: field.label,
-                    name: field.render ? void 0 : field.key,
-                    style: { marginBottom: 0 },
-                    children: field.render ? /* @__PURE__ */ jsx17(Form3.Item, { noStyle: true, shouldUpdate: true, children: () => field.render?.({
-                      disabled: field.disabled,
-                      value: form.getFieldValue(field.key),
-                      onChange: (value) => form.setFieldValue(field.key, value)
-                    }) }) : renderSearchControl(field)
+              form,
+              layout: "vertical",
+              onFinish: applySearch,
+              children: /* @__PURE__ */ jsxs13(
+                "div",
+                {
+                  style: {
+                    alignItems: "end",
+                    display: "grid",
+                    gap: 12,
+                    gridTemplateColumns: "repeat(4, minmax(180px, 1fr)) minmax(256px, auto)",
+                    minWidth: 1040
                   },
-                  field.key
-                )),
-                /* @__PURE__ */ jsx17(Form3.Item, { style: { marginBottom: 0 }, children: /* @__PURE__ */ jsxs13(Space4, { wrap: true, children: [
-                  /* @__PURE__ */ jsx17(Button9, { htmlType: "submit", type: "primary", children: "\u67E5\u8BE2" }),
-                  /* @__PURE__ */ jsx17(Button9, { onClick: resetSearch, children: "\u91CD\u7F6E" }),
-                  searchFields.length > (preference.defaultVisibleSearchCount || defaultVisibleSearchCount) ? /* @__PURE__ */ jsx17(
-                    Button9,
-                    {
-                      type: "link",
-                      onClick: () => setExpanded((current) => !current),
-                      children: expanded ? "\u6536\u8D77" : "\u66F4\u591A\u7B5B\u9009"
-                    }
-                  ) : null
-                ] }) })
-              ]
+                  children: [
+                    visibleSearchFields.map((field) => /* @__PURE__ */ jsx17(
+                      Form3.Item,
+                      {
+                        label: field.label,
+                        name: field.render ? void 0 : field.key,
+                        style: { marginBottom: 0 },
+                        children: field.render ? /* @__PURE__ */ jsx17(Form3.Item, { noStyle: true, shouldUpdate: true, children: () => field.render?.({
+                          disabled: field.disabled,
+                          value: form.getFieldValue(field.key),
+                          onChange: (value) => form.setFieldValue(field.key, value)
+                        }) }) : renderSearchControl(field)
+                      },
+                      field.key
+                    )),
+                    /* @__PURE__ */ jsx17(
+                      Form3.Item,
+                      {
+                        style: {
+                          justifySelf: "end",
+                          gridColumn: 5,
+                          marginBottom: 0,
+                          minWidth: 256
+                        },
+                        children: /* @__PURE__ */ jsxs13(Space4, { size: 8, children: [
+                          /* @__PURE__ */ jsx17(Button9, { htmlType: "submit", type: "primary", children: "\u67E5\u8BE2" }),
+                          /* @__PURE__ */ jsx17(Button9, { onClick: resetSearch, children: "\u91CD\u7F6E" }),
+                          searchFields.length > (preference.defaultVisibleSearchCount || defaultVisibleSearchCount) ? /* @__PURE__ */ jsx17(
+                            Button9,
+                            {
+                              icon: expanded ? /* @__PURE__ */ jsx17(UpOutlined, {}) : /* @__PURE__ */ jsx17(DownOutlined, {}),
+                              iconPlacement: "end",
+                              type: "link",
+                              onClick: () => setExpanded((current) => !current),
+                              children: expanded ? "\u6536\u8D77" : "\u66F4\u591A\u7B5B\u9009"
+                            }
+                          ) : null
+                        ] })
+                      }
+                    )
+                  ]
+                }
+              )
             }
           )
         }
-      ) }) : null,
+      ) : null,
       /* @__PURE__ */ jsx17(
-        Card2,
+        "div",
         {
-          styles: { body: { padding: 12 } },
-          size: "small",
+          style: {
+            padding: "2px 0 0"
+          },
           children: /* @__PURE__ */ jsxs13(
             Space4,
             {
@@ -44636,14 +44679,37 @@ function AdminList(props) {
                           )
                         }))
                       },
+                      trigger: ["click"],
                       children: /* @__PURE__ */ jsx17(Button9, { disabled: selectedKeys.length === 0, children: "\u6279\u91CF\u64CD\u4F5C" })
                     }
                   ) : null,
-                  exportable && dataSource.createExportTask ? /* @__PURE__ */ jsx17(Dropdown2, { menu: { items: exportMenuItems }, children: /* @__PURE__ */ jsx17(Button9, { loading: exporting, children: "\u5BFC\u51FA" }) }) : null
+                  exportable && dataSource.createExportTask ? /* @__PURE__ */ jsx17(Dropdown2, { menu: { items: exportMenuItems }, trigger: ["click"], children: /* @__PURE__ */ jsx17(
+                    Button9,
+                    {
+                      icon: /* @__PURE__ */ jsx17(DownloadOutlined5, {}),
+                      loading: exporting,
+                      children: "\u5BFC\u51FA"
+                    }
+                  ) }) : null
                 ] }),
                 /* @__PURE__ */ jsxs13(Space4, { children: [
-                  /* @__PURE__ */ jsx17(Button9, { onClick: () => void loadData(), children: "\u5237\u65B0" }),
-                  /* @__PURE__ */ jsx17(Button9, { onClick: openSettings, children: "\u5217\u8868\u8BBE\u7F6E" })
+                  /* @__PURE__ */ jsx17(
+                    Button9,
+                    {
+                      "aria-label": "\u5237\u65B0\u5217\u8868",
+                      icon: /* @__PURE__ */ jsx17(ReloadOutlined5, {}),
+                      title: "\u5237\u65B0",
+                      onClick: () => void loadData()
+                    }
+                  ),
+                  /* @__PURE__ */ jsx17(
+                    Button9,
+                    {
+                      icon: /* @__PURE__ */ jsx17(SettingOutlined, {}),
+                      onClick: openSettings,
+                      children: "\u5217\u8868\u8BBE\u7F6E"
+                    }
+                  )
                 ] })
               ]
             }
@@ -44677,29 +44743,40 @@ function AdminList(props) {
         }
       ) : null,
       /* @__PURE__ */ jsx17(
-        Table2,
+        "div",
         {
-          bordered: preference.showBorders,
-          columns: resolvedColumns,
-          dataSource: rows,
-          loading,
-          locale: { emptyText: localeEmpty },
-          pagination: tablePagination,
-          rowClassName: (_row, index) => preference.striped && index % 2 === 1 ? "admin-list-row-striped" : "",
-          rowKey: (row) => getRowKey(rowKey, row),
-          rowSelection: selectable ? {
-            preserveSelectedRowKeys: preserveSelectionAcrossPages,
-            selectedRowKeys: selectedKeys,
-            getCheckboxProps: (row) => ({
-              disabled: rowSelectable ? !rowSelectable(row) : false,
-              title: rowSelectionReason?.(row)
-            }),
-            onChange: handleSelectionChange
-          } : void 0,
-          scroll: { x: "max-content" },
-          size: preference.density,
-          onChange: handleTableChange,
-          onRow
+          style: {
+            background: "#fff",
+            border: "1px solid #edf0f4",
+            borderRadius: 8,
+            overflow: "hidden"
+          },
+          children: /* @__PURE__ */ jsx17(
+            Table2,
+            {
+              bordered: preference.showBorders,
+              columns: resolvedColumns,
+              dataSource: rows,
+              loading,
+              locale: { emptyText: localeEmpty },
+              pagination: tablePagination,
+              rowClassName: (_row, index) => preference.striped && index % 2 === 1 ? "admin-list-row-striped" : "",
+              rowKey: (row) => getRowKey(rowKey, row),
+              rowSelection: selectable ? {
+                preserveSelectedRowKeys: preserveSelectionAcrossPages,
+                selectedRowKeys: selectedKeys,
+                getCheckboxProps: (row) => ({
+                  disabled: rowSelectable ? !rowSelectable(row) : false,
+                  title: rowSelectionReason?.(row)
+                }),
+                onChange: handleSelectionChange
+              } : void 0,
+              scroll: { x: "max-content" },
+              size: preference.density,
+              onChange: handleTableChange,
+              onRow
+            }
+          )
         }
       )
     ] }),
@@ -44715,7 +44792,7 @@ function AdminList(props) {
               /* @__PURE__ */ jsx17(
                 Button9,
                 {
-                  onClick: () => Modal6.confirm({
+                  onClick: () => modalApi.confirm({
                     title: "\u6062\u590D\u7CFB\u7EDF\u9ED8\u8BA4\u8BBE\u7F6E\uFF1F",
                     content: "\u5F53\u524D\u8D26\u53F7\u4FDD\u5B58\u7684\u5217\u8868\u914D\u7F6E\u5C06\u88AB\u6E05\u9664\u3002",
                     okText: "\u6062\u590D",
@@ -44748,10 +44825,10 @@ function AdminList(props) {
             }
           )
         ] }),
-        width: 420,
+        size: 420,
         onClose: () => {
           if (JSON.stringify(settingsDraft) !== JSON.stringify(preference)) {
-            Modal6.confirm({
+            modalApi.confirm({
               title: "\u653E\u5F03\u672A\u4FDD\u5B58\u7684\u8BBE\u7F6E\uFF1F",
               content: "\u5F53\u524D\u8C03\u6574\u5C1A\u672A\u5E94\u7528\uFF0C\u5173\u95ED\u540E\u5C06\u4E22\u5931\u3002",
               okText: "\u653E\u5F03\u4FEE\u6539",
@@ -44775,7 +44852,7 @@ function AdminList(props) {
         title: "\u5BFC\u51FA\u5168\u90E8\u6570\u636E",
         onCancel: () => setExportConfirmOpen(false),
         onOk: () => void executeExport("all"),
-        children: /* @__PURE__ */ jsxs13(Space4, { direction: "vertical", size: 12, style: { width: "100%" }, children: [
+        children: /* @__PURE__ */ jsxs13(Space4, { orientation: "vertical", size: 12, style: { width: "100%" }, children: [
           /* @__PURE__ */ jsx17("div", { children: "\u6570\u636E\u8303\u56F4\uFF1A\u5F53\u524D\u67E5\u8BE2\u7ED3\u679C" }),
           /* @__PURE__ */ jsxs13("div", { children: [
             "\u9884\u8BA1\u6570\u91CF\uFF1A",