ronds-metadata 1.3.77 → 1.3.78

package/es/comps/MetadataForm/DataCell/plugin/SparkSqlTable.js

@@ -12,12 +12,12 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { tr } from '../../../../framework/locale';
 import React from 'react';
 import { EyeOutlined, MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
-import Split from '../../../Split';
-import SqlEdit from '../../../JsonEdit';
-import { useGetLabelCol, useGetWrapperCol } from './Datasource/hooks';
+import { useGetWrapperCol } from './Datasource/hooks';
+import CodeEdit from '../../../../comps/CodeEdit';
+import { getConfig } from '../../../../config';
+import { modifyComment } from '../../utils';
 var SparkSqlTable = function SparkSqlTable(props) {
-  var extraDico = props.extraDico,
-    value = props.value,
+  var value = props.value,
     extraInfo = props.extraInfo,
     onChange = props.onChange;
   var _React$useState = React.useState('orgin'),
@@ -32,15 +32,17 @@ var SparkSqlTable = function SparkSqlTable(props) {
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     list = _React$useState6[0],
     setList = _React$useState6[1];
-  var labelCol = useGetLabelCol(extraInfo);
+  var listRef = React.useRef([]);
   var wrapperCol = useGetWrapperCol(extraInfo);
   var handleAddItem = function handleAddItem() {
-    var _list = [].concat(_toConsumableArray(list), [{
-      alias: undefined,
-      outputView: undefined,
-      sqlEdit: undefined
-    }]);
-    setList(_list);
+    var item = {
+      alias: "tbl".concat(listRef.current.length + 1),
+      outputView: '',
+      sqlEdit: "/*+ name(tbl".concat(listRef.current.length + 1, ")*/")
+    };
+    var _list = [].concat(_toConsumableArray(listRef.current), [item]);
+    setList(_toConsumableArray(_list));
+    listRef.current = _list;
     triggerChange({
       list: _list
     });
@@ -50,6 +52,7 @@ var SparkSqlTable = function SparkSqlTable(props) {
       return idx !== index;
     });
     setList(_list);
+    listRef.current = _list;
     triggerChange({
       list: _list
     });
@@ -74,23 +77,27 @@ var SparkSqlTable = function SparkSqlTable(props) {
     });
   };
   var onListChange = function onListChange(v, index, key) {
-    var _list = _toConsumableArray(list);
-    _list[index][key] = typeof v === 'string' ? v : v.target.value;
-    setList(_list);
+    var _list = listRef.current;
+    if (key === 'alias' || key === 'outputView') {
+      _list[index]['sqlEdit'] = modifyComment(listRef.current[index].sqlEdit, v, key);
+    }
+    _list[index][key] = v;
+    listRef.current = _list;
+    setList(_toConsumableArray(_list));
     triggerChange({
       list: _list
     });
   };
   React.useEffect(function () {
     if (value) {
-      if (value['view']) {
-        setView(value['view']);
+      if (value.view) {
+        setView(value.view);
       }
-      if (value['selected']) {
-        setSelected(value['selected']);
+      if (value.selected) {
+        setSelected(value.selected);
       }
-      if (value['list']) {
-        setList(value['list']);
+      if (value.list) {
+        setList(value.list);
       }
     }
   }, [value]);
@@ -106,21 +113,16 @@ var SparkSqlTable = function SparkSqlTable(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      border: '2px solid var(--ronds-metadata-color-border-1)',
+      border: '1px solid var(--ronds-metadata-color-border-1)',
       height: '500px',
       width: '100%'
     }
-  }, /*#__PURE__*/React.createElement(Split, {
-    gutterSize: 2,
-    sizes: [7, 93],
-    direction: "vertical"
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',
-      marginTop: '10px ',
-      marginLeft: '10px',
-      marginRight: '10px',
-      marginBottom: '6px'
+      zIndex: -1,
+      padding: '4px 8px',
+      borderBottom: '1px solid var(--ronds-metadata-color-border-1)'
     }
   }, /*#__PURE__*/React.createElement("span", {
     style: {
@@ -158,12 +160,12 @@ var SparkSqlTable = function SparkSqlTable(props) {
   }))), /*#__PURE__*/React.createElement("div", {
     style: {
       padding: '8px',
-      height: '100%',
+      height: 'calc(100% - 40px)',
       overflowY: 'auto',
       width: '100%'
     }
   }, list.map(function (item, idx) {
-    var _item$alias;
+    var _getConfig;
     return /*#__PURE__*/React.createElement("div", {
       key: idx,
       style: {
@@ -177,17 +179,11 @@ var SparkSqlTable = function SparkSqlTable(props) {
         border: '1px solid var(--ronds-metadata-color-border-1)',
         width: '100%'
       }
-    }, /*#__PURE__*/React.createElement(Split, {
-      gutterSize: 1,
-      sizes: [20, 80],
-      direction: "vertical"
     }, /*#__PURE__*/React.createElement("div", {
       style: {
         display: 'flex',
-        marginTop: '10px ',
-        marginLeft: '10px',
-        marginRight: '10px',
-        marginBottom: '6px'
+        padding: '4px 8px',
+        borderBottom: '1px solid var(--ronds-metadata-color-border-1)'
       }
     }, /*#__PURE__*/React.createElement("span", null, tr('别名'), ' ', /*#__PURE__*/React.createElement(_Input, {
       style: {
@@ -195,9 +191,9 @@ var SparkSqlTable = function SparkSqlTable(props) {
         marginLeft: '5px',
         marginRight: '8px'
       },
-      value: (_item$alias = item.alias) !== null && _item$alias !== void 0 ? _item$alias : "tbl".concat(idx + 1),
+      value: item.alias,
       onChange: function onChange(val) {
-        onListChange(val, idx, 'alias');
+        onListChange(val.target.value, idx, 'alias');
       }
     })), /*#__PURE__*/React.createElement("span", null, tr('输出视图'), ' ', /*#__PURE__*/React.createElement(_Input, {
       style: {
@@ -207,24 +203,23 @@ var SparkSqlTable = function SparkSqlTable(props) {
       placeholder: '请输入',
       value: item.outputView,
       onChange: function onChange(val) {
-        return onListChange(val, idx, 'outputView');
+        return onListChange(val.target.value, idx, 'outputView');
       }
     }))), /*#__PURE__*/React.createElement("div", {
       style: {
-        maxHeight: '100px',
-        minHeight: '80px',
-        overflowY: 'auto'
+        padding: '4px',
+        zIndex: 99999
       }
-    }, /*#__PURE__*/React.createElement(SqlEdit, {
-      value: "/*+".concat(item.alias ? "name(".concat(item.alias, ")") : "name(tbl".concat(idx + 1, ")"), " ").concat(item.outputView ? "output(".concat(item.outputView, ")") : '', "*/"),
-      theme: 'neo',
-      isLineNumbers: false,
-      extraDico: extraDico,
+    }, /*#__PURE__*/React.createElement(CodeEdit, {
+      key: idx,
+      value: item.sqlEdit,
+      height: '100px',
+      mode: "pgsql",
+      theme: ((_getConfig = getConfig()) === null || _getConfig === void 0 ? void 0 : _getConfig.theme) === 'normal' ? 'light' : 'vs-dark',
       onChange: function onChange(val) {
         return onListChange(val, idx, 'sqlEdit');
-      },
-      onSelectChange: function onSelectChange() {}
-    })))), /*#__PURE__*/React.createElement(MinusCircleOutlined, {
+      }
+    }))), /*#__PURE__*/React.createElement(MinusCircleOutlined, {
       style: {
         marginLeft: 'auto'
       },
@@ -234,15 +229,8 @@ var SparkSqlTable = function SparkSqlTable(props) {
     }));
   }), /*#__PURE__*/React.createElement(_Button, {
     type: "dashed",
-    onClick: function onClick() {
-      handleAddItem();
-      setList([].concat(_toConsumableArray(list), [{
-        alias: undefined,
-        outputView: undefined,
-        sqlEdit: undefined
-      }]));
-    },
+    onClick: handleAddItem,
     icon: /*#__PURE__*/React.createElement(PlusOutlined, null)
-  }, tr('添加SQL语句'))))))));
+  }, tr('添加SQL语句')))))));
 };
 export default SparkSqlTable;

