cnhis-design-vue 2.0.8 → 2.0.9

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 (35) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/es/age/index.js +2 -2
  3. package/es/big-table/index.js +23 -23
  4. package/es/button/index.js +2 -2
  5. package/es/captcha/index.js +3 -3
  6. package/es/checkbox/index.js +1 -1
  7. package/es/color-picker/index.js +1 -1
  8. package/es/drag-layout/index.js +3 -3
  9. package/es/editor/index.js +1 -1
  10. package/es/fabric-chart/index.js +9 -9
  11. package/es/form-table/index.js +17 -17
  12. package/es/index/index.js +200 -200
  13. package/es/index/style.css +1 -1
  14. package/es/input/index.js +1 -1
  15. package/es/map/index.js +1 -1
  16. package/es/multi-chat/index.js +24 -24
  17. package/es/multi-chat-client/index.js +18 -18
  18. package/es/multi-chat-history/index.js +4 -4
  19. package/es/multi-chat-record/index.js +4 -4
  20. package/es/multi-chat-setting/index.js +20 -20
  21. package/es/multi-chat-sip/index.js +1 -1
  22. package/es/radio/index.js +1 -1
  23. package/es/scale-view/index.js +67 -67
  24. package/es/scale-view/style.css +1 -1
  25. package/es/select/index.js +3 -3
  26. package/es/select-label/index.js +3 -3
  27. package/es/select-person/index.js +2 -2
  28. package/es/table-filter/index.js +21 -21
  29. package/es/tag/index.js +1 -1
  30. package/es/verification-code/index.js +2 -2
  31. package/lib/cui.common.js +227 -227
  32. package/lib/cui.umd.js +227 -227
  33. package/lib/cui.umd.min.js +7 -7
  34. package/package.json +1 -1
  35. package/packages/scale-view/scaleView.vue +22 -22
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cnhis-design-vue",
3
- "version": "2.0.8",
3
+ "version": "2.0.9",
4
4
  "description": "前端业务UI库",
5
5
  "keyword": "cnhis-design-vue vue cnhis",
6
6
  "homepage": "http://dv.cnhis.com/",
package/packages/scale-view/scaleView.vue CHANGED
@@ -1770,6 +1770,7 @@ export default create({
1770
1770
  if (!Object.keys(tempObj).length) return {};
1771
1771
  for (let key in tempObj) {
1772
1772
  let itemTemp = this.formArray.find(item => this.formKey(item) == key);
1773
+ let curValue = tempObj[key];
1773
1774
  if (key && itemTemp) {
1774
1775
  let keyTemp;
1775
1776
  if (itemTemp && itemTemp.databaseTitle) keyTemp = itemTemp.databaseTitle;
@@ -1778,40 +1779,39 @@ export default create({
1778
1779
  itemTemp &&
1779
1780
  itemTemp.setting &&
1780
1781
  itemTemp.setting.startToStop != 1 &&
1781
- tempObj[key] &&
1782
+ curValue &&
1782
1783
  itemTemp.type == "DATETIME"
1783
1784
  ) {
1784
- if (itemTemp.setting && itemTemp.setting.dateType == "time" && tempObj[key])
1785
- tempObj[key] = moment().format("YYYY-MM-DD ") + tempObj[key];
1786
- if (itemTemp.setting && itemTemp.setting.dateType == "date" && tempObj[key])
1787
- tempObj[key] =
1788
- moment(tempObj[key]).format("YYYY-MM-DD ") + moment().format("HH:mm:ss");
1785
+ if (itemTemp.setting && itemTemp.setting.dateType == "time" && curValue)
1786
+ curValue = moment().format("YYYY-MM-DD ") + curValue;
1787
+ if (itemTemp.setting && itemTemp.setting.dateType == "date" && curValue)
1788
+ curValue =
1789
+ moment(curValue).format("YYYY-MM-DD ") + moment().format("HH:mm:ss");
1789
1790
  }
1790
- if (key.includes("~-~")) {
1791
- let newKey = keyTemp ? keyTemp.replace(/~-~/g, ".") : key.replace(/~-~/g, ".");
1792
- res[newKey] = tempObj[key];
1793
- } else {
1794
- res[keyTemp || key] = !tempObj[key] ? null : tempObj[key];
1795
- }
1796
-
1797
1791
 
1798
1792
  // 处理choice选项 将key替换为value
1799
1793
  let isChoice = ["RADIO_BLOCK", "CHECKBOX_BLOCK"].includes(itemTemp.type);
1800
1794
  if (isChoice) {
1801
1795
  let { options } = itemTemp;
1802
- let useKey = this.formKey(itemTemp);
1803
- let obj = this.choiceComObj[useKey];
1804
- let value = tempObj[key];
1805
- if (itemTemp.type === "RADIO_BLOCK" && value) {
1806
- res[useKey] = this.handleChoiceItem(value, options, obj);
1796
+ let obj = this.choiceComObj[key];
1797
+ if (itemTemp.type === "RADIO_BLOCK" && curValue) {
1798
+ curValue = this.handleChoiceItem(curValue, options, obj);
1807
1799
  }
1808
- if (itemTemp.type === "CHECKBOX_BLOCK" && value?.length) {
1809
- let resArr = this.handleCheckboxParams(value, options, obj);
1810
- res[useKey] = resArr;
1800
+ if (itemTemp.type === "CHECKBOX_BLOCK" && curValue?.length) {
1801
+ let resArr = this.handleCheckboxParams(curValue, options, obj);
1802
+ curValue = resArr;
1811
1803
  }
1812
1804
  }
1805
+
1806
+ if (key.includes("~-~")) {
1807
+ let newKey = keyTemp ? keyTemp.replace(/~-~/g, ".") : key.replace(/~-~/g, ".");
1808
+ res[newKey] = curValue;
1809
+ } else {
1810
+ res[keyTemp || key] = !curValue ? null : curValue;
1811
+ }
1812
+
1813
1813
  } else {
1814
- res[key] = tempObj[key];
1814
+ res[key] = curValue;
1815
1815
  }
1816
1816
  }
1817
1817
  console.log("res", res);