sz-mx-cabin - npm Package Compare versions

Comparing version 0.0.11 to 0.0.12-beta

es/MainGenerator.js

@@ -601,3 +601,3 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
     var cloneAttributes = deepClone(mainGeneratorState.attributes);
-    var newData = sessionStorage.getItem('data');
+    var newData = JSON.parse(sessionStorage.getItem('data'));
     dispatch({
@@ -604,0 +604,0 @@ type: 'updateData',

es/settings/previewPanelAnalysisRules/CardAnalysisRules.js

@@ -7,5 +7,5 @@ export default {
   attributesClassify: {
-    props: ['title', 'size', "hidden"],
+    props: ['title', 'size', "hidden", "isCollapse", "customClassname"],
     addition: ['icon']
   }
 };

es/settings/previewPanelAnalysisRules/form/CommonAnalysisRules.js

 export var FormItemAnalysisRules = {
   "formItem/props": ["label", "hidden", "labelAlign", "tooltip"],
-  "formItem/addition": ["required", "frameValidatorRules", "zdybj", "labelFlex", "wrapperFlex"],
+  "formItem/addition": ["required", "frameValidatorRules", "zdybj", "labelFlex", "wrapperFlex", "customClassname"],
   "formItem/event": ["customValidatorRules"]
@@ -5,0 +5,0 @@ };

es/settings/previewPanelAnalysisRules/form/TextAreaAnalysisRules.js

@@ -11,3 +11,3 @@ function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
   attributesClassify: _extends(_extends({
-    props: ["allowClear", "bordered", "disabled", "placeholder", "autoSize", "defaultValue", "showCount", "maxLength"],
+    props: ["allowClear", "bordered", "disabled", "placeholder", "autoSize", "defaultValue", "showCount", "maxLength", 'readOnly', 'defalutValue'],
     event: ["onChange", "onPressEnter"],
@@ -14,0 +14,0 @@ addition: []

es/widgets/card/Card.js

 import React from 'react';
-import { Card } from 'dw-mx';
+import { Card, Collapse } from 'dw-mx';
 import IconWidget from '../form/Icon';
@@ -7,2 +7,3 @@
 var cardIcon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAATCAYAAAC3IqxdAAAABHNCSVQICAgIfAhkiAAAABVJREFUGFdjNI899J8BCTCOCpAYHgDzMixjMyB4IQAAAABJRU5ErkJggg==";
+var Panel = Collapse.Panel;
 export default function CardWidget(props) {
@@ -12,2 +13,4 @@ var _props$properties = props.properties,
       size = _props$properties.size,
+      isCollapse = _props$properties.isCollapse,
+      customClassname = _props$properties.customClassname,
       addition = props.addition,
@@ -34,7 +37,15 @@ name = props.name;
 
-  return /*#__PURE__*/React.createElement(Card, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, isCollapse ? /*#__PURE__*/React.createElement(Collapse, {
+    expandIconPosition: 'right',
+    className: customClassname,
+    defaultActiveKey: name
+  }, /*#__PURE__*/React.createElement(Panel, {
+    header: title,
+    key: name,
+    id: name
+  }, props.children)) : /*#__PURE__*/React.createElement(Card, {
     title: titleElement,
     size: size,
-    id: name
-  }, props.children);
+    className: customClassname
+  }, props.children));
 }

es/widgets/form/Form.js

@@ -44,3 +44,4 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
       data = _useUIRenderSchemaSto.data,
-      fileData = _useUIRenderSchemaSto.fileData; // 将formInstance回传到管理页
+      fileData = _useUIRenderSchemaSto.fileData,
+      attrs = _useUIRenderSchemaSto.attrs; // 将formInstance回传到管理页
 
@@ -79,3 +80,23 @@
         if (data[key][formkey] && data[key][formkey]._isAMomentObject) {
-          data[key][formkey] = data[key][formkey].format('YYYYMMDD');
+          var gs = void 0;
+          var format = attrs[key][formkey].format;
+          var picker = attrs[key][formkey].picker;
+
+          if (format) {
+            gs = format;
+          } else {
+            if (picker == 'month') {
+              gs = 'YYYY-MM';
+            } else if (picker == 'week') {
+              gs = 'YYYY-wo';
+            } else if (picker == 'quarter') {
+              gs = 'YYYY-\\QQ';
+            } else if (picker == 'year') {
+              gs = 'YYYY';
+            } else {
+              gs = 'YYYY-MM-DD';
+            }
+          }
+
+          data[key][formkey] = data[key][formkey].format(gs);
         }
@@ -94,6 +115,27 @@ }
       if (values[key] && values[key]._isAMomentObject) {
-        values[key] = values[key].format('YYYYMMDD');
+        var gs = void 0;
+        var format = attrs[name][key].format;
+        var picker = attrs[name][key].picker;
+
+        if (format) {
+          gs = format;
+        } else {
+          if (picker == 'month') {
+            gs = 'YYYY-MM';
+          } else if (picker == 'week') {
+            gs = 'YYYY-wo';
+          } else if (picker == 'quarter') {
+            gs = 'YYYY-\\QQ';
+          } else if (picker == 'year') {
+            gs = 'YYYY';
+          } else {
+            gs = 'YYYY-MM-DD';
+          }
+        }
+
+        values[key] = values[key].format(gs);
       }
     }
 
+    var newarr = JSON.parse(sessionStorage.getItem('data'));
     var newData = {};
@@ -107,3 +149,3 @@
 
-    newData = _extends(_extends({}, data), _defineProperty({}, name, _extends({}, formData)));
+    newData = _extends(_extends({}, newarr), _defineProperty({}, name, _extends({}, formData)));
     sessionStorage.setItem('data', JSON.stringify(newData));
@@ -110,0 +152,0 @@

es/widgets/form/formItem/FormItem.js

@@ -29,3 +29,4 @@ function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
       labelFlex = addition.labelFlex,
-      wrapperFlex = addition.wrapperFlex;
+      wrapperFlex = addition.wrapperFlex,
+      customClassname = addition.customClassname;
   var rules = [];
@@ -186,4 +187,4 @@
   }, colResult, label, {
-    className: isform ? '' : 'dlc-pc-formItem-margin'
+    className: isform ? customClassname : 'dlc-pc-formItem-margin ' + customClassname
   }), props.children);
 }

