@next-libs/cmdb-instances 6.12.0 → 6.12.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [6.12.1](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.12.0...@next-libs/cmdb-instances@6.12.1) (2021-11-23)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **cmdb-url-link:** 兼容其他数据格式 ([ab5cd84](https://github.com/easyops-cn/next-libs/commit/ab5cd84a2bdd2748ac761497ec53b888c1d4a3b7))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
# [6.12.0](https://github.com/easyops-cn/next-libs/compare/@next-libs/cmdb-instances@6.11.2...@next-libs/cmdb-instances@6.12.0) (2021-11-22)
|
|
7
18
|
|
|
8
19
|
|
|
@@ -8,6 +8,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
8
8
|
exports.CmdbUrlLink = CmdbUrlLink;
|
|
9
9
|
exports.generateUrlLink = exports.checkUrl = void 0;
|
|
10
10
|
|
|
11
|
+
var _lodash = require("lodash");
|
|
12
|
+
|
|
11
13
|
var _react = _interopRequireDefault(require("react"));
|
|
12
14
|
|
|
13
15
|
const checkUrl = urlStr => {
|
|
@@ -27,7 +29,7 @@ const generateUrlLink = linkStr => {
|
|
|
27
29
|
const patty = /^\[(.*)\]\((.*)\)$/;
|
|
28
30
|
const arr = linkStr.match(patty);
|
|
29
31
|
|
|
30
|
-
if (
|
|
32
|
+
if ((0, _lodash.isArray)(arr) && arr.length > 0) {
|
|
31
33
|
return {
|
|
32
34
|
url: checkUrl(arr[2]),
|
|
33
35
|
title: arr[1] || arr[2]
|
|
@@ -45,7 +47,7 @@ exports.generateUrlLink = generateUrlLink;
|
|
|
45
47
|
|
|
46
48
|
function CmdbUrlLink(props) {
|
|
47
49
|
const collection = props.linkStr && generateUrlLink(props.linkStr);
|
|
48
|
-
return props.linkStr ? /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("a", {
|
|
50
|
+
return props.linkStr && (0, _lodash.isString)(props.linkStr) ? /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("a", {
|
|
49
51
|
href: collection.url,
|
|
50
52
|
target: "_blank",
|
|
51
53
|
rel: "noopener noreferrer"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/cmdb-url-link/CmdbUrlLink.tsx"],"names":["checkUrl","urlStr","patternSchema","preSlashPatty","test","generateUrlLink","linkStr","patty","arr","match","url","title","link","CmdbUrlLink","props","collection"],"mappings":";;;;;;;;;;AAAA;;AAMO,MAAMA,QAAQ,GAAIC,MAAD,IAAoB;AAC1C,QAAMC,aAAa,GAAG,oBAAtB;AACA,QAAMC,aAAa,GAAG,KAAtB;;AACA,MAAIF,MAAJ,EAAY;AACV,WAAOC,aAAa,CAACE,IAAd,CAAmBH,MAAnB,KAA8BE,aAAa,CAACC,IAAd,CAAmBH,MAAnB,CAA9B,GACHA,MADG,GAEH,YAAYA,MAFhB;AAGD;;AACD,SAAO,EAAP;AACD,CATM;;;;AAUA,MAAMI,eAAe,GAAIC,OAAD,IAAqB;AAClD,QAAMC,KAAK,GAAG,oBAAd;AACA,QAAMC,GAAG,GAAGF,OAAO,CAACG,KAAR,CAAcF,KAAd,CAAZ;;
|
|
1
|
+
{"version":3,"sources":["../../../src/cmdb-url-link/CmdbUrlLink.tsx"],"names":["checkUrl","urlStr","patternSchema","preSlashPatty","test","generateUrlLink","linkStr","patty","arr","match","length","url","title","link","CmdbUrlLink","props","collection"],"mappings":";;;;;;;;;;AAAA;;AACA;;AAMO,MAAMA,QAAQ,GAAIC,MAAD,IAAoB;AAC1C,QAAMC,aAAa,GAAG,oBAAtB;AACA,QAAMC,aAAa,GAAG,KAAtB;;AACA,MAAIF,MAAJ,EAAY;AACV,WAAOC,aAAa,CAACE,IAAd,CAAmBH,MAAnB,KAA8BE,aAAa,CAACC,IAAd,CAAmBH,MAAnB,CAA9B,GACHA,MADG,GAEH,YAAYA,MAFhB;AAGD;;AACD,SAAO,EAAP;AACD,CATM;;;;AAUA,MAAMI,eAAe,GAAIC,OAAD,IAAqB;AAClD,QAAMC,KAAK,GAAG,oBAAd;AACA,QAAMC,GAAG,GAAGF,OAAO,CAACG,KAAR,CAAcF,KAAd,CAAZ;;AAEA,MAAI,qBAAQC,GAAR,KAAgBA,GAAG,CAACE,MAAJ,GAAa,CAAjC,EAAoC;AAClC,WAAO;AACLC,MAAAA,GAAG,EAAEX,QAAQ,CAACQ,GAAG,CAAC,CAAD,CAAJ,CADR;AAELI,MAAAA,KAAK,EAAEJ,GAAG,CAAC,CAAD,CAAH,IAAUA,GAAG,CAAC,CAAD;AAFf,KAAP;AAID,GALD,MAKO;AACL,UAAMK,IAAI,GAAGb,QAAQ,CAACM,OAAD,CAArB;AACA,WAAO;AACLK,MAAAA,GAAG,EAAEE,IADA;AAELD,MAAAA,KAAK,EAAEC;AAFF,KAAP;AAID;AACF,CAhBM;;;;AAiBA,SAASC,WAAT,CAAqBC,KAArB,EAAkE;AACvE,QAAMC,UAAU,GAAGD,KAAK,CAACT,OAAN,IAAiBD,eAAe,CAACU,KAAK,CAACT,OAAP,CAAnD;AACA,SAAOS,KAAK,CAACT,OAAN,IAAiB,sBAASS,KAAK,CAACT,OAAf,CAAjB,gBACL,wDACE;AAAG,IAAA,IAAI,EAAEU,UAAU,CAACL,GAApB;AAAyB,IAAA,MAAM,EAAC,QAAhC;AAAyC,IAAA,GAAG,EAAC;AAA7C,KACGK,UAAU,CAACJ,KADd,CADF,CADK,GAMH,IANJ;AAOD","sourcesContent":["import { isArray, isString } from \"lodash\";\nimport React from \"react\";\n\ninterface CmdbUrlLinkProps {\n linkStr: string;\n}\n\nexport const checkUrl = (urlStr: string) => {\n const patternSchema = /^[a-zA-Z]+:\\/\\/.*$/;\n const preSlashPatty = /^\\//;\n if (urlStr) {\n return patternSchema.test(urlStr) || preSlashPatty.test(urlStr)\n ? urlStr\n : \"http://\" + urlStr;\n }\n return \"\";\n};\nexport const generateUrlLink = (linkStr: string) => {\n const patty = /^\\[(.*)\\]\\((.*)\\)$/;\n const arr = linkStr.match(patty);\n\n if (isArray(arr) && arr.length > 0) {\n return {\n url: checkUrl(arr[2]),\n title: arr[1] || arr[2],\n };\n } else {\n const link = checkUrl(linkStr);\n return {\n url: link,\n title: link,\n };\n }\n};\nexport function CmdbUrlLink(props: CmdbUrlLinkProps): React.ReactElement {\n const collection = props.linkStr && generateUrlLink(props.linkStr);\n return props.linkStr && isString(props.linkStr) ? (\n <span>\n <a href={collection.url} target=\"_blank\" rel=\"noopener noreferrer\">\n {collection.title}\n </a>\n </span>\n ) : null;\n}\n"],"file":"CmdbUrlLink.js"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isArray, isString } from "lodash";
|
|
1
2
|
import React from "react";
|
|
2
3
|
export var checkUrl = urlStr => {
|
|
3
4
|
var patternSchema = /^[a-zA-Z]+:\/\/.*$/;
|
|
@@ -13,7 +14,7 @@ export var generateUrlLink = linkStr => {
|
|
|
13
14
|
var patty = /^\[(.*)\]\((.*)\)$/;
|
|
14
15
|
var arr = linkStr.match(patty);
|
|
15
16
|
|
|
16
|
-
if (
|
|
17
|
+
if (isArray(arr) && arr.length > 0) {
|
|
17
18
|
return {
|
|
18
19
|
url: checkUrl(arr[2]),
|
|
19
20
|
title: arr[1] || arr[2]
|
|
@@ -28,7 +29,7 @@ export var generateUrlLink = linkStr => {
|
|
|
28
29
|
};
|
|
29
30
|
export function CmdbUrlLink(props) {
|
|
30
31
|
var collection = props.linkStr && generateUrlLink(props.linkStr);
|
|
31
|
-
return props.linkStr ? /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("a", {
|
|
32
|
+
return props.linkStr && isString(props.linkStr) ? /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("a", {
|
|
32
33
|
href: collection.url,
|
|
33
34
|
target: "_blank",
|
|
34
35
|
rel: "noopener noreferrer"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/cmdb-url-link/CmdbUrlLink.tsx"],"names":["React","checkUrl","urlStr","patternSchema","preSlashPatty","test","generateUrlLink","linkStr","patty","arr","match","url","title","link","CmdbUrlLink","props","collection"],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"sources":["../../../src/cmdb-url-link/CmdbUrlLink.tsx"],"names":["isArray","isString","React","checkUrl","urlStr","patternSchema","preSlashPatty","test","generateUrlLink","linkStr","patty","arr","match","length","url","title","link","CmdbUrlLink","props","collection"],"mappings":"AAAA,SAASA,OAAT,EAAkBC,QAAlB,QAAkC,QAAlC;AACA,OAAOC,KAAP,MAAkB,OAAlB;AAMA,OAAO,IAAMC,QAAQ,GAAIC,MAAD,IAAoB;AAC1C,MAAMC,aAAa,GAAG,oBAAtB;AACA,MAAMC,aAAa,GAAG,KAAtB;;AACA,MAAIF,MAAJ,EAAY;AACV,WAAOC,aAAa,CAACE,IAAd,CAAmBH,MAAnB,KAA8BE,aAAa,CAACC,IAAd,CAAmBH,MAAnB,CAA9B,GACHA,MADG,GAEH,YAAYA,MAFhB;AAGD;;AACD,SAAO,EAAP;AACD,CATM;AAUP,OAAO,IAAMI,eAAe,GAAIC,OAAD,IAAqB;AAClD,MAAMC,KAAK,GAAG,oBAAd;AACA,MAAMC,GAAG,GAAGF,OAAO,CAACG,KAAR,CAAcF,KAAd,CAAZ;;AAEA,MAAIV,OAAO,CAACW,GAAD,CAAP,IAAgBA,GAAG,CAACE,MAAJ,GAAa,CAAjC,EAAoC;AAClC,WAAO;AACLC,MAAAA,GAAG,EAAEX,QAAQ,CAACQ,GAAG,CAAC,CAAD,CAAJ,CADR;AAELI,MAAAA,KAAK,EAAEJ,GAAG,CAAC,CAAD,CAAH,IAAUA,GAAG,CAAC,CAAD;AAFf,KAAP;AAID,GALD,MAKO;AACL,QAAMK,IAAI,GAAGb,QAAQ,CAACM,OAAD,CAArB;AACA,WAAO;AACLK,MAAAA,GAAG,EAAEE,IADA;AAELD,MAAAA,KAAK,EAAEC;AAFF,KAAP;AAID;AACF,CAhBM;AAiBP,OAAO,SAASC,WAAT,CAAqBC,KAArB,EAAkE;AACvE,MAAMC,UAAU,GAAGD,KAAK,CAACT,OAAN,IAAiBD,eAAe,CAACU,KAAK,CAACT,OAAP,CAAnD;AACA,SAAOS,KAAK,CAACT,OAAN,IAAiBR,QAAQ,CAACiB,KAAK,CAACT,OAAP,CAAzB,gBACL,+CACE;AAAG,IAAA,IAAI,EAAEU,UAAU,CAACL,GAApB;AAAyB,IAAA,MAAM,EAAC,QAAhC;AAAyC,IAAA,GAAG,EAAC;AAA7C,KACGK,UAAU,CAACJ,KADd,CADF,CADK,GAMH,IANJ;AAOD","sourcesContent":["import { isArray, isString } from \"lodash\";\nimport React from \"react\";\n\ninterface CmdbUrlLinkProps {\n linkStr: string;\n}\n\nexport const checkUrl = (urlStr: string) => {\n const patternSchema = /^[a-zA-Z]+:\\/\\/.*$/;\n const preSlashPatty = /^\\//;\n if (urlStr) {\n return patternSchema.test(urlStr) || preSlashPatty.test(urlStr)\n ? urlStr\n : \"http://\" + urlStr;\n }\n return \"\";\n};\nexport const generateUrlLink = (linkStr: string) => {\n const patty = /^\\[(.*)\\]\\((.*)\\)$/;\n const arr = linkStr.match(patty);\n\n if (isArray(arr) && arr.length > 0) {\n return {\n url: checkUrl(arr[2]),\n title: arr[1] || arr[2],\n };\n } else {\n const link = checkUrl(linkStr);\n return {\n url: link,\n title: link,\n };\n }\n};\nexport function CmdbUrlLink(props: CmdbUrlLinkProps): React.ReactElement {\n const collection = props.linkStr && generateUrlLink(props.linkStr);\n return props.linkStr && isString(props.linkStr) ? (\n <span>\n <a href={collection.url} target=\"_blank\" rel=\"noopener noreferrer\">\n {collection.title}\n </a>\n </span>\n ) : null;\n}\n"],"file":"CmdbUrlLink.js"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@next-libs/cmdb-instances",
|
|
3
|
-
"version": "6.12.
|
|
3
|
+
"version": "6.12.1",
|
|
4
4
|
"description": "> TODO: description",
|
|
5
5
|
"homepage": "https://github.com/easyops-cn/next-libs/tree/master/libs/cmdb-instances",
|
|
6
6
|
"license": "GPL-3.0",
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"immutability-helper": "^3.1.1",
|
|
51
51
|
"marked": "^2.1.3"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "fcbd7ecb8dbdbf3e1e164560964686ad499d8286"
|
|
54
54
|
}
|