amis-core 6.5.0 → 6.7.0

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 
@@ -157,7 +157,8 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
         default: '',
         hover: ':hover',
         active: ':hover:active',
-        disabled: '.is-disabled'
+        focused: '',
+        disabled: ''
     };
     var _loop_1 = function (item) {
         var body = themeCss[item.key];
@@ -173,6 +174,7 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
             default: {},
             hover: {},
             active: {},
+            focused: {},
             disabled: {}
         };
         Object.keys(body).forEach(function (key) {
@@ -186,6 +188,9 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
                 else if (!!~key.indexOf(':active')) {
                     statusMap.active[key.replace(':active', '')] = body[key];
                 }
+                else if (!!~key.indexOf(':focused')) {
+                    statusMap.focused[key.replace(':focused', '')] = body[key];
+                }
                 else if (!!~key.indexOf(':disabled')) {
                     statusMap.disabled[key.replace(':disabled', '')] = body[key];
                 }
@@ -241,9 +246,10 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
             if (styles.length > 0) {
                 var cx = ((weights === null || weights === void 0 ? void 0 : weights.pre) || '') + className + ((weights === null || weights === void 0 ? void 0 : weights.suf) || '');
                 var inner = (weights === null || weights === void 0 ? void 0 : weights.inner) || '';
+                var parent_1 = (weights === null || weights === void 0 ? void 0 : weights.parent) || '';
                 res.push({
-                    className: cx + status2string[status] + inner,
-                    content: ".".concat(cx + status2string[status], " ").concat(inner, "{\n  ").concat(styles.join('\n  '), "\n}")
+                    className: parent_1 + cx + status2string[status] + inner,
+                    content: "".concat(parent_1, " .").concat(cx + status2string[status], " ").concat(inner, "{\n  ").concat(styles.join('\n  '), "\n}")
                 });
                 // TODO:切换状态暂时先不改变组件的样式
                 // if (['hover', 'active', 'disabled'].includes(status)) {
@@ -273,14 +279,15 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
         origin: res
     };
 }
-function insertCustomStyle(prams) {
-    var themeCss = prams.themeCss, classNames = prams.classNames, id = prams.id, defaultData = prams.defaultData, customStyleClassPrefix = prams.customStyleClassPrefix, doc = prams.doc, data = prams.data;
+function insertCustomStyle(params) {
+    var _a;
+    var themeCss = params.themeCss, classNames = params.classNames, id = params.id, defaultData = params.defaultData, customStyleClassPrefix = params.customStyleClassPrefix, doc = params.doc, data = params.data;
     if (!themeCss) {
         return;
     }
     var value = formatStyle(themeCss, classNames, id, defaultData, data).value;
     value = customStyleClassPrefix ? "".concat(customStyleClassPrefix, " ").concat(value) : value;
-    var classId = id.replace('u:', '');
+    var classId = ((_a = id === null || id === void 0 ? void 0 : id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id + '';
     if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
         classId += "-".concat(data.index);
     }
@@ -335,7 +342,9 @@ function traverseStyle(style, path, result) {
  * 设置源码编辑自定义样式
  */
 function insertEditCustomStyle(params) {
-    var customStyle = params.customStyle, id = params.id, doc = params.doc, data = params.data;
+    var _a, _b;
+    var customStyle = params.customStyle, doc = params.doc, data = params.data;
+    var id = ((_b = (_a = params.id) === null || _a === void 0 ? void 0 : _a.replace) === null || _b === void 0 ? void 0 : _b.call(_a, 'u:', '')) || params.id + '';
     var styles = {};
     traverseStyle(customStyle, '', styles);
     var content = '';
@@ -344,7 +353,7 @@ function insertEditCustomStyle(params) {
         index = "-".concat(data.index);
     }
     if (!isEmpty__default["default"](styles)) {
-        var className_1 = "wrapperCustomStyle-".concat(id === null || id === void 0 ? void 0 : id.replace('u:', '')).concat(index);
+        var className_1 = "wrapperCustomStyle-".concat(id).concat(index);
         Object.keys(styles).forEach(function (key) {
             if (!isObject__default["default"](styles[key])) {
                 content += "\n.".concat(className_1, " {\n  ").concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(styles[key].replace(/['|"]/g, ''), data, '| raw') || styles[key], "\n}");
@@ -372,18 +381,17 @@ function insertEditCustomStyle(params) {
     }
     insertStyle({
         style: content,
-        classId: 'wrapperCustomStyle-' +
-            ((typeof id === 'string' ? id.replace('u:', '') : '') || helper.uuid()) +
-            index,
+        classId: 'wrapperCustomStyle-' + (id || helper.uuid()) + index,
         doc: doc,
-        id: typeof id === 'string' ? id.replace('u:', '').replace(/(-.*)/, '') : ''
+        id: id.replace(/(-.*)/, '')
     });
 }
 /**
  * 移除自定义样式
  */
 function removeCustomStyle(type, id, doc, data) {
-    var styleId = 'amis-' + (type ? type + '-' : '') + id.replace('u:', '');
+    var _a;
+    var styleId = 'amis-' + (type ? type + '-' : '') + (((_a = id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id + '');
     if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
         styleId += "-".concat(data.index);
     }
@@ -411,14 +419,25 @@ function setThemeClassName(params) {
     if (!id || !themeCss) {
         return '';
     }
-    if (name !== 'wrapperCustomStyle' && !themeCss[name]) {
-        return '';
-    }
     var index = '';
     if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
         index = "-".concat(data.index);
     }
-    return "".concat(name, "-").concat(id.replace('u:', '')) + (extra ? "-".concat(extra) : '') + index;
+    function setClassName(name, id) {
+        var _a;
+        if (name !== 'wrapperCustomStyle' && !themeCss[name]) {
+            return '';
+        }
+        return ("".concat(name, "-").concat(((_a = id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id) +
+            (extra ? "-".concat(extra) : '') +
+            index);
+    }
+    if (typeof name === 'string') {
+        return setClassName(name, id);
+    }
+    else {
+        return name.map(function (n) { return setClassName(n, id); }).join(' ');
+    }
 }
 
 exports.addStyle = addStyle;

package/lib/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/validateId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 
@@ -130,8 +130,8 @@ function verifyRegion(province, city, country) {
         return false;
     }
     // 这里暂时不获取市和区的具体信息，因为调用CityDB会把校验函数传染为异步
-    // city位: 00表示省；01-20，51-70表示省直辖市；21-50表示地区（自治州、盟）
-    if (!/^(?:[0-6]\d|70)$/.test(city)) {
+    // city位: 00表示省；01-20，51-70表示省直辖市；21-50表示地区（自治州、盟）, 90 表示 直辖县级市
+    if (!/^(?:[0-6]\d|70|90)$/.test(city)) {
         return false;
     }
     if (!/^\d\d$/.test(country)) {

package/lib/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.5.0
+ * amis-core v6.7.0
  * Copyright 2018-2024 fex
  */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "6.5.0",
+  "version": "6.7.0",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -49,7 +49,7 @@
   ],
   "dependencies": {
     "@rc-component/mini-decimal": "^1.0.1",
-    "amis-formula": "^6.5.0",
+    "amis-formula": "^6.7.0",
     "classnames": "2.3.2",
     "file-saver": "^2.0.2",
     "hoist-non-react-statics": "^3.3.2",