namirasoft-site-react 1.4.566 → 1.4.568
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/dist/components/NSBarNotification.js +2 -1
- package/dist/components/NSBarNotification.js.map +1 -1
- package/dist/components/NSID.d.ts +4 -3
- package/dist/components/NSID.js +28 -10
- package/dist/components/NSID.js.map +1 -1
- package/package.json +2 -2
- package/src/components/NSBarNotification.tsx +4 -1
- package/src/components/NSID.tsx +39 -10
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import Styles from "./NSBarNotification.module.css";
|
|
3
3
|
import { useEffect } from "react";
|
|
4
|
+
import { NSID } from "./NSID";
|
|
4
5
|
export var NSBarNotificationColor;
|
|
5
6
|
(function (NSBarNotificationColor) {
|
|
6
7
|
NSBarNotificationColor["GRAY"] = "GRAY";
|
|
@@ -39,7 +40,7 @@ export function NSBarNotification(props) {
|
|
|
39
40
|
case "Information":
|
|
40
41
|
src = "https://static.namirasoft.com/image/concept/close/info.svg";
|
|
41
42
|
}
|
|
42
|
-
return (_jsxs("div", { id: props.id, className: `${Styles.ns_messenger} ${className}`, style: props.style, children: [_jsx("p", { className: `mb-0 ns-font-16-normal`, children: props.text }), _jsx("img", { className: Styles.ns_exit_icon, src: src, alt: "exit", width: 32, height: 32, onClick: () => {
|
|
43
|
+
return (_jsxs("div", { id: props.id, className: `${Styles.ns_messenger} ${className}`, style: props.style, children: [_jsx("p", { className: `mb-0 ns-font-16-normal`, children: NSID.decode(props.text) }), _jsx("img", { className: Styles.ns_exit_icon, src: src, alt: "exit", width: 32, height: 32, onClick: () => {
|
|
43
44
|
var _a;
|
|
44
45
|
(_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
|
|
45
46
|
} })] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSBarNotification.js","sourceRoot":"","sources":["../../src/components/NSBarNotification.tsx"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"NSBarNotification.js","sourceRoot":"","sources":["../../src/components/NSBarNotification.tsx"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAiB9B,MAAM,CAAN,IAAY,sBAOX;AAPD,WAAY,sBAAsB;IAE9B,uCAAa,CAAA;IACb,uCAAa,CAAA;IACb,yCAAe,CAAA;IACf,2CAAiB,CAAA;IACjB,qCAAW,CAAA;AACf,CAAC,EAPW,sBAAsB,KAAtB,sBAAsB,QAOjC;AAED,MAAM,CAAN,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAExB,+CAA2B,CAAA;IAC3B,uCAAmB,CAAA;IACnB,uCAAmB,CAAA;IACnB,mCAAe,CAAA;AACnB,CAAC,EANW,gBAAgB,KAAhB,gBAAgB,QAM3B;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAkC;IAEhE,IAAI,SAAS,GAAG,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IACrE,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACtB,IAAI,GAAG,GAAG,EAAE,CAAC;IAEb,SAAS,CAAC,GAAG,EAAE;QAEX,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;YAE9B,KAAK,CAAC,aAAa,EAAE,CAAC;QAC1B,CAAC,EAAE,GAAG,CAAC,CAAC;QACR,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAEzC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,QAAQ,IAAI,EACZ,CAAC;QACG,KAAK,OAAO;YACR,GAAG,GAAG,6DAA6D,CAAC;YACpE,MAAM;QACV,KAAK,SAAS;YACV,GAAG,GAAG,+DAA+D,CAAC;YACtE,MAAM;QACV,KAAK,SAAS;YACV,GAAG,GAAG,+DAA+D,CAAC;YACtE,MAAM;QACV,KAAK,aAAa;YACd,GAAG,GAAG,4DAA4D,CAAC;IAC3E,CAAC;IAED,OAAO,CACH,eAAK,EAAE,EAAE,KAAK,CAAC,EAAE,EACb,SAAS,EAAE,GAAG,MAAM,CAAC,YAAY,IAAI,SAAS,EAAE,EAChD,KAAK,EAAE,KAAK,CAAC,KAAK,aAElB,YAAG,SAAS,EAAE,wBAAwB,YACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GACxB,EACJ,cACI,SAAS,EAAE,MAAM,CAAC,YAAY,EAC9B,GAAG,EAAE,GAAG,EACR,GAAG,EAAC,MAAM,EACV,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,EAAE,EACV,OAAO,EAAE,GAAG,EAAE;;oBAEV,MAAA,KAAK,CAAC,OAAO,qDAAI,CAAC;gBACtB,CAAC,GACH,IACA,CACT,CAAA;AACL,CAAC;AAAA,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
|
-
import { IBaseComponentProps } from '../main';
|
|
3
1
|
import { CacheService, IStorage } from 'namirasoft-core';
|
|
4
|
-
import { NamirasoftMap } from 'namirasoft-site-map';
|
|
5
2
|
import { NSBaseMetaTable, NSBaseServer } from 'namirasoft-site';
|
|
3
|
+
import { NamirasoftMap } from 'namirasoft-site-map';
|
|
4
|
+
import React from 'react';
|
|
5
|
+
import { IBaseComponentProps } from '../main';
|
|
6
6
|
export interface NSIDProps extends IBaseComponentProps {
|
|
7
7
|
id: string;
|
|
8
8
|
map: NamirasoftMap | null;
|
|
@@ -26,6 +26,7 @@ export declare class NSID extends React.Component<NSIDProps, NSIDState> {
|
|
|
26
26
|
private static mutex;
|
|
27
27
|
private static mutexes;
|
|
28
28
|
private info;
|
|
29
|
+
static decode(text: string): React.ReactNode;
|
|
29
30
|
static getKey(info: NSIDInfo, id: string): string;
|
|
30
31
|
static getInfo(id: string, map?: NamirasoftMap | null): {
|
|
31
32
|
product: {
|
package/dist/components/NSID.js
CHANGED
|
@@ -7,13 +7,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
-
import {
|
|
10
|
+
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
11
|
+
import { Mutex } from 'async-mutex';
|
|
12
|
+
import { BaseUUID, CacheService, EncodingOperation, EncodingOperationPartType, IStorageLocal } from 'namirasoft-core';
|
|
13
|
+
import { NamirasoftMap } from 'namirasoft-site-map';
|
|
11
14
|
import React from 'react';
|
|
12
15
|
import { BaseURLImageFormatter, NSCopy } from '../main';
|
|
13
|
-
import { BaseUUID, CacheService } from 'namirasoft-core';
|
|
14
|
-
import { NamirasoftMap } from 'namirasoft-site-map';
|
|
15
|
-
import { Mutex } from 'async-mutex';
|
|
16
16
|
export class NSID extends React.Component {
|
|
17
|
+
static decode(text) {
|
|
18
|
+
let parts = EncodingOperation.VariableToStringDecode("id", text);
|
|
19
|
+
if (parts.length === 1 && parts[0].type === EncodingOperationPartType.Text)
|
|
20
|
+
return parts[0].text;
|
|
21
|
+
let map = new NamirasoftMap();
|
|
22
|
+
let storage = new IStorageLocal();
|
|
23
|
+
return (_jsx(_Fragment, { children: parts.map((part, i) => _jsx(React.Fragment, { children: part.type === EncodingOperationPartType.Text
|
|
24
|
+
? part.text
|
|
25
|
+
: _jsx(NSID, { id: part.value, map: map, storage: storage }) }, i)) }));
|
|
26
|
+
}
|
|
17
27
|
static getKey(info, id) {
|
|
18
28
|
return `${info.product.id}:${info.table.name}:${id}`;
|
|
19
29
|
}
|
|
@@ -34,16 +44,24 @@ export class NSID extends React.Component {
|
|
|
34
44
|
var _a, _b;
|
|
35
45
|
if (info.table.back_end.get) {
|
|
36
46
|
try {
|
|
37
|
-
let
|
|
47
|
+
let numberColumns = [];
|
|
48
|
+
let codeColumns = [];
|
|
49
|
+
let nameColumns = [];
|
|
38
50
|
info.table.forEachColumn(column => {
|
|
39
|
-
if (column.name.includes("
|
|
40
|
-
|
|
51
|
+
if (column.name.includes("number"))
|
|
52
|
+
numberColumns.push(column.name);
|
|
53
|
+
else if (column.name.includes("code"))
|
|
54
|
+
codeColumns.push(column.name);
|
|
55
|
+
else if (column.name.includes("name"))
|
|
56
|
+
nameColumns.push(column.name);
|
|
41
57
|
});
|
|
58
|
+
let columns = [...numberColumns, ...codeColumns, ...nameColumns];
|
|
42
59
|
let row = yield info.table.back_end.get(id);
|
|
43
60
|
let values = columns.map(column => row[column]).filter(x => x);
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
61
|
+
let result = values.length > 0 ? values.join(" - ") : ((_b = (_a = row.name) !== null && _a !== void 0 ? _a : row.description) !== null && _b !== void 0 ? _b : "");
|
|
62
|
+
if (result.length > 64)
|
|
63
|
+
result = result.substring(0, 64) + "...";
|
|
64
|
+
return result;
|
|
47
65
|
}
|
|
48
66
|
catch (error) {
|
|
49
67
|
console.error(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSID.js","sourceRoot":"","sources":["../../src/components/NSID.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"NSID.js","sourceRoot":"","sources":["../../src/components/NSID.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"framework": "npm",
|
|
9
9
|
"application": "package",
|
|
10
10
|
"private": false,
|
|
11
|
-
"version": "1.4.
|
|
11
|
+
"version": "1.4.568",
|
|
12
12
|
"author": "Amir Abolhasani",
|
|
13
13
|
"license": "MIT",
|
|
14
14
|
"main": "./dist/main.js",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"dayjs": "^1.11.21",
|
|
40
40
|
"namirasoft-api-link": "^1.4.22",
|
|
41
41
|
"namirasoft-api-product": "^1.4.54",
|
|
42
|
-
"namirasoft-core": "^1.4.
|
|
42
|
+
"namirasoft-core": "^1.4.119",
|
|
43
43
|
"namirasoft-schema": "^1.4.29",
|
|
44
44
|
"namirasoft-site": "^1.4.45",
|
|
45
45
|
"namirasoft-site-map": "^1.4.49",
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import Styles from "./NSBarNotification.module.css";
|
|
2
2
|
import { IBaseComponentProps } from "../props/IBaseComponentProps";
|
|
3
3
|
import { useEffect } from "react";
|
|
4
|
+
import { NSID } from "./NSID";
|
|
4
5
|
|
|
5
6
|
export interface NSBarNotificationProps extends IBaseComponentProps
|
|
6
7
|
{
|
|
@@ -70,7 +71,9 @@ export function NSBarNotification(props: NSBarNotificationPropsInner)
|
|
|
70
71
|
className={`${Styles.ns_messenger} ${className}`}
|
|
71
72
|
style={props.style}
|
|
72
73
|
>
|
|
73
|
-
<p className={`mb-0 ns-font-16-normal`}>
|
|
74
|
+
<p className={`mb-0 ns-font-16-normal`}>
|
|
75
|
+
{NSID.decode(props.text)}
|
|
76
|
+
</p>
|
|
74
77
|
<img
|
|
75
78
|
className={Styles.ns_exit_icon}
|
|
76
79
|
src={src}
|
package/src/components/NSID.tsx
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import { Mutex } from 'async-mutex';
|
|
2
|
+
import { BaseUUID, CacheService, EncodingOperation, EncodingOperationPartType, IStorage, IStorageLocal } from 'namirasoft-core';
|
|
3
|
+
import { NSBaseMetaTable, NSBaseServer } from 'namirasoft-site';
|
|
4
|
+
import { NamirasoftMap } from 'namirasoft-site-map';
|
|
1
5
|
import React from 'react';
|
|
2
6
|
import { BaseURLImageFormatter, IBaseComponentProps, NSCopy } from '../main';
|
|
3
|
-
import { BaseUUID, CacheService, IStorage } from 'namirasoft-core';
|
|
4
|
-
import { NamirasoftMap } from 'namirasoft-site-map';
|
|
5
|
-
import { NSBaseMetaTable, NSBaseServer } from 'namirasoft-site';
|
|
6
|
-
import { Mutex } from 'async-mutex';
|
|
7
7
|
|
|
8
8
|
export interface NSIDProps extends IBaseComponentProps
|
|
9
9
|
{
|
|
@@ -34,6 +34,27 @@ export class NSID extends React.Component<NSIDProps, NSIDState>
|
|
|
34
34
|
private static mutex: Mutex = new Mutex();
|
|
35
35
|
private static mutexes: { [product_id: string]: Mutex } = {};
|
|
36
36
|
private info: NSIDInfo | null;
|
|
37
|
+
public static decode(text: string): React.ReactNode
|
|
38
|
+
{
|
|
39
|
+
let parts = EncodingOperation.VariableToStringDecode("id", text);
|
|
40
|
+
if (parts.length === 1 && parts[0].type === EncodingOperationPartType.Text)
|
|
41
|
+
return parts[0].text;
|
|
42
|
+
let map = new NamirasoftMap();
|
|
43
|
+
let storage: IStorage = new IStorageLocal();
|
|
44
|
+
return (
|
|
45
|
+
<>
|
|
46
|
+
{parts.map((part, i) =>
|
|
47
|
+
<React.Fragment key={i}>
|
|
48
|
+
{
|
|
49
|
+
part.type === EncodingOperationPartType.Text
|
|
50
|
+
? part.text
|
|
51
|
+
: <NSID id={part.value} map={map} storage={storage} />
|
|
52
|
+
}
|
|
53
|
+
</React.Fragment>
|
|
54
|
+
)}
|
|
55
|
+
</>
|
|
56
|
+
);
|
|
57
|
+
}
|
|
37
58
|
public static getKey(info: NSIDInfo, id: string)
|
|
38
59
|
{
|
|
39
60
|
return `${info.product.id}:${info.table.name}:${id}`
|
|
@@ -60,17 +81,25 @@ export class NSID extends React.Component<NSIDProps, NSIDState>
|
|
|
60
81
|
{
|
|
61
82
|
try
|
|
62
83
|
{
|
|
63
|
-
let
|
|
84
|
+
let numberColumns: string[] = [];
|
|
85
|
+
let codeColumns: string[] = [];
|
|
86
|
+
let nameColumns: string[] = [];
|
|
64
87
|
info.table.forEachColumn(column =>
|
|
65
88
|
{
|
|
66
|
-
if (column.name.includes("
|
|
67
|
-
|
|
89
|
+
if (column.name.includes("number"))
|
|
90
|
+
numberColumns.push(column.name);
|
|
91
|
+
else if (column.name.includes("code"))
|
|
92
|
+
codeColumns.push(column.name);
|
|
93
|
+
else if (column.name.includes("name"))
|
|
94
|
+
nameColumns.push(column.name);
|
|
68
95
|
});
|
|
96
|
+
let columns = [...numberColumns, ...codeColumns, ...nameColumns];
|
|
69
97
|
let row = await info.table.back_end.get(id);
|
|
70
98
|
let values = columns.map(column => row[column]).filter(x => x);
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
99
|
+
let result = values.length > 0 ? values.join(" - ") : (row.name ?? row.description ?? "");
|
|
100
|
+
if (result.length > 64)
|
|
101
|
+
result = result.substring(0, 64) + "...";
|
|
102
|
+
return result;
|
|
74
103
|
} catch (error)
|
|
75
104
|
{
|
|
76
105
|
console.error(error);
|