package/es/comps/MetadataForm/hooks/index.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
- * @Author: your name
+ * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
  * @LastEditTime: 2024-08-20 19:38:44
  */

package/es/comps/MetadataForm/utils.d.ts

@@ -19,3 +19,4 @@ export declare function assignReplace(pathArr: string[], val: any, obj: any): vo
 export declare function flattenTreeData(treeData: any[]): any;
 export declare function findTopParent(treeData: any[], value: string): any;
 export declare const findTopParentIndex: (treeData: any[], key: string) => number;
+export declare const modifyComment: (text: string, newOutput: string, type: string) => string;

package/es/comps/MetadataForm/utils.js

@@ -11,7 +11,7 @@ var _excluded = ["children"];
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-05-18 16:25:00
+ * @LastEditTime: 2024-08-22 18:55:25
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -178,4 +178,46 @@ export var findTopParentIndex = function findTopParentIndex(treeData, key) {
     return traverse(node, [index]);
   });
   return topNodeIndex;
+};
+export var modifyComment = function modifyComment(text, newOutput, type) {
+  // 正则表达式匹配 /*+ 和 */ 之间的内容
+  var regex = /\/\*\+(.*?)\*\//;
+  // 查找匹配的内容
+  var match = text.match(regex);
+  if (match && match[1]) {
+    // 提取注释中的内容
+    var content = match[1].trim();
+    if (type === 'outputView') {
+      // 正则表达式匹配 output(...) 的内容
+      var outputRegex = /output\((.*?)\)/;
+      var outputMatch = content.match(outputRegex);
+      if (outputMatch) {
+        // 如果已经存在 output(...)，则替换括号内的内容
+        content = content.replace(outputRegex, "output(".concat(newOutput, ")"));
+      } else {
+        // 如果不存在 output(...)，则追加新的 output(...)
+        content += " output(".concat(newOutput, ")");
+      }
+      // 替换原始文本中的注释内容
+      var newText = text.replace(regex, "/*+ ".concat(content, " */"));
+      return newText;
+    }
+    if (type === 'alias') {
+      // 正则表达式匹配 output(...) 的内容
+      var aliasRegex = /name\((.*?)\)/;
+      var aliastMatch = content.match(aliasRegex);
+      if (aliastMatch) {
+        // 如果已经存在 output(...)，则替换括号内的内容
+        content = content.replace(aliasRegex, "name(".concat(newOutput, ")"));
+      } else {
+        // 如果不存在 output(...)，则追加新的 output(...)
+        content += " name(".concat(newOutput, ")");
+      }
+      // 替换原始文本中的注释内容
+      var _newText = text.replace(regex, "/*+ ".concat(content, " */"));
+      return _newText;
+    }
+  }
+  // 如果没有匹配到，返回原始文本
+  return text;
 };