es/widgets/form/InputTextArea.js

@@ -34,2 +34,8 @@ function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+  var defalutValue = properties.defalutValue;
+
+  if (defalutValue) {
+    leftProps.value = defalutValue;
+  }
+
   var getNewValue = function getNewValue(e) {
@@ -36,0 +42,0 @@ var newValue = e.target.value;

es/widgets/table/TableWidget.js

@@ -399,5 +399,40 @@ function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
       getChildValues: function getChildValues(currentData) {
-        var newData = _.cloneDeep(data);
+        var newarr = JSON.parse(sessionStorage.getItem('data'));
 
-        newData[tableName] = currentData;
+        var newData = _.cloneDeep(newarr);
+
+        var newcurrentData = currentData.map(function (item) {
+          var arr = {};
+
+          for (var key in item) {
+            if (item[key] && item[key]._isAMomentObject) {
+              var gs = void 0;
+              var sourceMask = attrs[tableName][key].sourceMask;
+              var picker = attrs[tableName][key].picker;
+
+              if (sourceMask) {
+                gs = sourceMask;
+              } else {
+                if (picker == 'month') {
+                  gs = 'YYYY-MM';
+                } else if (picker == 'week') {
+                  gs = 'YYYY-wo';
+                } else if (picker == 'quarter') {
+                  gs = 'YYYY-\\QQ';
+                } else if (picker == 'year') {
+                  gs = 'YYYY';
+                } else {
+                  gs = 'YYYY-MM-DD';
+                }
+              }
+
+              arr[key] = item[key].format(gs);
+            } else {
+              arr[key] = item[key];
+            }
+          }
+
+          return arr;
+        });
+        newData[tableName] = newcurrentData;
         setData(newData);
@@ -404,0 +439,0 @@ },

lib/MainGenerator.js

@@ -630,3 +630,3 @@ "use strict";
     var cloneAttributes = (0, _clone["default"])(mainGeneratorState.attributes);
-    var newData = sessionStorage.getItem('data');
+    var newData = JSON.parse(sessionStorage.getItem('data'));
     dispatch({
@@ -633,0 +633,0 @@ type: 'updateData',

lib/settings/previewPanelAnalysisRules/CardAnalysisRules.js

@@ -13,3 +13,3 @@ "use strict";
   attributesClassify: {
-    props: ['title', 'size', "hidden"],
+    props: ['title', 'size', "hidden", "isCollapse", "customClassname"],
     addition: ['icon']
@@ -16,0 +16,0 @@ }

lib/settings/previewPanelAnalysisRules/form/CommonAnalysisRules.js

@@ -9,3 +9,3 @@ "use strict";
   "formItem/props": ["label", "hidden", "labelAlign", "tooltip"],
-  "formItem/addition": ["required", "frameValidatorRules", "zdybj", "labelFlex", "wrapperFlex"],
+  "formItem/addition": ["required", "frameValidatorRules", "zdybj", "labelFlex", "wrapperFlex", "customClassname"],
   "formItem/event": ["customValidatorRules"]
@@ -12,0 +12,0 @@ };

lib/settings/previewPanelAnalysisRules/form/TextAreaAnalysisRules.js

@@ -19,3 +19,3 @@ "use strict";
   attributesClassify: _extends(_extends({
-    props: ["allowClear", "bordered", "disabled", "placeholder", "autoSize", "defaultValue", "showCount", "maxLength"],
+    props: ["allowClear", "bordered", "disabled", "placeholder", "autoSize", "defaultValue", "showCount", "maxLength", 'readOnly', 'defalutValue'],
     event: ["onChange", "onPressEnter"],
@@ -22,0 +22,0 @@ addition: []

lib/widgets/card/Card.js

@@ -18,2 +18,3 @@ "use strict";
 var cardIcon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAATCAYAAAC3IqxdAAAABHNCSVQICAgIfAhkiAAAABVJREFUGFdjNI899J8BCTCOCpAYHgDzMixjMyB4IQAAAABJRU5ErkJggg==";
+var Panel = _dwMx.Collapse.Panel;
 
@@ -24,2 +25,4 @@ function CardWidget(props) {
       size = _props$properties.size,
+      isCollapse = _props$properties.isCollapse,
+      customClassname = _props$properties.customClassname,
       addition = props.addition,
@@ -46,7 +49,15 @@ name = props.name;
 
-  return /*#__PURE__*/_react["default"].createElement(_dwMx.Card, {
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, isCollapse ? /*#__PURE__*/_react["default"].createElement(_dwMx.Collapse, {
+    expandIconPosition: 'right',
+    className: customClassname,
+    defaultActiveKey: name
+  }, /*#__PURE__*/_react["default"].createElement(Panel, {
+    header: title,
+    key: name,
+    id: name
+  }, props.children)) : /*#__PURE__*/_react["default"].createElement(_dwMx.Card, {
     title: titleElement,
     size: size,
-    id: name
-  }, props.children);
+    className: customClassname
+  }, props.children));
 }

lib/widgets/form/Form.js

@@ -60,3 +60,4 @@ "use strict";
       data = _useUIRenderSchemaSto.data,
-      fileData = _useUIRenderSchemaSto.fileData; // 将formInstance回传到管理页
+      fileData = _useUIRenderSchemaSto.fileData,
+      attrs = _useUIRenderSchemaSto.attrs; // 将formInstance回传到管理页
 
@@ -95,3 +96,23 @@
         if (data[key][formkey] && data[key][formkey]._isAMomentObject) {
-          data[key][formkey] = data[key][formkey].format('YYYYMMDD');
+          var gs = void 0;
+          var format = attrs[key][formkey].format;
+          var picker = attrs[key][formkey].picker;
+
+          if (format) {
+            gs = format;
+          } else {
+            if (picker == 'month') {
+              gs = 'YYYY-MM';
+            } else if (picker == 'week') {
+              gs = 'YYYY-wo';
+            } else if (picker == 'quarter') {
+              gs = 'YYYY-\\QQ';
+            } else if (picker == 'year') {
+              gs = 'YYYY';
+            } else {
+              gs = 'YYYY-MM-DD';
+            }
+          }
+
+          data[key][formkey] = data[key][formkey].format(gs);
         }
@@ -110,6 +131,27 @@ }
       if (values[key] && values[key]._isAMomentObject) {
-        values[key] = values[key].format('YYYYMMDD');
+        var gs = void 0;
+        var format = attrs[name][key].format;
+        var picker = attrs[name][key].picker;
+
+        if (format) {
+          gs = format;
+        } else {
+          if (picker == 'month') {
+            gs = 'YYYY-MM';
+          } else if (picker == 'week') {
+            gs = 'YYYY-wo';
+          } else if (picker == 'quarter') {
+            gs = 'YYYY-\\QQ';
+          } else if (picker == 'year') {
+            gs = 'YYYY';
+          } else {
+            gs = 'YYYY-MM-DD';
+          }
+        }
+
+        values[key] = values[key].format(gs);
       }
     }
 
+    var newarr = JSON.parse(sessionStorage.getItem('data'));
     var newData = {};
@@ -123,3 +165,3 @@
 
-    newData = _extends(_extends({}, data), _defineProperty({}, name, _extends({}, formData)));
+    newData = _extends(_extends({}, newarr), _defineProperty({}, name, _extends({}, formData)));
     sessionStorage.setItem('data', JSON.stringify(newData));
@@ -126,0 +168,0 @@

lib/widgets/form/formItem/FormItem.js

@@ -43,3 +43,4 @@ "use strict";
       labelFlex = addition.labelFlex,
-      wrapperFlex = addition.wrapperFlex;
+      wrapperFlex = addition.wrapperFlex,
+      customClassname = addition.customClassname;
   var rules = [];
@@ -200,4 +201,4 @@
   }, colResult, label, {
-    className: isform ? '' : 'dlc-pc-formItem-margin'
+    className: isform ? customClassname : 'dlc-pc-formItem-margin ' + customClassname
   }), props.children);
 }

