formiojs-eorion 0.1.15 → 0.1.16

package/Formio.js

@@ -1724,7 +1724,7 @@ Formio.projectUrlSet = false;
 Formio.plugins = [];
 Formio.cache = {};
 Formio.Providers = _providers.default;
-Formio.version = '0.1.15';
+Formio.version = '0.1.16';
 Formio.pathType = '';
 Formio.events = new _EventEmitter.default();
 Formio.cdn = new _CDN.default();

package/components/DataSource/DataSource.js

@@ -162,7 +162,7 @@ var DataSourceComponent = /*#__PURE__*/function (_FieldComponent) {
       }
       if (this.component.dataSource !== "file") {
         setTimeout(function () {
-          _this.setValue("");
+          _this.setValue(null);
         }, 100);
       }
       return _get(_getPrototypeOf(DataSourceComponent.prototype), "attach", this).call(this, element);
@@ -197,104 +197,112 @@ var DataSourceComponent = /*#__PURE__*/function (_FieldComponent) {
     key: "setValue",
     value: function setValue(value) {
       var self = this;
-      if (self.component['dataSource'] === 'file') {
-        return true;
-      }
-      if (self.component['data-source-url']) {
-        var url = self.parseTpl(self.component['data-source-url'], {
-          data: self.rootValue
+      if (value) {
+        _get(_getPrototypeOf(DataSourceComponent.prototype), "setValue", this).call(this, value, {
+          noUpdateEvent: true,
+          noValidate: true,
+          resetValue: true
         });
-        if (url.startsWith('http')) {
-          url = new URL(url);
-        } else {
-          url = new URL(url, window.location.origin);
+      } else {
+        if (self.component['dataSource'] === 'file') {
+          return true;
         }
-        var searchParams = new URLSearchParams(url.search);
-        var params = {};
-        var headers = {};
-        self.component.request['headers'].forEach(function (header) {
-          headers["".concat(header.key)] = self.parseTpl(header.value, {
+        if (self.component['data-source-url']) {
+          var url = self.parseTpl(self.component['data-source-url'], {
             data: self.rootValue
           });
-        });
-        // 搜索
-        if (self.component['dataSource'] === 'url') {} else if (self.component['dataSource'] === 'noco_db') {
-          if (self.component.data['noco_db_conditions']) {
-            var where = '';
-            self.component.data['noco_db_conditions'].forEach(function (item, index) {
-              if (item.value && item.value.length > 0) {
-                var conditionVal = self.parseTpl(item.value, {
-                  data: self.rootValue
-                });
-                if (index === 0 && item.logical_operator === '~not') {
-                  where += "(".concat(item.name, ",").concat(item.operator, ",").concat(conditionVal, ")");
-                } else {
-                  where += "".concat(item.logical_operator, "(").concat(item.name, ",").concat(item.operator, ",").concat(conditionVal, ")");
-                }
-              }
-            });
-            params.where = where;
+          if (url.startsWith('http')) {
+            url = new URL(url);
+          } else {
+            url = new URL(url, window.location.origin);
           }
-        }
-        Object.keys(params).forEach(function (key) {
-          searchParams.set(key, params["".concat(key)]);
-        });
-        try {
-          var lastestReqTime = new Date().getTime();
-          self.lastestReqTime = lastestReqTime;
-          var xhr = new XMLHttpRequest();
-          var reqMethod = self.component.request['method'];
-          if (reqMethod === 'GET') {
-            xhr.open('GET', "".concat(url.origin).concat(url.pathname, "?").concat(searchParams.toString()), true);
-            xhr.responseType = 'json';
-            Object.keys(headers).forEach(function (key) {
-              xhr.setRequestHeader(key, headers["".concat(key)]);
-            });
-          } else if (reqMethod === 'POST') {
-            xhr.open('POST', "".concat(url.origin).concat(url.pathname, "?").concat(searchParams.toString()), true);
-            xhr.setRequestHeader('Content-Type', 'application/json');
-            xhr.responseType = 'json';
-            Object.keys(headers).forEach(function (key) {
-              xhr.setRequestHeader(key, headers["".concat(key)]);
+          var searchParams = new URLSearchParams(url.search);
+          var params = {};
+          var headers = {};
+          self.component.request['headers'].forEach(function (header) {
+            headers["".concat(header.key)] = self.parseTpl(header.value, {
+              data: self.rootValue
             });
-          }
-          xhr.onload = function () {
-            var status = xhr.status;
-            if (status === 200) {
-              // 确保最后更新的数据是最新一次请求的接口数据
-              if (lastestReqTime - self.lastestReqTime === 0) {
-                var dataPath = self.component.request['dataPath'];
-                if (dataPath && dataPath.length > 0) {
-                  self.dataValue = _lodash.default.get(xhr.response, dataPath);
-                } else {
-                  self.dataValue = xhr.response;
+          });
+          // 搜索
+          if (self.component['dataSource'] === 'url') {} else if (self.component['dataSource'] === 'noco_db') {
+            if (self.component.data['noco_db_conditions']) {
+              var where = '';
+              self.component.data['noco_db_conditions'].forEach(function (item, index) {
+                if (item.value && item.value.length > 0) {
+                  var conditionVal = self.parseTpl(item.value, {
+                    data: self.rootValue
+                  });
+                  if (index === 0 && item.logical_operator === '~not') {
+                    where += "(".concat(item.name, ",").concat(item.operator, ",").concat(conditionVal, ")");
+                  } else {
+                    where += "".concat(item.logical_operator, "(").concat(item.name, ",").concat(item.operator, ",").concat(conditionVal, ")");
+                  }
                 }
-                self.getRoot().triggerChange({
-                  fromBlur: false
-                }, {
-                  instance: self,
-                  component: self.component,
-                  value: self.dataValue,
-                  flags: {
-                    fromBlur: false
+              });
+              params.where = where;
+            }
+          }
+          Object.keys(params).forEach(function (key) {
+            searchParams.set(key, params["".concat(key)]);
+          });
+          try {
+            var lastestReqTime = new Date().getTime();
+            self.lastestReqTime = lastestReqTime;
+            var xhr = new XMLHttpRequest();
+            var reqMethod = self.component.request['method'];
+            if (reqMethod === 'GET') {
+              xhr.open('GET', "".concat(url.origin).concat(url.pathname, "?").concat(searchParams.toString()), true);
+              xhr.responseType = 'json';
+              Object.keys(headers).forEach(function (key) {
+                xhr.setRequestHeader(key, headers["".concat(key)]);
+              });
+            } else if (reqMethod === 'POST') {
+              xhr.open('POST', "".concat(url.origin).concat(url.pathname, "?").concat(searchParams.toString()), true);
+              xhr.setRequestHeader('Content-Type', 'application/json');
+              xhr.responseType = 'json';
+              Object.keys(headers).forEach(function (key) {
+                xhr.setRequestHeader(key, headers["".concat(key)]);
+              });
+            }
+            xhr.onload = function () {
+              var status = xhr.status;
+              if (status === 200) {
+                // 确保最后更新的数据是最新一次请求的接口数据
+                if (lastestReqTime - self.lastestReqTime === 0) {
+                  var dataPath = self.component.request['dataPath'];
+                  if (dataPath && dataPath.length > 0) {
+                    self.dataValue = _lodash.default.get(xhr.response, dataPath);
+                  } else {
+                    self.dataValue = xhr.response;
                   }
-                });
+                  self.getRoot().triggerChange({
+                    fromBlur: false
+                  }, {
+                    instance: self,
+                    component: self.component,
+                    value: self.dataValue,
+                    flags: {
+                      fromBlur: false
+                    }
+                  });
+                }
               }
+            };
+            if (reqMethod === 'GET') {
+              xhr.send();
+            } else if (reqMethod === 'POST') {
+              var reqData = JSON.parse(this.parseTpl(JSON.stringify(self.component.request['body']) || '{}', {
+                data: self.rootValue
+              }));
+              xhr.send(JSON.stringify(reqData));
             }
-          };
-          if (reqMethod === 'GET') {
-            xhr.send();
-          } else if (reqMethod === 'POST') {
-            var reqData = JSON.parse(this.parseTpl(JSON.stringify(self.component.request['body']) || '{}', {
-              data: self.rootValue
-            }));
-            xhr.send(JSON.stringify(reqData));
+          } catch (e) {
+            console.log(e);
           }
-        } catch (e) {
-          console.log(e);
         }
+        return true;
       }
-      return true;
     }
   }], [{
     key: "schema",

package/components/_classes/component/Component.js

@@ -2323,6 +2323,17 @@ var Component = /*#__PURE__*/function (_Element) {
         }
         return empty;
       }
+      if (["redrawOn", "refreshOn"].includes(this.key)) {
+        // 特殊处理redrawOn/refreshOn，全部转为multiple
+        var value = _lodash.default.get(this._data, this.key);
+        if (value && value.length === 0) {
+          var _empty = this.component.multiple ? [] : this.emptyValue;
+          return _empty;
+        }
+        if (!_lodash.default.isArray(value)) {
+          return [value];
+        }
+      }
       return _lodash.default.get(this._data, this.key);
     }
 

package/components/_classes/component/editForm/Component.edit.data.js

@@ -98,6 +98,7 @@ var _default = [{
 }, {
   type: 'select',
   input: true,
+  multiple: true,
   key: 'redrawOn',
   label: 'Redraw On',
   weight: 600,

package/components/echarts/ECharts.js

@@ -146,7 +146,7 @@ exports.default = ECharts;
 _defineProperty(ECharts, "builderInfo", {
   title: 'ECharts',
   group: 'advanced',
-  icon: 'chart',
+  icon: 'chart-line',
   weight: 70,
   documentation: 'http://help.form.io/userguide/#echarts',
   schema: ECharts.schema()

package/components/progress/Progress.js

@@ -167,7 +167,7 @@ exports.default = Progress;
 _defineProperty(Progress, "builderInfo", {
   title: 'Progress',
   group: 'advanced',
-  icon: 'bar-progress',
+  icon: 'bars-progress',
   weight: 70,
   documentation: 'http://help.form.io/userguide/#progress',
   schema: Progress.schema()