@bit-sun/business-component 4.0.11-alpha.5 → 4.0.11-alpha.6

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.
Files changed (5) hide show
  1. package/dist/index.esm.js +4 -3
  2. package/dist/index.js +4 -3
  3. package/package.json +1 -1
  4. package/src/components/Solution/RuleComponent/index.js +4 -3
  5. package/src/components/Solution/RuleSetter/function.ts +2 -1
package/dist/index.esm.js CHANGED
@@ -35672,7 +35672,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
35672
35672
  return i.code == code;
35673
35673
  })) === null || _itemDetail$response$ === void 0 ? void 0 : _itemDetail$response$.value;
35674
35674
  if (type === 'input') {
35675
- return pCode === undefined ? pCode : pCode || defaultValue;
35675
+ return pCode === undefined ? pCode : judgeIsEmpty(pCode) ? defaultValue : pCode;
35676
35676
  }
35677
35677
  if (['date', 'dateTime', 'rangeTime'].includes(type)) {
35678
35678
  if (['date', 'dateTime'].includes(type)) return pCode ? moment$1(pCode) : pCode;
@@ -35698,7 +35698,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
35698
35698
  });
35699
35699
  return _newPCode || pCode || defaultValue;
35700
35700
  }
35701
- return pCode || defaultValue;
35701
+ // return pCode || defaultValue;
35702
+ return judgeIsEmpty(pCode) ? defaultValue : pCode;
35702
35703
  };
35703
35704
  var handleEdit = function handleEdit(code, val, functionItem) {
35704
35705
  var value = val;
@@ -36256,7 +36257,7 @@ var handleRuleShowBack = function handleRuleShowBack(data, functionRuleList, rul
36256
36257
  var isStringValue = typeof itemValue == 'string' && (itemValue === null || itemValue === void 0 ? void 0 : itemValue.includes(','));
36257
36258
  if (Item) {
36258
36259
  return _objectSpread2(_objectSpread2({}, Item), {}, {
36259
- value: (isStringValue ? itemValue === null || itemValue === void 0 ? void 0 : itemValue.split(',') : itemValue) || defaultValue || '',
36260
+ value: judgeIsEmpty(itemValue) ? defaultValue || '' : isStringValue ? itemValue === null || itemValue === void 0 ? void 0 : itemValue.split(',') : itemValue,
36260
36261
  formulaName: Item === null || Item === void 0 ? void 0 : Item.formulaName,
36261
36262
  enable: (Item === null || Item === void 0 ? void 0 : Item.enable) !== false
36262
36263
  });
package/dist/index.js CHANGED
@@ -35695,7 +35695,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
35695
35695
  return i.code == code;
35696
35696
  })) === null || _itemDetail$response$ === void 0 ? void 0 : _itemDetail$response$.value;
35697
35697
  if (type === 'input') {
35698
- return pCode === undefined ? pCode : pCode || defaultValue;
35698
+ return pCode === undefined ? pCode : judgeIsEmpty(pCode) ? defaultValue : pCode;
35699
35699
  }
35700
35700
  if (['date', 'dateTime', 'rangeTime'].includes(type)) {
35701
35701
  if (['date', 'dateTime'].includes(type)) return pCode ? moment__default['default'](pCode) : pCode;
@@ -35721,7 +35721,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
35721
35721
  });
35722
35722
  return _newPCode || pCode || defaultValue;
35723
35723
  }
35724
- return pCode || defaultValue;
35724
+ // return pCode || defaultValue;
35725
+ return judgeIsEmpty(pCode) ? defaultValue : pCode;
35725
35726
  };
35726
35727
  var handleEdit = function handleEdit(code, val, functionItem) {
35727
35728
  var value = val;
@@ -36279,7 +36280,7 @@ var handleRuleShowBack = function handleRuleShowBack(data, functionRuleList, rul
36279
36280
  var isStringValue = typeof itemValue == 'string' && (itemValue === null || itemValue === void 0 ? void 0 : itemValue.includes(','));
36280
36281
  if (Item) {
36281
36282
  return _objectSpread2(_objectSpread2({}, Item), {}, {
36282
- value: (isStringValue ? itemValue === null || itemValue === void 0 ? void 0 : itemValue.split(',') : itemValue) || defaultValue || '',
36283
+ value: judgeIsEmpty(itemValue) ? defaultValue || '' : isStringValue ? itemValue === null || itemValue === void 0 ? void 0 : itemValue.split(',') : itemValue,
36283
36284
  formulaName: Item === null || Item === void 0 ? void 0 : Item.formulaName,
36284
36285
  enable: (Item === null || Item === void 0 ? void 0 : Item.enable) !== false
36285
36286
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bit-sun/business-component",
3
- "version": "4.0.11-alpha.5",
3
+ "version": "4.0.11-alpha.6",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
package/src/components/Solution/RuleComponent/index.js CHANGED
@@ -33,7 +33,7 @@ import {
33
33
  getPropertyCode,
34
34
  isObj,
35
35
  } from './util';
36
- import { getDictionarySource, uuid } from '../../../utils/utils';
36
+ import { getDictionarySource, judgeIsEmpty, uuid } from '../../../utils/utils';
37
37
  import { coverToParallel } from '../../../utils/TreeUtils';
38
38
  import {
39
39
  BusinessSearchSelect,
@@ -1062,7 +1062,7 @@ class RuleObjectComponent extends Component {
1062
1062
  let defaultValue = configItem.defaultValue;
1063
1063
  const pCode = itemDetail.response?.find((i) => i.code == code)?.value;
1064
1064
  if (type === 'input') {
1065
- return pCode === undefined ? pCode : pCode || defaultValue;
1065
+ return pCode === undefined ? pCode : judgeIsEmpty(pCode) ? defaultValue : pCode;
1066
1066
  }
1067
1067
  if(['date','dateTime','rangeTime'].includes(type)) {
1068
1068
  if(['date','dateTime'].includes(type)) return pCode ? moment(pCode) : pCode;
@@ -1075,7 +1075,8 @@ class RuleObjectComponent extends Component {
1075
1075
  const newPCode = Array.isArray(pCode) ? pCode?.map(s => isObj(s) ? s : ({ key: s, value: s })) : pCode?.split(',')?.map(s => ({ key: s, value: s }));
1076
1076
  return newPCode || pCode || defaultValue;
1077
1077
  }
1078
- return pCode || defaultValue;
1078
+ // return pCode || defaultValue;
1079
+ return judgeIsEmpty(pCode) ? defaultValue : pCode;
1079
1080
  };
1080
1081
  const handleEdit = (code, val, functionItem) => {
1081
1082
  let value = val;
package/src/components/Solution/RuleSetter/function.ts CHANGED
@@ -48,6 +48,7 @@
48
48
  // }
49
49
  // ]
50
50
  // }
51
+ import { judgeIsEmpty } from '@/utils';
51
52
  import { coverToParallel } from '@/utils/TreeUtils';
52
53
  export const formatOperationList = (data: any) => {
53
54
  let result = data||[];
@@ -105,7 +106,7 @@ export const handleRuleShowBack = (data: any, functionRuleList: any, ruleReturnL
105
106
  if (Item) {
106
107
  return {
107
108
  ...Item,
108
- value: (isStringValue ? itemValue?.split(',') : itemValue) || defaultValue || '',
109
+ value: judgeIsEmpty(itemValue) ? (defaultValue || '') : (isStringValue ? itemValue?.split(',') : itemValue),
109
110
  formulaName: Item?.formulaName,
110
111
  enable: Item?.enable !== false
111
112
  };