@topconsultnpm/sdkui-react 6.21.0-dev1.22 → 6.21.0-dev1.24

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.
@@ -132,12 +132,24 @@ const TMFormulaEditor = (props) => {
132
132
  const renderTreeViewItem = useCallback((item) => {
133
133
  return (_jsxs(StyledDivHorizontal, { style: { display: 'flex', gap: '5px', overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis' }, children: [renderFormulaIcon(item.icon, item.tid, item.md), _jsx("p", { style: { verticalAlign: 'middle', whiteSpace: 'nowrap', textOverflow: 'ellipsis' }, children: item.text })] }));
134
134
  }, []);
135
+ const translateDescInFormula = (text) => {
136
+ switch (text) {
137
+ case `TM_GetViewLink (${SDKUI_Localizator.FormulaEditor_Function_TM_GetViewLink_WithoutLogin})`:
138
+ return `[dbo].[TM_GetViewLink](NULL, NULL, NULL, 0, {@TID}, {@DID}, 1, NULL, 0)`;
139
+ case `TM_GetViewLink (${SDKUI_Localizator.FormulaEditor_Function_TM_GetViewLink_WithLogin})`:
140
+ return `[dbo].[TM_GetViewLink](NULL, 'ASKLOGIN', NULL, 0, {@TID}, {@DID}, 1, NULL, 0)`;
141
+ case `TM_GetViewLink (${SDKUI_Localizator.FormulaEditor_Function_TM_GetViewLink_WithDate})`:
142
+ return `[dbo].[TM_GetViewLink](NULL, NULL, NULL, 0, {@TID}, {@DID}, 1, CONVERT(VARCHAR, {@CreationTime}+30, 126), 0)`;
143
+ break;
144
+ }
145
+ return text;
146
+ };
135
147
  const handleTreeViewItemClick = (e) => {
136
148
  if (!e)
137
149
  return;
138
150
  if (e.itemData?.hasItems)
139
151
  return;
140
- insertText(e.itemData?.text);
152
+ insertText(translateDescInFormula(e.itemData?.text));
141
153
  };
142
154
  return (_jsx(TMApplyForm, { isModal: props.isModal, formMode: props.formMode, isModified: formData.expression !== formDataOrig.expression, exception: exception, validationItems: validationItems, title: SDKUI_Localizator.Formula, hasNavigation: false, showBack: props.showBack, height: '600px', width: '800px', onApply: () => applyData(), onClose: props.onClose, onUndo: () => {
143
155
  setFormData(formDataOrig);
@@ -705,19 +717,19 @@ export class FormulaHelper {
705
717
  static jsonItems_LoadFunctions_Link() {
706
718
  let items = [{
707
719
  id: '3_4_1',
708
- text: `[dbo].[TM_GetViewLink](NULL, NULL, NULL, 0, {@TID}, {@DID}, 1, NULL, 0)`,
720
+ text: `TM_GetViewLink (${SDKUI_Localizator.FormulaEditor_Function_TM_GetViewLink_WithoutLogin})`,
709
721
  icon: FormulaIconTypes.Function,
710
722
  expanded: false,
711
723
  hasItems: false,
712
724
  }, {
713
725
  id: '3_4_2',
714
- text: `[dbo].[TM_GetViewLink](NULL, 'ASKLOGIN', NULL, 0, {@TID}, {@DID}, 1, NULL, 0)`,
726
+ text: `TM_GetViewLink (${SDKUI_Localizator.FormulaEditor_Function_TM_GetViewLink_WithLogin})`,
715
727
  icon: FormulaIconTypes.Function,
716
728
  expanded: false,
717
729
  hasItems: false,
718
730
  }, {
719
731
  id: '3_4_3',
720
- text: `[dbo].[TM_GetViewLink](NULL, NULL, NULL, 0, {@TID}, {@DID}, 1, CONVERT(VARCHAR, {@CreationTime}+30, 126), 0)`,
732
+ text: `TM_GetViewLink (${SDKUI_Localizator.FormulaEditor_Function_TM_GetViewLink_WithDate})`,
721
733
  icon: FormulaIconTypes.Function,
722
734
  expanded: false,
723
735
  hasItems: false,
@@ -242,6 +242,35 @@ const TMQueryEditor = ({ formMode, inputData, onQDChanged, isExpertMode, showDis
242
242
  curJoinItem.on = onJoinCopy;
243
243
  setFormData({ ...formData, join: joinCopy });
244
244
  };
245
+ const onChange_OnJoinItem_Or = (or, index, indexOn) => {
246
+ const joinCopy = formData?.join?.map((ji) => { return { ...ji }; }) ?? [];
247
+ let curJoinItem = joinCopy[index];
248
+ const onJoinCopy = curJoinItem.on?.map((curItem, curIndex) => {
249
+ if (indexOn != curIndex)
250
+ return curItem;
251
+ let newOn = new OnJoinItem();
252
+ newOn.init({ ...curItem, or: or });
253
+ return newOn;
254
+ });
255
+ curJoinItem.on = onJoinCopy;
256
+ setFormData({ ...formData, join: joinCopy });
257
+ };
258
+ const onChange_OnJoinItem_Brackets = (value, isLeft, index, indexOn) => {
259
+ const joinCopy = formData?.join?.map((ji) => { return { ...ji }; }) ?? [];
260
+ let curJoinItem = joinCopy[index];
261
+ const onJoinCopy = curJoinItem.on?.map((curItem, curIndex) => {
262
+ if (indexOn != curIndex)
263
+ return curItem;
264
+ let newOn = new OnJoinItem();
265
+ if (isLeft)
266
+ newOn.init({ ...curItem, leftBrackets: value });
267
+ else
268
+ newOn.init({ ...curItem, rightBrackets: value });
269
+ return newOn;
270
+ });
271
+ curJoinItem.on = onJoinCopy;
272
+ setFormData({ ...formData, join: joinCopy });
273
+ };
245
274
  const getJoinTypesMenuItems = (index) => {
246
275
  let items = [
247
276
  { name: LocalizeQueryJoinTypes(JoinTypes.InnerJoin), onClick: () => onChange_JoinItem_JoinType(JoinTypes.InnerJoin, index) },
@@ -758,7 +787,10 @@ const TMQueryEditor = ({ formMode, inputData, onQDChanged, isExpertMode, showDis
758
787
  setFormData({ ...formData, join: joinCopy });
759
788
  }
760
789
  }
761
- ] }), _jsx(TMMetadataChooser, { disabled: isReadOnly, showEditButton: false, getColorIndex: getColorIndex, showCompleteMetadataName: showCompleteMetadataName, openEditorOnSummaryClick: true, showBorder: false, borderRadius: borderRadius, showId: showId, backgroundColor: getColorIndex({ tid: onItem.leftTID, alias: onItem.leftAlias }), qd: formData, values: onItem.leftTID ? [{ tid: onItem.leftTID, mid: onItem.leftMID, aliasTID: onItem.leftAlias }] : [], onValueChanged: (values) => { values.length > 0 && onChange_OnJoinMetadatoLeft(values[0], index, indexOn); }, updateIsModalOpen: updateIsModalOpen }), _jsx(TMQdDropDownMenu, { backgroundColor: colorOperator, color: 'green', borderRadius: borderRadius, content: _jsx(StyledItemWrapper, { children: LocalizeQueryOperators(onItem.operator) }), items: [] }), _jsx(TMMetadataChooser, { disabled: isReadOnly, showEditButton: false, getColorIndex: getColorIndex, showCompleteMetadataName: showCompleteMetadataName, openEditorOnSummaryClick: true, showBorder: false, borderRadius: borderRadius, showId: showId, backgroundColor: getColorIndex({ tid: onItem.rightTID, alias: onItem.rightAlias }), qd: formData, values: onItem.rightTID ? [{ tid: onItem.rightTID, mid: onItem.rightMID, aliasTID: onItem.rightAlias }] : [], onValueChanged: (values) => { values.length > 0 && onChange_OnJoinMetadatoRight(values[0], index, indexOn); }, updateIsModalOpen: updateIsModalOpen })] }, indexOn));
790
+ ] }), _jsx(TMQdDropDownMenu, { disabled: indexOn == 0, color: 'green', content: _jsx("div", { style: { fontSize: '1rem' }, children: onItem.or ? 'OR' : 'AND' }), items: [
791
+ { name: 'AND', onClick: () => onChange_OnJoinItem_Or(false, index, indexOn) },
792
+ { name: 'OR', onClick: () => onChange_OnJoinItem_Or(true, index, indexOn) }
793
+ ] }), _jsx(TMQdEditableItem, { value: onItem.leftBrackets, allowedPattern: /\(/g, backgroundColor: colorBrackets, onValueChanged: (value) => { onChange_OnJoinItem_Brackets(value, true, index, indexOn); } }), _jsx(TMMetadataChooser, { disabled: isReadOnly, showEditButton: false, getColorIndex: getColorIndex, showCompleteMetadataName: showCompleteMetadataName, openEditorOnSummaryClick: true, showBorder: false, borderRadius: borderRadius, showId: showId, backgroundColor: getColorIndex({ tid: onItem.leftTID, alias: onItem.leftAlias }), qd: formData, values: onItem.leftTID ? [{ tid: onItem.leftTID, mid: onItem.leftMID, aliasTID: onItem.leftAlias }] : [], onValueChanged: (values) => { values.length > 0 && onChange_OnJoinMetadatoLeft(values[0], index, indexOn); }, updateIsModalOpen: updateIsModalOpen }), _jsx(TMQdDropDownMenu, { backgroundColor: colorOperator, color: 'green', borderRadius: borderRadius, content: _jsx(StyledItemWrapper, { children: LocalizeQueryOperators(onItem.operator) }), items: [] }), _jsx(TMMetadataChooser, { disabled: isReadOnly, showEditButton: false, getColorIndex: getColorIndex, showCompleteMetadataName: showCompleteMetadataName, openEditorOnSummaryClick: true, showBorder: false, borderRadius: borderRadius, showId: showId, backgroundColor: getColorIndex({ tid: onItem.rightTID, alias: onItem.rightAlias }), qd: formData, values: onItem.rightTID ? [{ tid: onItem.rightTID, mid: onItem.rightMID, aliasTID: onItem.rightAlias }] : [], onValueChanged: (values) => { values.length > 0 && onChange_OnJoinMetadatoRight(values[0], index, indexOn); }, updateIsModalOpen: updateIsModalOpen }), _jsx(TMQdEditableItem, { value: onItem.rightBrackets, allowedPattern: /\)/g, backgroundColor: colorBrackets, onValueChanged: (value) => { onChange_OnJoinItem_Brackets(value, false, index, indexOn); } })] }, indexOn));
762
794
  })] }, `${ji.tid}_${index}`));
