@nocobase/client 0.15.0-alpha.4 → 0.16.0-alpha.1

package/es/index.mjs

@@ -19795,9 +19795,9 @@ const TableBlockProvider = (props) => {
   const { getCollection, getCollectionField } = useCollectionManager();
   const record = useRecord();
   const collection2 = getCollection(props.collection);
-  const { treeTable } = (fieldSchema == null ? void 0 : fieldSchema["x-decorator-props"]) || {};
+  const { treeTable, dragSortBy } = (fieldSchema == null ? void 0 : fieldSchema["x-decorator-props"]) || {};
   if (props.dragSort) {
-    params["sort"] = ["sort"];
+    params["sort"] = dragSortBy || ["sort"];
   }
   let childrenColumnName = "children";
   if ((collection2 == null ? void 0 : collection2.tree) && treeTable !== false) {
@@ -22961,7 +22961,8 @@ const Action = observer(
       title,
       onClick,
       style,
-      openSize
+      openSize,
+      disabled: propsDisabled
     } = _a, others = __objRest(_a, [
       "popover",
       "confirm",
@@ -22974,7 +22975,8 @@ const Action = observer(
       "title",
       "onClick",
       "style",
-      "openSize"
+      "openSize",
+      "disabled"
     ]);
     const { wrapSSR, componentCls, hashId } = useStyles$j();
     const { t } = useTranslation();
@@ -22989,7 +22991,7 @@ const Action = observer(
     const record = useRecord();
     const designerProps = fieldSchema["x-designer-props"];
     const openMode = (_b = fieldSchema == null ? void 0 : fieldSchema["x-component-props"]) == null ? void 0 : _b["openMode"];
-    const disabled = form.disabled || field.disabled || ((_c = field.data) == null ? void 0 : _c.disabled) || props.disabled;
+    const disabled = form.disabled || field.disabled || ((_c = field.data) == null ? void 0 : _c.disabled) || propsDisabled;
     const linkageRules = (fieldSchema == null ? void 0 : fieldSchema["x-linkage-rules"]) || [];
     const { designable } = useDesignable();
     const tarComponent = useComponent(component) || component;
@@ -42962,7 +42964,7 @@ function IconField(props) {
   const { value, onChange, disabled } = props;
   const [visible, setVisible] = useState(false);
   const { t } = useTranslation();
-  return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(Input$4.Group, { compact: true, children: [
+  return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(Space$1.Compact, { children: [
     /* @__PURE__ */ jsx(
       PopoverWithStopPropagation,
       {
@@ -48112,6 +48114,7 @@ const TableBlockDesigner = () => {
     },
     [dn, field.decoratorProps, fieldSchema, service]
   );
+  const api = useAPIClient();
   return (
     // fix https://nocobase.height.app/T-2259
     /* @__PURE__ */ jsx(RecordProvider, { parent: record, record: {}, children: /* @__PURE__ */ jsxs(GeneralSchemaDesigner, { template: template2, title: title || name, children: [
@@ -48142,18 +48145,28 @@ const TableBlockDesigner = () => {
         {
           title: t("Enable drag and drop sorting"),
           checked: field.decoratorProps.dragSort,
-          onChange: (dragSort2) => {
-            var _a2;
+          onChange: (dragSort2) => __async(void 0, null, function* () {
+            var _a2, _b2, _c2;
+            if (dragSort2 && collectionField) {
+              const { data } = yield api.resource("collections.fields", collectionField.collectionName).update({
+                filterByTk: collectionField.name,
+                values: {
+                  sortable: true
+                }
+              });
+              const sortBy = (_b2 = (_a2 = data == null ? void 0 : data.data) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.sortBy;
+              fieldSchema["x-decorator-props"].dragSortBy = sortBy;
+            }
             field.decoratorProps.dragSort = dragSort2;
             fieldSchema["x-decorator-props"].dragSort = dragSort2;
-            service.run(__spreadProps(__spreadValues({}, (_a2 = service.params) == null ? void 0 : _a2[0]), { sort: "sort" }));
+            service.run(__spreadProps(__spreadValues({}, (_c2 = service.params) == null ? void 0 : _c2[0]), { sort: fieldSchema["x-decorator-props"].dragSortBy }));
             dn.emit("patch", {
               schema: {
                 ["x-uid"]: fieldSchema["x-uid"],
                 "x-decorator-props": fieldSchema["x-decorator-props"]
               }
             });
-          }
+          })
         }
       ),
       /* @__PURE__ */ jsx(FixedBlockDesignerItem, {}),

package/lib/index.js

@@ -20445,9 +20445,9 @@ const TableBlockProvider = (props) => {
   const { getCollection, getCollectionField } = useCollectionManager();
   const record = useRecord();
   const collection2 = getCollection(props.collection);
-  const { treeTable } = (fieldSchema == null ? void 0 : fieldSchema["x-decorator-props"]) || {};
+  const { treeTable, dragSortBy } = (fieldSchema == null ? void 0 : fieldSchema["x-decorator-props"]) || {};
   if (props.dragSort) {
-    params["sort"] = ["sort"];
+    params["sort"] = dragSortBy || ["sort"];
   }
   let childrenColumnName = "children";
   if ((collection2 == null ? void 0 : collection2.tree) && treeTable !== false) {
@@ -23611,7 +23611,8 @@ const Action = (0, import_react.observer)(
       title,
       onClick,
       style,
-      openSize
+      openSize,
+      disabled: propsDisabled
     } = _a, others = __objRest(_a, [
       "popover",
       "confirm",
@@ -23624,7 +23625,8 @@ const Action = (0, import_react.observer)(
       "title",
       "onClick",
       "style",
-      "openSize"
+      "openSize",
+      "disabled"
     ]);
     const { wrapSSR, componentCls, hashId } = useStyles$j();
     const { t } = (0, import_react_i18next.useTranslation)();
@@ -23639,7 +23641,7 @@ const Action = (0, import_react.observer)(
     const record = useRecord();
     const designerProps = fieldSchema["x-designer-props"];
     const openMode = (_b = fieldSchema == null ? void 0 : fieldSchema["x-component-props"]) == null ? void 0 : _b["openMode"];
-    const disabled = form.disabled || field.disabled || ((_c = field.data) == null ? void 0 : _c.disabled) || props.disabled;
+    const disabled = form.disabled || field.disabled || ((_c = field.data) == null ? void 0 : _c.disabled) || propsDisabled;
     const linkageRules = (fieldSchema == null ? void 0 : fieldSchema["x-linkage-rules"]) || [];
     const { designable } = useDesignable();
     const tarComponent = useComponent(component) || component;
@@ -43612,7 +43614,7 @@ function IconField(props) {
   const { value, onChange, disabled } = props;
   const [visible, setVisible] = (0, import_react2.useState)(false);
   const { t } = (0, import_react_i18next.useTranslation)();
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd.Input.Group, { compact: true, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd.Space.Compact, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       PopoverWithStopPropagation,
       {
@@ -48762,6 +48764,7 @@ const TableBlockDesigner = () => {
     },
     [dn, field.decoratorProps, fieldSchema, service]
   );
+  const api = useAPIClient();
   return (
     // fix https://nocobase.height.app/T-2259
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RecordProvider, { parent: record, record: {}, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(GeneralSchemaDesigner, { template: template2, title: title || name, children: [
@@ -48792,18 +48795,28 @@ const TableBlockDesigner = () => {
         {
           title: t("Enable drag and drop sorting"),
           checked: field.decoratorProps.dragSort,
-          onChange: (dragSort2) => {
-            var _a2;
+          onChange: (dragSort2) => __async(void 0, null, function* () {
+            var _a2, _b2, _c2;
+            if (dragSort2 && collectionField) {
+              const { data } = yield api.resource("collections.fields", collectionField.collectionName).update({
+                filterByTk: collectionField.name,
+                values: {
+                  sortable: true
+                }
+              });
+              const sortBy = (_b2 = (_a2 = data == null ? void 0 : data.data) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.sortBy;
+              fieldSchema["x-decorator-props"].dragSortBy = sortBy;
+            }
             field.decoratorProps.dragSort = dragSort2;
             fieldSchema["x-decorator-props"].dragSort = dragSort2;
-            service.run(__spreadProps(__spreadValues({}, (_a2 = service.params) == null ? void 0 : _a2[0]), { sort: "sort" }));
+            service.run(__spreadProps(__spreadValues({}, (_c2 = service.params) == null ? void 0 : _c2[0]), { sort: fieldSchema["x-decorator-props"].dragSortBy }));
             dn.emit("patch", {
               schema: {
                 ["x-uid"]: fieldSchema["x-uid"],
                 "x-decorator-props": fieldSchema["x-decorator-props"]
               }
             });
-          }
+          })
         }
       ),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(FixedBlockDesignerItem, {}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.15.0-alpha.4",
+  "version": "0.16.0-alpha.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -25,9 +25,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "0.15.0-alpha.4",
-    "@nocobase/sdk": "0.15.0-alpha.4",
-    "@nocobase/utils": "0.15.0-alpha.4",
+    "@nocobase/evaluators": "0.16.0-alpha.1",
+    "@nocobase/sdk": "0.16.0-alpha.1",
+    "@nocobase/utils": "0.16.0-alpha.1",
     "@types/requirejs": "^2.1.34",
     "ahooks": "^3.7.2",
     "antd": "^5.8.6",
@@ -76,5 +76,5 @@
     "dumi": "^2.2.0",
     "dumi-theme-nocobase": "^0.2.14"
   },
-  "gitHead": "380045c660ea0432f3e8fd7cf01c3cfe7275db34"
+  "gitHead": "e8aaf48d169448376a06d87f090786cd7649255e"
 }