@pisell/materials 6.11.54 → 6.11.56

package/es/components/PisellCards/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const PisellCards: {
     TabCard: (props: any) => import("react").JSX.Element;
     TextCard: (props: any) => import("react").JSX.Element;

package/es/components/PisellFields/index.d.ts

@@ -9,7 +9,6 @@
  * <PisellFields.Number value={123} viewMode="readonly" />
  * <PisellFields.Currency value={1000} currencySymbol="$" />
  */
-/// <reference types="react" />
 declare const PisellFields: {
     SingleLineText: import("react").NamedExoticComponent<import("../pisellSingleLineText").PisellSingleLineTextProps>;
     LongText: import("react").NamedExoticComponent<import("../pisellLongText").PisellLongTextProps>;

package/es/components/PisellMetrics/index.d.ts

@@ -13,7 +13,6 @@
  * />
  * <PisellMetrics.StatisticList data={[...]} />
  */
-/// <reference types="react" />
 declare const PisellMetrics: {
     MetricCard: import("react").FC<import("../pisellMetricCard").PisellMetricCardProps>;
     StatisticList: (props: import("../pisellStatisticList").PisellStatisticListProps) => import("react").JSX.Element;

package/es/components/dataSourceComponents/dataSourceForm/BaseForm.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["title", "description", "dataSource", "showTitle", "showDescription", "groupInfoPosition", "variables", "renderMode", "children", "currentValue", "className", "onDataSourceFinish", "formatSubmitValues", "formatInitialValues", "customSubmit", "beforeSubmit", "leaveConfirmConfig"];
+var _excluded = ["title", "description", "dataSource", "showTitle", "showDescription", "groupInfoPosition", "variables", "renderMode", "children", "currentValue", "className", "onDataSourceFinish", "onDataSourceLoaded", "formatSubmitValues", "formatInitialValues", "customSubmit", "beforeSubmit", "leaveConfirmConfig", "scene", "sceneRequestId"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -13,7 +13,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react';
 import classNames from 'classnames';
-import { useMemoizedFn } from 'ahooks';
+import { useMemoizedFn, useDeepCompareEffect } from 'ahooks';
 import PisellModal from "../../pisellModal";
 import useCtxActions from "../hooks/useCtxActions";
 import useDataSource from "../hooks/useDataSource";
@@ -22,7 +22,7 @@ import Form from "../../form";
 import FormSettingProvider from "./provider/formSetting/FormSettingProvider";
 import PageHeader from "../../page-header";
 import { transformFormObjToArrayWithUntouched } from "./utils";
-import { getFormSettingMetaData } from "./serve";
+import { getFormSettingMetaData, getDeviceSettingMetaData } from "./serve";
 import useFormSettingParams from "../hooks/useFormSettingParams";
 import "./index.less";
 import { isArr } from "@pisell/utils";
@@ -31,7 +31,7 @@ import { isArr } from "@pisell/utils";
  * @description: 基于数据源动态生成表单，支持编辑、查看、禁用三种模式
  */
 var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _context$appHelper;
+  var _context$pageContext, _context$appHelper;
   var title = props.title,
     description = props.description,
     dataSource = props.dataSource,
@@ -44,13 +44,17 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
     currentValue = props.currentValue,
     className = props.className,
     onDataSourceFinish = props.onDataSourceFinish,
+    onDataSourceLoaded = props.onDataSourceLoaded,
     formatSubmitValues = props.formatSubmitValues,
     formatInitialValues = props.formatInitialValues,
     customSubmit = props.customSubmit,
     beforeSubmit = props.beforeSubmit,
     leaveConfirmConfig = props.leaveConfirmConfig,
+    scene = props.scene,
+    sceneRequestId = props.sceneRequestId,
     others = _objectWithoutProperties(props, _excluded);
   var context = useEngineContext();
+  console.log('context_pageProps', context === null || context === void 0 || (_context$pageContext = context.pageContext) === null || _context$pageContext === void 0 ? void 0 : _context$pageContext.props);
   var _useCtxActions = useCtxActions(),
     setBeforeClose = _useCtxActions.setBeforeClose;
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
@@ -74,27 +78,30 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
   useImperativeHandle(ref, function () {
     return formRef.current;
   });
-  useEffect(function () {
+  useDeepCompareEffect(function () {
     if (['edit', 'view'].includes(renderMode || '') && dataSource) {
-      if (dataSource !== null && dataSource !== void 0 && dataSource.fromSettingMeta) {
-        var _dataSource$fields;
+      if (dataSource !== null && dataSource !== void 0 && dataSource.fromSettingMeta || dataSource !== null && dataSource !== void 0 && dataSource.fromDeviceSettingMeta) {
+        var _dataSource$fields, _dataSource$fields2;
         if (props.__designMode === 'design') return;
-        // 从URL获取参数
-        var sectionCodes = Array.from(new Set(dataSource === null || dataSource === void 0 || (_dataSource$fields = dataSource.fields) === null || _dataSource$fields === void 0 ? void 0 : _dataSource$fields.map(function (field) {
-          return field.name.split('.').shift();
-        })));
-
-        // 使用API方法获取formSettingMeta数据（必须传入参数）
-        getFormSettingMetaData({
-          sectionCodes: sectionCodes,
+        var fetchMetaData = dataSource !== null && dataSource !== void 0 && dataSource.fromDeviceSettingMeta ? getDeviceSettingMetaData({
+          scene: scene,
+          sceneRequestId: sceneRequestId || '',
+          items: (dataSource === null || dataSource === void 0 || (_dataSource$fields = dataSource.fields) === null || _dataSource$fields === void 0 ? void 0 : _dataSource$fields.map(function (field) {
+            return field.name;
+          })) || []
+        }) : getFormSettingMetaData({
+          sectionCodes: Array.from(new Set(dataSource === null || dataSource === void 0 || (_dataSource$fields2 = dataSource.fields) === null || _dataSource$fields2 === void 0 ? void 0 : _dataSource$fields2.map(function (field) {
+            return field.name.split('.').shift();
+          }))),
           scope: scope,
           target: target
-        }).then(function (res) {
-          var _dataSource$fields2, _formRef$current2;
+        });
+        fetchMetaData.then(function (res) {
+          var _dataSource$fields3, _formRef$current2;
           var formattedValues = formatInitialValues ? formatInitialValues(res.data) : res.data || {};
 
           // 根据 dataSource.fields 筛选 formattedValues
-          var fieldNames = new Set((dataSource === null || dataSource === void 0 || (_dataSource$fields2 = dataSource.fields) === null || _dataSource$fields2 === void 0 ? void 0 : _dataSource$fields2.map(function (field) {
+          var fieldNames = new Set((dataSource === null || dataSource === void 0 || (_dataSource$fields3 = dataSource.fields) === null || _dataSource$fields3 === void 0 ? void 0 : _dataSource$fields3.map(function (field) {
             return field.name;
           })) || []);
           var filteredValues = Object.keys(formattedValues).reduce(function (acc, key) {
@@ -104,6 +111,7 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
             return acc;
           }, {});
           (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFields(transformFormObjToArrayWithUntouched(_objectSpread({}, filteredValues)));
+          onDataSourceLoaded === null || onDataSourceLoaded === void 0 || onDataSourceLoaded(filteredValues, res);
         }).catch(function (error) {
           console.error('获取formSettingMeta数据失败:', error);
         });
@@ -114,9 +122,9 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
         var formattedValues = formatInitialValues ? formatInitialValues(res) : res;
         var values = formattedValues;
         if (isArr(dataSource === null || dataSource === void 0 ? void 0 : dataSource.fields)) {
-          var _dataSource$fields3;
+          var _dataSource$fields4;
           // 根据 dataSource.fields 筛选 formattedValues
-          var fieldNames = new Set((dataSource === null || dataSource === void 0 || (_dataSource$fields3 = dataSource.fields) === null || _dataSource$fields3 === void 0 ? void 0 : _dataSource$fields3.map(function (field) {
+          var fieldNames = new Set((dataSource === null || dataSource === void 0 || (_dataSource$fields4 = dataSource.fields) === null || _dataSource$fields4 === void 0 ? void 0 : _dataSource$fields4.map(function (field) {
             return field.name;
           })) || []);
           values = Object.keys(formattedValues).reduce(function (acc, key) {
@@ -127,6 +135,7 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
           }, {});
         }
         (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || _formRef$current3.setFields(transformFormObjToArrayWithUntouched(values));
+        onDataSourceLoaded === null || onDataSourceLoaded === void 0 || onDataSourceLoaded(values, res);
       });
     }
   }, [renderMode, dataSource]);
@@ -215,7 +224,9 @@ var BaseForm = /*#__PURE__*/forwardRef(function (props, ref) {
     formatSubmitValues: formatSubmitValues,
     formatInitialValues: formatInitialValues,
     customSubmit: customSubmit,
-    beforeSubmit: beforeSubmit
+    beforeSubmit: beforeSubmit,
+    scene: scene,
+    sceneRequestId: sceneRequestId
   }, /*#__PURE__*/React.createElement(Form, _extends({}, others, {
     className: classNames('pisell-lowcode-data-source-form', className),
     ref: formRef,

package/es/components/dataSourceComponents/dataSourceForm/provider/formSetting/FormSettingProvider.js

@@ -15,7 +15,9 @@ var FormSettingProvider = function FormSettingProvider(props) {
     formatSubmitValues = props.formatSubmitValues,
     formatInitialValues = props.formatInitialValues,
     customSubmit = props.customSubmit,
-    beforeSubmit = props.beforeSubmit;
+    beforeSubmit = props.beforeSubmit,
+    scene = props.scene,
+    sceneRequestId = props.sceneRequestId;
   var value = React.useMemo(function () {
     return {
       renderMode: renderMode,
@@ -26,9 +28,11 @@ var FormSettingProvider = function FormSettingProvider(props) {
       formatSubmitValues: formatSubmitValues,
       formatInitialValues: formatInitialValues,
       customSubmit: customSubmit,
-      beforeSubmit: beforeSubmit
+      beforeSubmit: beforeSubmit,
+      scene: scene,
+      sceneRequestId: sceneRequestId
     };
-  }, [renderMode, groupInfoPosition, currentValue, size, beforeSubmit]);
+  }, [renderMode, groupInfoPosition, currentValue, size, beforeSubmit, scene, sceneRequestId]);
   return /*#__PURE__*/React.createElement(FormSettingContext.Provider, {
     value: value
   }, children);

package/es/components/dataSourceComponents/dataSourceForm/serve.js

@@ -366,4 +366,103 @@ export var updateTenantSetting = /*#__PURE__*/function () {
   return function updateTenantSetting(_x12) {
     return _ref14.apply(this, arguments);
   };
+}();
+var buildDeviceSettingUrl = function buildDeviceSettingUrl() {
+  var scene = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'template';
+  var id = arguments.length > 1 ? arguments[1] : undefined;
+  switch (scene) {
+    case 'profile':
+      return "/tenant/device/profile/".concat(id, "/setting");
+    case 'instance':
+      return "/tenant/device/".concat(id, "/setting");
+    case 'template':
+    default:
+      return "/admin/device/profile/template/".concat(id, "/setting");
+  }
+};
+
+/**
+ * 获取设备设置元数据（POST 类型 GET）
+ * @param params.scene 场景，默认 template
+ * @param params.sceneRequestId URL 中 {id} 占位符的实际取值
+ * @param params.items 需要获取的字段列表，例如 ['order.name', 'order.id']
+ */
+export var getDeviceSettingMetaData = /*#__PURE__*/function () {
+  var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(params) {
+    var scene, sceneRequestId, items, url;
+    return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+      while (1) switch (_context12.prev = _context12.next) {
+        case 0:
+          scene = params.scene, sceneRequestId = params.sceneRequestId, items = params.items;
+          console.log('getDeviceSettingMetaData', params);
+          if (sceneRequestId) {
+            _context12.next = 5;
+            break;
+          }
+          PisellToast({
+            content: getText('pisell-data-source-form-scene-request-id-message')
+          });
+          return _context12.abrupt("return", {});
+        case 5:
+          url = buildDeviceSettingUrl(scene, sceneRequestId);
+          return _context12.abrupt("return", request.getRequest().post(url, {
+            items: items
+          }, {
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            isPisell2: true
+          }));
+        case 7:
+        case "end":
+          return _context12.stop();
+      }
+    }, _callee12);
+  }));
+  return function getDeviceSettingMetaData(_x13) {
+    return _ref15.apply(this, arguments);
+  };
+}();
+
+/**
+ * 更新设备设置数据
+ * @param params.scene 场景，默认 template
+ * @param params.sceneRequestId URL 中 {id} 占位符的实际取值
+ * @param params.data 需要更新的字段值对象
+ */
+export var updateDeviceSetting = /*#__PURE__*/function () {
+  var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(params) {
+    var scene, sceneRequestId, data, url;
+    return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+      while (1) switch (_context13.prev = _context13.next) {
+        case 0:
+          scene = params.scene, sceneRequestId = params.sceneRequestId, data = params.data;
+          console.log('updateDeviceSetting', params);
+          if (sceneRequestId) {
+            _context13.next = 5;
+            break;
+          }
+          PisellToast({
+            content: getText('pisell-data-source-form-scene-request-id-message')
+          });
+          return _context13.abrupt("return", {});
+        case 5:
+          url = buildDeviceSettingUrl(scene, sceneRequestId);
+          return _context13.abrupt("return", request.getRequest().put(url, {
+            items: data
+          }, {
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            isPisell2: true
+          }));
+        case 7:
+        case "end":
+          return _context13.stop();
+      }
+    }, _callee13);
+  }));
+  return function updateDeviceSetting(_x14) {
+    return _ref16.apply(this, arguments);
+  };
 }();

package/es/components/dataSourceComponents/dataSourceForm/submitButton/index.js

@@ -19,7 +19,7 @@ import useDataSource from "../../hooks/useDataSource";
 import { filterSystemFields, setFormFieldsUntouched } from "../utils";
 import useFormSettingParams from "../../hooks/useFormSettingParams";
 import "./index.less";
-import { updateTenantSetting } from "../serve";
+import { updateTenantSetting, updateDeviceSetting } from "../serve";
 // 表单提交按钮
 var SubmitButton = function SubmitButton(props) {
   var children = props.children,
@@ -49,7 +49,9 @@ var SubmitButton = function SubmitButton(props) {
     onDataSourceFinish = _useFormSetting.onDataSourceFinish,
     formatSubmitValues = _useFormSetting.formatSubmitValues,
     customSubmit = _useFormSetting.customSubmit,
-    beforeSubmit = _useFormSetting.beforeSubmit;
+    beforeSubmit = _useFormSetting.beforeSubmit,
+    scene = _useFormSetting.scene,
+    sceneRequestId = _useFormSetting.sceneRequestId;
   var _useCtxActions = useCtxActions(),
     setVisible = _useCtxActions.setVisible,
     refreshTableData = _useCtxActions.refreshTableData;
@@ -66,56 +68,69 @@ var SubmitButton = function SubmitButton(props) {
           case 0:
             setLoading(true);
             _context.prev = 1;
-            if (!(dataSource !== null && dataSource !== void 0 && dataSource.fromSettingMeta)) {
+            if (!(dataSource !== null && dataSource !== void 0 && dataSource.fromDeviceSettingMeta)) {
               _context.next = 6;
               break;
             }
             _context.next = 5;
-            return updateTenantSetting({
-              scope: scope,
-              target: target,
+            return updateDeviceSetting({
+              scene: scene,
+              sceneRequestId: sceneRequestId || '',
               data: values
             });
           case 5:
             return _context.abrupt("return", _context.sent);
           case 6:
-            if (!customSubmit) {
+            if (!(dataSource !== null && dataSource !== void 0 && dataSource.fromSettingMeta)) {
               _context.next = 10;
               break;
             }
             _context.next = 9;
-            return customSubmit(values);
+            return updateTenantSetting({
+              scope: scope,
+              target: target,
+              data: values
+            });
           case 9:
             return _context.abrupt("return", _context.sent);
           case 10:
-            if (!(renderMode === 'edit')) {
-              _context.next = 16;
+            if (!customSubmit) {
+              _context.next = 14;
               break;
             }
             _context.next = 13;
-            return update.runAsync(values);
+            return customSubmit(values);
           case 13:
             return _context.abrupt("return", _context.sent);
-          case 16:
+          case 14:
+            if (!(renderMode === 'edit')) {
+              _context.next = 20;
+              break;
+            }
+            _context.next = 17;
+            return update.runAsync(values);
+          case 17:
+            return _context.abrupt("return", _context.sent);
+          case 20:
             if (!(renderMode === 'add')) {
-              _context.next = 22;
+              _context.next = 26;
               break;
             }
-            _context.next = 19;
+            _context.next = 23;
             return create.runAsync(values);
-          case 19:
+          case 23:
             res = _context.sent;
             form === null || form === void 0 || form.resetFields();
             return _context.abrupt("return", res);
-          case 22:
-            _context.prev = 22;
+          case 26:
+            _context.prev = 26;
             setLoading(false);
-            return _context.finish(22);
-          case 25:
+            return _context.finish(26);
+          case 29:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1,, 22, 25]]);
+      }, _callee, null, [[1,, 26, 29]]);
     }));
     return function onSubmit(_x) {
       return _ref.apply(this, arguments);

package/es/components/dataSourceComponents/dataSourceForm/utils.d.ts

@@ -44,7 +44,7 @@ export declare const withDataSource: <P extends unknown>(WrappedComponent: React
 }) => React.JSX.Element;
 export declare const withOptions: <P extends unknown>(WrappedComponent: React.ComponentType<P>) => (props: P & {
     options?: any;
-    optionSourceType?: "default" | "api" | "custom" | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;

package/es/components/dataSourceComponents/dataSourceShow/dataSourceQRCode/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const DataSourceQRCode: (props: any) => import("react").JSX.Element;
 export default DataSourceQRCode;

package/es/components/dataSourceComponents/dataSourceTable/BaseTable.js

@@ -89,7 +89,7 @@ var BaseTable = function BaseTable(props, ref) {
   }, [dataSourceKey]);
   useEffect(function () {
     if (dataSourceKeyRef.current) {
-      if (dataSource !== null && dataSource !== void 0 && dataSource.fromSettingMeta) return;
+      if (dataSource !== null && dataSource !== void 0 && dataSource.fromSettingMeta || dataSource !== null && dataSource !== void 0 && dataSource.fromDeviceSettingMeta) return;
       list === null || list === void 0 || list.run(queryPageConfig);
     } else {
       list === null || list === void 0 || list.mutate([]);

package/es/components/dataSourceComponents/dataSourceTable/hooks/useDataSourceKey.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const useDataSourceKey: () => {
     dataSourceKey: string | undefined;
     dataSourceKeyRef: import("react").MutableRefObject<string | undefined>;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useDrawerState.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const useDrawerState: (operationContent?: {
     [key: string]: import("react").ReactNode;
 } | undefined) => any;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableQuery.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DataSourceTableProps } from '../type';
 declare type Params = {
     pagination?: {

package/es/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 declare const Subdomain: React.FC<import("antd").InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-    rootDomain: "saas" | "custom" | "xzero";
+    rootDomain: "custom" | "saas" | "xzero";
     customDomain?: string | undefined;
     value?: string | undefined;
     tenantId: string;

package/es/components/dataSourceComponents/fields/RecordListWrapper/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 declare const RecordListWrapperWithDataSource: (props: import("./type").RecordListWrapperProps & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: "default" | "api" | "custom" | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;

package/es/components/dataSourceComponents/fields/Select/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 declare const SelectWithDataSource: (props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: "default" | "api" | "custom" | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;

package/es/components/dataSourceComponents/fields/Tabs/index.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="react" />
 /** 包装 DataSource 层（提供数据源上下文） */
 declare const FormItemTabs: (props: import("./type").TabsProps & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: "default" | "api" | "custom" | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;

package/es/components/dataSourceComponents/fields/Upload/utils.d.ts

@@ -15,4 +15,4 @@ export declare const getFileMetadataParams: (file: RcFile & {
     metadata?: MediaMetadata;
 }) => Record<string, any>;
 export declare const isValueEqual: (value: any, fileListValue: any) => boolean;
-export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;

package/es/components/dataSourceComponents/fields/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const formFieldMap: {
     FormItemCheckbox: import("react").FC<{}> & {
         Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
@@ -20,7 +19,7 @@ declare const formFieldMap: {
         Subdomain: import("react").FC<import("antd").InputProps & {
             onChange: (value: string) => void;
             onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-            rootDomain: "saas" | "custom" | "xzero";
+            rootDomain: "custom" | "saas" | "xzero";
             customDomain?: string | undefined;
             value?: string | undefined;
             tenantId: string;
@@ -35,7 +34,7 @@ declare const formFieldMap: {
     };
     FormItemSelect: (props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
         options?: any;
-        optionSourceType?: "default" | "api" | "custom" | undefined;
+        optionSourceType?: "default" | "custom" | "api" | undefined;
         labelField: string;
         valueField: string;
         extraParams?: Record<string, any> | undefined;
@@ -62,7 +61,7 @@ declare const formFieldMap: {
     FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemRecordListWrapper: (props: import("./RecordListWrapper/type").RecordListWrapperProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
         options?: any;
-        optionSourceType?: "default" | "api" | "custom" | undefined;
+        optionSourceType?: "default" | "custom" | "api" | undefined;
         labelField: string;
         valueField: string;
         extraParams?: Record<string, any> | undefined;
@@ -72,7 +71,7 @@ declare const formFieldMap: {
     }) => import("react").JSX.Element;
     FormItemTabs: (props: import("./Tabs/type").TabsProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
         options?: any;
-        optionSourceType?: "default" | "api" | "custom" | undefined;
+        optionSourceType?: "default" | "custom" | "api" | undefined;
         labelField: string;
         valueField: string;
         extraParams?: Record<string, any> | undefined;
@@ -81,11 +80,13 @@ declare const formFieldMap: {
         extraParams?: Record<string, any> | undefined;
     }) => import("react").JSX.Element;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
-}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
+}) | import("react").FC<import("./ColorPicker/type").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
+    onChange: (value: string) => void;
+} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
     JSON: import("react").FC<any>;
     Password: import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     TextArea: import("react").FC<import("antd/es/input").TextAreaProps & import("react").RefAttributes<import("antd/es/input/TextArea").TextAreaRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
@@ -98,31 +99,29 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     Subdomain: import("react").FC<import("antd").InputProps & {
         onChange: (value: string) => void;
         onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-        rootDomain: "saas" | "custom" | "xzero";
+        rootDomain: "custom" | "saas" | "xzero";
         customDomain?: string | undefined;
         value?: string | undefined;
         tenantId: string;
         name?: string | undefined;
         fieldKey?: string | undefined;
     } & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-}) | (import("react").FC<{}> & {
+}) | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 }) | ((props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: "default" | "api" | "custom" | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
     extraParams?: Record<string, any> | undefined;
-}) => import("react").JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Phone/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Input.Mobile/WithMode").PhoneInputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & {
-    onChange: (value: string) => void;
-} & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | ((props: import("./RecordListWrapper/type").RecordListWrapperProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
+}) => import("react").JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | ((props: import("./RecordListWrapper/type").RecordListWrapperProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: "default" | "api" | "custom" | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;
@@ -131,7 +130,7 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     extraParams?: Record<string, any> | undefined;
 }) => import("react").JSX.Element) | ((props: import("./Tabs/type").TabsProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: "default" | "api" | "custom" | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
     extraParams?: Record<string, any> | undefined;