763
795
  }), _jsx(TMVilViewer, { vil: validationItems.filter((o) => o.PropertyName === TMPropertyNames.join) })] }) }) }), canShowSelect && _jsx(Item, { title: SDK_Localizator.QuerySelect, titleRender: (tabItemProps) => renderAccordionTitle(tabItemProps, selectCount, validationItems.filter((o) => o.PropertyName == TMPropertyNames.select)), children: _jsx(StyledAccordionItemContainer, { children: _jsxs(StyledAccordionItemContent, { "$disabled": isReadOnly, children: [_jsx(TMVilViewer, { vil: validationItems.filter((o) => o.PropertyName === TMPropertyNames.select) }), (!formData?.select || formData?.select.length <= 0) && !isReadOnly &&
764
796
  _jsxs(StyledRowItem, { children: [_jsx(TMButton, { btnStyle: 'normal', disabled: !formData?.from?.tid, caption: SDKUI_Localizator.Add, onClick: onAdd_SelectItem }), dcmtTypesList.length == 1
@@ -814,7 +846,11 @@ const TMQdEditableItem = ({ value, placeHolder, width, backgroundColor, allowedP
814
846
  return (_jsx("div", { ref: ref, children: isComponentVisible ?
815
847
  _jsx(TMTextBox, { elementStyle: { marginLeft: '5px', marginRight: '5px' }, width: width ?? '50px', autoFocus: true, value: value ?? '', onValueChanged: handleTextBoxValueChanged, allowedPattern: allowedPattern })
816
848
  :
817
- _jsx(StyledItemWrapper, { onClick: () => setIsComponentVisible(true), style: { backgroundColor: backgroundColor, cursor: 'pointer' }, children: value ?? placeHolder }) }));
849
+ _jsx(StyledItemWrapper, { onClick: () => setIsComponentVisible(true), style: {
850
+ backgroundColor: backgroundColor,
851
+ cursor: 'pointer',
852
+ minHeight: '24px'
853
+ }, children: value ?? placeHolder }) }));
818
854
  };
819
855
  const TMQdWhereItemValue = ({ whereItem, index, queryParamsDynDataList, onlyEditing = false, onValueChanged, onCascadeRefreshDynDataLists, updateIsModalOpen }) => {
820
856
  let EditingModes;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@topconsultnpm/sdkui-react",
3
- "version": "6.21.0-dev1.22",
3
+ "version": "6.21.0-dev1.24",
4
4
  "description": "",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1",