@luck-design-biz/luckda 1.0.2-20temp2 → 1.0.2-20temp4

package/es/components/LdAutoForm/index.js

@@ -68,8 +68,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var formPreset = uiSettings && uiSettings.form && uiSettings.form[0] && uiSettings.form[0].preset ? JSON.parse(uiSettings.form[0].preset) : {};
   var basicItems = function () {
     var fieldsObj = keyBy(fields, 'field');
-    var mergedArray = mergeAndSort(columns, formPreset.formFieldPreset || [], 'field');
-    var columnsObj = keyBy(mergedArray, 'field');
+    var mergedArray = mergeAndSort(columns, formPreset.formFieldPreset || [], 'aliaName');
+    var columnsObj = keyBy(mergedArray, 'aliaName');
     var keys = isEmpty(fields) ? Object.keys(columnsObj) : union(Object.keys(fieldsObj), Object.keys(columnsObj));
     var _defaultValues = {};
     var _nodes = reduce(keys, function (result, key) {

package/es/lowcode/engine/tools/helper.js

@@ -1,4 +1,5 @@
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _construct from "@babel/runtime/helpers/esm/construct";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
@@ -166,22 +167,36 @@ export function setMetaAttrs(name, data) {
   meta.content = isString(data) ? data : new URLSearchParams(data).toString().replaceAll('&', ',');
   document.head.appendChild(meta);
 }
+function normalize(val) {
+  if (val === 'null') return null;
+  if (val === 'undefined') return undefined;
+  if (val === 'true') return true;
+  if (val === 'false') return false;
+  if (/^-?\d+(\.\d+)?$/.test(val)) return Number(val);
+  return val;
+}
 export function getMetaAttr(name, _) {
   if (isNil(name)) return void 0;
   var meta = document.querySelector("meta[name=\"".concat(name, "\"]"));
+  if (isNil(meta)) return void 0;
   if (meta.content.includes(',')) {
     var data = new URLSearchParams(meta.content.replaceAll(',', '&'));
     if (isNil(_)) {
-      return Object.fromEntries(data.entries());
+      return Object.fromEntries(Array.from(data.entries()).map(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+          k = _ref2[0],
+          v = _ref2[1];
+        return [k, normalize(v)];
+      }));
     }
     if (isArray(_)) {
       return _.map(function (n) {
-        return data.get(n);
+        return normalize(data.get(n));
       });
     }
-    return data.get(_);
+    return normalize(data.get(_));
   }
-  return meta.content;
+  return normalize(meta.content);
 }
 export function getLDMetaAttr(_) {
   return getMetaAttr(META_TAG_NAME, _);
@@ -264,17 +279,17 @@ export function findFirstLeafNode(node) {
   return null;
 }
 export function dataToTree(data, params) {
-  var _ref = params || {},
-    _ref$parentKey = _ref.parentKey,
-    parentKey = _ref$parentKey === void 0 ? 'parentId' : _ref$parentKey,
-    _ref$childKey = _ref.childKey,
-    childKey = _ref$childKey === void 0 ? 'children' : _ref$childKey,
-    _ref$rootId = _ref.rootId,
-    rootId = _ref$rootId === void 0 ? '0' : _ref$rootId,
-    _ref$id = _ref.id,
-    id = _ref$id === void 0 ? 'id' : _ref$id,
-    _ref$stain = _ref.stain,
-    stain = _ref$stain === void 0 ? false : _ref$stain;
+  var _ref3 = params || {},
+    _ref3$parentKey = _ref3.parentKey,
+    parentKey = _ref3$parentKey === void 0 ? 'parentId' : _ref3$parentKey,
+    _ref3$childKey = _ref3.childKey,
+    childKey = _ref3$childKey === void 0 ? 'children' : _ref3$childKey,
+    _ref3$rootId = _ref3.rootId,
+    rootId = _ref3$rootId === void 0 ? '0' : _ref3$rootId,
+    _ref3$id = _ref3.id,
+    id = _ref3$id === void 0 ? 'id' : _ref3$id,
+    _ref3$stain = _ref3.stain,
+    stain = _ref3$stain === void 0 ? false : _ref3$stain;
   var _data = stain ? data : cloneDeep(data);
   var groupedByParents = groupBy(_data, parentKey);
   var itemsById = keyBy(_data, id);

package/lib/components/LdAutoForm/index.js

@@ -76,8 +76,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var formPreset = uiSettings && uiSettings.form && uiSettings.form[0] && uiSettings.form[0].preset ? JSON.parse(uiSettings.form[0].preset) : {};
   var basicItems = function () {
     var fieldsObj = (0, _lodash.keyBy)(fields, 'field');
-    var mergedArray = (0, _utils.mergeAndSort)(columns, formPreset.formFieldPreset || [], 'field');
-    var columnsObj = (0, _lodash.keyBy)(mergedArray, 'field');
+    var mergedArray = (0, _utils.mergeAndSort)(columns, formPreset.formFieldPreset || [], 'aliaName');
+    var columnsObj = (0, _lodash.keyBy)(mergedArray, 'aliaName');
     var keys = (0, _lodash.isEmpty)(fields) ? Object.keys(columnsObj) : (0, _lodash.union)(Object.keys(fieldsObj), Object.keys(columnsObj));
     var _defaultValues = {};
     var _nodes = (0, _lodash.reduce)(keys, function (result, key) {

package/lib/lowcode/engine/tools/helper.js

@@ -20,6 +20,7 @@ exports.omitBadProps = omitBadProps;
 exports.parseCSS = parseCSS;
 exports.setMetaAttrs = setMetaAttrs;
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/construct"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -187,22 +188,36 @@ function setMetaAttrs(name, data) {
   meta.content = (0, _lodash.isString)(data) ? data : new URLSearchParams(data).toString().replaceAll('&', ',');
   document.head.appendChild(meta);
 }
+function normalize(val) {
+  if (val === 'null') return null;
+  if (val === 'undefined') return undefined;
+  if (val === 'true') return true;
+  if (val === 'false') return false;
+  if (/^-?\d+(\.\d+)?$/.test(val)) return Number(val);
+  return val;
+}
 function getMetaAttr(name, _) {
   if ((0, _lodash.isNil)(name)) return void 0;
   var meta = document.querySelector("meta[name=\"".concat(name, "\"]"));
+  if ((0, _lodash.isNil)(meta)) return void 0;
   if (meta.content.includes(',')) {
     var data = new URLSearchParams(meta.content.replaceAll(',', '&'));
     if ((0, _lodash.isNil)(_)) {
-      return Object.fromEntries(data.entries());
+      return Object.fromEntries(Array.from(data.entries()).map(function (_ref) {
+        var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
+          k = _ref2[0],
+          v = _ref2[1];
+        return [k, normalize(v)];
+      }));
     }
     if ((0, _lodash.isArray)(_)) {
       return _.map(function (n) {
-        return data.get(n);
+        return normalize(data.get(n));
       });
     }
-    return data.get(_);
+    return normalize(data.get(_));
   }
-  return meta.content;
+  return normalize(meta.content);
 }
 function getLDMetaAttr(_) {
   return getMetaAttr(_constants.META_TAG_NAME, _);
@@ -285,17 +300,17 @@ function findFirstLeafNode(node) {
   return null;
 }
 function dataToTree(data, params) {
-  var _ref = params || {},
-    _ref$parentKey = _ref.parentKey,
-    parentKey = _ref$parentKey === void 0 ? 'parentId' : _ref$parentKey,
-    _ref$childKey = _ref.childKey,
-    childKey = _ref$childKey === void 0 ? 'children' : _ref$childKey,
-    _ref$rootId = _ref.rootId,
-    rootId = _ref$rootId === void 0 ? '0' : _ref$rootId,
-    _ref$id = _ref.id,
-    id = _ref$id === void 0 ? 'id' : _ref$id,
-    _ref$stain = _ref.stain,
-    stain = _ref$stain === void 0 ? false : _ref$stain;
+  var _ref3 = params || {},
+    _ref3$parentKey = _ref3.parentKey,
+    parentKey = _ref3$parentKey === void 0 ? 'parentId' : _ref3$parentKey,
+    _ref3$childKey = _ref3.childKey,
+    childKey = _ref3$childKey === void 0 ? 'children' : _ref3$childKey,
+    _ref3$rootId = _ref3.rootId,
+    rootId = _ref3$rootId === void 0 ? '0' : _ref3$rootId,
+    _ref3$id = _ref3.id,
+    id = _ref3$id === void 0 ? 'id' : _ref3$id,
+    _ref3$stain = _ref3.stain,
+    stain = _ref3$stain === void 0 ? false : _ref3$stain;
   var _data = stain ? data : (0, _lodash.cloneDeep)(data);
   var groupedByParents = (0, _lodash.groupBy)(_data, parentKey);
   var itemsById = (0, _lodash.keyBy)(_data, id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "1.0.2-20temp2",
+  "version": "1.0.2-20temp4",
   "description": "前端配置管理中心业务组件库",
   "scripts": {
     "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",