lib/widgets/form/InputTextArea.js

@@ -47,2 +47,8 @@ "use strict";
 
+  var defalutValue = properties.defalutValue;
+
+  if (defalutValue) {
+    leftProps.value = defalutValue;
+  }
+
   var getNewValue = function getNewValue(e) {
@@ -49,0 +55,0 @@ var newValue = e.target.value;

lib/widgets/table/TableWidget.js

@@ -426,5 +426,40 @@ "use strict";
       getChildValues: function getChildValues(currentData) {
-        var newData = _lodash["default"].cloneDeep(data);
+        var newarr = JSON.parse(sessionStorage.getItem('data'));
 
-        newData[tableName] = currentData;
+        var newData = _lodash["default"].cloneDeep(newarr);
+
+        var newcurrentData = currentData.map(function (item) {
+          var arr = {};
+
+          for (var key in item) {
+            if (item[key] && item[key]._isAMomentObject) {
+              var gs = void 0;
+              var sourceMask = attrs[tableName][key].sourceMask;
+              var picker = attrs[tableName][key].picker;
+
+              if (sourceMask) {
+                gs = sourceMask;
+              } else {
+                if (picker == 'month') {
+                  gs = 'YYYY-MM';
+                } else if (picker == 'week') {
+                  gs = 'YYYY-wo';
+                } else if (picker == 'quarter') {
+                  gs = 'YYYY-\\QQ';
+                } else if (picker == 'year') {
+                  gs = 'YYYY';
+                } else {
+                  gs = 'YYYY-MM-DD';
+                }
+              }
+
+              arr[key] = item[key].format(gs);
+            } else {
+              arr[key] = item[key];
+            }
+          }
+
+          return arr;
+        });
+        newData[tableName] = newcurrentData;
         setData(newData);
@@ -431,0 +466,0 @@ },

package.json

 {
     "name": "sz-mx-cabin",
-    "version": "0.0.11",
+    "version": "0.0.12-beta",
     "description": "reactCabin",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Improved metrics

Total package byte prevSize

1173746

increased by0.52%

Lines of code

25388

increased by0.67%

No dependency changes