@gingkoo/pandora-metabase 1.0.95 → 1.0.97

package/lib/es/components/dialog/expression/index.js

@@ -21,6 +21,8 @@ import SelectColumnMultiple from '../select-column-multiple';
 import { LeftArrowIcon } from '../../icons';
 import { useStore } from '../../../hooks/use-provider';
 import cloneDeep from 'lodash/cloneDeep';
+import { getConstantLabel } from '../formula-list/utils';
+import ItemName from '../../modules/components/item-name';
 var RangePicker = DatePicker.RangePicker;
 var NUMBER_LIST = ['等于', '不等于', '大于', '小于', '介于之间', '大于或等于', '小于或等于', '为空', '不为空', '以...开始', '以...结束', '不以...开始', '不以...结束', 'In', 'Not In', '正则匹配'];
 var STRING_LIST = ['等于', '不等于', '包含', '不包含', '为空', '不为空', '以...开始', '以...结束', '不以...开始', '不以...结束', 'In', 'Not In', '正则匹配'];
@@ -594,19 +596,20 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
   var selectConstant = function selectConstant(e) {
     store.setClosable(false);
     var node = e.currentTarget;
-    var _type = Number(node.getAttribute('v-type'));
+    var _val = node.getAttribute('v-val');
     store.setPopup2({
       visible: true,
       node: e.currentTarget,
       container: container,
       content: _jsx(SelectList, {
-        value: _type,
+        value: _val,
         list: store.constantList || [],
         onChange: function onChange(val) {
           closePopup2();
           // let curObj = store.constantList.filter((v: any) => v.value === val)[0];
           var newVal = rhsVal.slice();
-          newVal[0].val = val;
+          newVal[0].id = val;
+          newVal[0].val = getConstantLabel(store.constantList, val);
           setRhsVal(newVal);
           store.setClosable(true);
         }
@@ -866,13 +869,17 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
             }, i);
           }
           if (v.type === AtomsTypeEnum.CONSTANT) {
-            return _jsx("div", {
-              className: cx("Sqb-TableName purple-name", {
-                notSelected: !v.val
-              }),
-              "v-type": v.type,
-              onClick: selectConstant,
-              children: v.val ? "".concat(v.val) : __('SqlQueryBuilder.pickConstant')
+            return _jsx(ItemName, {
+              isError: !!(v.id || v.val) && !getConstantLabel(store.constantList, v.id || v.val),
+              message: "\u5E38\u91CF\u4E22\u5931",
+              children: _jsx("div", {
+                className: cx("Sqb-TableName purple-name", {
+                  notSelected: !v.val
+                }),
+                "v-val": v.id || v.val,
+                onClick: selectConstant,
+                children: getConstantLabel(store.constantList, v.id || v.val, v.val) || __('SqlQueryBuilder.pickConstant')
+              }, i)
             }, i);
           }
           if (v.type === AtomsTypeEnum.INPUT_STRING || v.type === AtomsTypeEnum.INPUT_STRING_LIST) {

package/lib/es/components/dialog/formula/utils.js

@@ -79,5 +79,8 @@ export var getQuotes = function getQuotes(fun, _args, formulaList) {
 };
 export var formulaIsError = function formulaIsError(fun, formulaList) {
   var obj = fun.id ? formulaList[fun.id] : formulaList[fun.name];
+  if (!fun.name && !fun.quotes) {
+    return false;
+  }
   return !(obj !== null && obj !== void 0 && obj.name);
 };

package/lib/es/components/dialog/formula-list/index.js

@@ -749,7 +749,7 @@ var FormulaList = forwardRef(function (props, ref) {
     } else if (type === AtomsTypeEnum.CONSTANT) {
       //常量
       return _jsx(ItemName, {
-        isError: (v.id || v.val) && !getConstantLabel(store.constantList, v.id || v.val),
+        isError: !!(v.id || v.val) && !getConstantLabel(store.constantList, v.id || v.val),
         message: "\u5E38\u91CF\u4E22\u5931",
         children: _jsxs("div", {
           className: cx("Sqb-TableName", {

package/lib/es/components/metabase/index.js

@@ -101,7 +101,7 @@ var Metabase = function Metabase(props) {
           case 0:
             intercept = false; // 是否返回
             _metaList = splitByUnion(store.metaList);
-            _metaList[0].patchVersion = '1.0.0';
+            _metaList[0].patchVersion = '1.1.0';
             store.metaList.map(function (v) {
               var _v$list;
               if (v.type !== 'union' && !((_v$list = v.list) === null || _v$list === void 0 ? void 0 : _v$list[0]).table.name) {

package/lib/es/components/modules/join-data.js

@@ -14,6 +14,7 @@ import Metabase from '../../index';
 import isEqual from 'lodash/isEqual';
 import cloneDeep from 'lodash/cloneDeep';
 import { uuidv4, getAlias, mergeNameAlias } from '../../utils/helper';
+import { getConstantLabel } from '../dialog/formula-list/utils';
 import { __ } from '../../locale';
 import { findIndex, getSubColumns } from '../../utils';
 import { TypeEnum, ColumnsPopupThemeEnum, JoinEnum, SQL_COLUMN_TYPE } from '../../store/enum';
@@ -985,6 +986,8 @@ var JoinData = function JoinData(props) {
           var index = findIndex(store.metaList[groupIndex].list, meta);
           var newMeta = store.metaList[groupIndex].list.slice();
           newMeta[index].expressions[_ind][_position][_ind2].val = curObj.value;
+          newMeta[index].expressions[_ind][_position][_ind2].id = curObj.value;
+          newMeta[index].expressions[_ind][_position][_ind2].val = getConstantLabel(store.constantList, curObj.value);
           store.setMeta(newMeta, groupIndex, {
             obj: val,
             type: ChangeType[_position]
@@ -1423,16 +1426,20 @@ var JoinData = function JoinData(props) {
           }, index);
         }
         if (item.type === AtomsTypeEnum.CONSTANT) {
-          return _jsx("div", {
-            className: cx("Sqb-TableName", {
-              notSelected: !item.val
-            }),
-            "v-position": type,
-            "v-index": i,
-            "v-index2": index,
-            "v-val": item.val,
-            onClick: selectConstant,
-            children: item.val ? item.val : __('SqlQueryBuilder.pickConstant')
+          return _jsx(ItemName, {
+            isError: !!(item.id || item.val) && !getConstantLabel(store.constantList, item.id || item.val),
+            message: "\u5E38\u91CF\u4E22\u5931",
+            children: _jsx("div", {
+              className: cx("Sqb-TableName", {
+                notSelected: !item.val
+              }),
+              "v-position": type,
+              "v-index": i,
+              "v-index2": index,
+              "v-val": item.id || item.val,
+              onClick: selectConstant,
+              children: getConstantLabel(store.constantList, item.id || item.val, item.val) || __('SqlQueryBuilder.pickConstant')
+            }, index)
           }, index);
         }
       });

package/lib/es/hooks/patch.d.ts

@@ -1,7 +1,5 @@
 import { MetaListType } from '../store/types';
-export declare const dataPatch: (newMeta: any) => any;
-export declare const joinDataPatch: (newMeta: any) => any;
-export declare const filterPatch: (newMeta: any) => any;
-export declare const customColumnPatch: (newMeta: any) => any;
-export declare const sortPatch: (newMeta: any) => any;
-export declare const patchMetas: (items: MetaListType[]) => MetaListType[];
+export declare const joinDataPatch: (newMeta: any, constantList: any, formulaTemplates: any) => any;
+export declare const filterPatch: (newMeta: any, constantList: any, formulaTemplates: any) => any;
+export declare const customColumnPatch: (newMeta: any, constantList: any, formulaTemplates: any) => any;
+export declare const patchMetas: (items: MetaListType[], constantList: any[], formulaTemplates: any[]) => MetaListType[];