package/es/config.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2024-04-25 13:36:02
+ * @LastEditTime: 2024-08-22 15:37:06
  */
 import { BehaviorSubject, map, distinctUntilChanged } from 'rxjs';
 import { setLocale } from './comps/locales/index';
@@ -41,6 +41,11 @@ globalSettingStream.pipe(map(function (p) {
     'ru-RU': _objectSpread(_objectSpread({}, ruRU), p['ru-RU'])
   });
 });
+var config = defaultConfig;
+/** 设置配置 */
+export var setConfig = function setConfig(opts) {
+  config = _objectSpread(_objectSpread({}, config), opts);
+};
 globalSettingStream.pipe(map(function (p) {
   return p.theme;
 }), distinctUntilChanged()).subscribe(function (p) {
@@ -48,12 +53,10 @@ globalSettingStream.pipe(map(function (p) {
   window.jQuery('body').removeClass("".concat(cssPrefix, "-normal"));
   window.jQuery('body').addClass("".concat(cssPrefix, "-").concat(p));
   window.jQuery('html').removeAttr('data-prefers-color');
+  setConfig({
+    theme: p
+  });
 });
-var config = defaultConfig;
-/** 设置配置 */
-export var setConfig = function setConfig(opts) {
-  config = _objectSpread(_objectSpread({}, config), opts);
-};
 /**  获取单个配置 */
 export function getConfigByKey(key) {
   return config[key];

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.3.77",
+  "version": "1.3.78",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -44,7 +44,7 @@
     "@milkdown/react": "^7.3.0",
     "@milkdown/theme-nord": "^7.3.0",
     "@milkdown/transformer": "^7.3.0",
-    "@monaco-editor/react": "^4.5.2",
+    "@monaco-editor/react": "^4.6.0",
     "@popperjs/core": "^2.4.4",
     "@types/file-saver": "^2.0.5",
     "@types/markdown-it": "^12.2.3",

package/es/comps/MetadataForm/DataCell/plugin/SourceConfig.d.ts

@@ -1,6 +0,0 @@
-import React from 'react';
-interface ISourceConfigProps {
-    configType: string;
-}
-declare const SourceConfig: (props: ISourceConfigProps) => React.JSX.Element;
-export default SourceConfig;