@zscreate/form-component 1.1.151 → 1.1.153

package/dist/form-component.umd.js

@@ -63890,6 +63890,10 @@ module.exports = /******/function (modules) {
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -63905,6 +63909,10 @@ module.exports = /******/function (modules) {
     tableItem() {
       return _form_modules_common_tableItem_vue__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z;
     },
+    _formLoadingTip() {
+      if (this.pageLoading && !this.formLoading) return '正在加载表单';
+      return this.formLoadingTip;
+    },
     formNameStyle() {
       const {
         formNameStyle
@@ -63953,6 +63961,7 @@ module.exports = /******/function (modules) {
       tableData: {},
       tableLoading: false,
       formLoading: false,
+      pageLoading: true,
       formLoadingTip: '正在加载表单数据0%...',
       tableModel: {},
       tableIndex: {},
@@ -63991,6 +64000,10 @@ module.exports = /******/function (modules) {
     };
   },
   props: {
+    showLayoutLoading: {
+      type: Boolean,
+      default: false
+    },
     showLine: {
       type: Boolean,
       default: false
@@ -64044,12 +64057,13 @@ module.exports = /******/function (modules) {
   },
   watch: {
     data(data) {
+      this.pageLoading = true;
       this.updateWidgetListByHeight(data.list);
       this.generateModle(data.list);
 
       // 将formData 中未绑定表单key 的数据也复制到models
       const modelsKeys = Object.keys(this.models);
-      Object.keys(this.value).forEach(key => {
+      Object.keys(this.value || {}).forEach(key => {
         if (!modelsKeys.includes(key)) {
           this.models[key] = this.value[key];
         }
@@ -64057,8 +64071,11 @@ module.exports = /******/function (modules) {
       this.contentStyle.padding = this.data.config.paddingNum + "px";
       this._provided.config = data.config; //更新data.config
       this._provided.formId = data.formId; //更新表单ID
-    },
 
+      this.$nextTick(() => {
+        this.pageLoading = false;
+      });
+    },
     "data.config"() {
       this.setwidgetFormStyle();
     },
@@ -67021,20 +67038,26 @@ module.exports = function (text, test, separator) {
 console.log("Vue", (vue__WEBPACK_IMPORTED_MODULE_0___default()));
 
 //post
-function postAction(url, parameter) {
+function postAction(url, parameter, config = {
+  notSpin: true
+}) {
   return vue__WEBPACK_IMPORTED_MODULE_0___default().prototype._http({
     url: url,
     method: 'post',
-    data: parameter
+    data: parameter,
+    ...config
   });
 }
 
 //post method= {post | put}
-function httpAction(url, parameter, method) {
+function httpAction(url, parameter, method, config = {
+  notSpin: true
+}) {
   return Vue.prototype._http({
     url: url,
     method: method,
-    data: parameter
+    data: parameter,
+    ...config
   });
 }
 
@@ -67049,11 +67072,14 @@ function putAction(url, parameter) {
 }
 
 //get
-function getAction(url, parameter) {
+function getAction(url, parameter, config = {
+  notSpin: true
+}) {
   return vue__WEBPACK_IMPORTED_MODULE_0___default().prototype._http({
     url: url,
     method: 'get',
-    params: parameter
+    params: parameter,
+    ...config
   });
 }
 
@@ -119588,7 +119614,7 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__7203__;
 /***/ (function(module) {
 
 "use strict";
-module.exports = {"i8":"1.1.151"};
+module.exports = {"i8":"1.1.153"};
 
 /***/ })
 
@@ -119721,8 +119747,8 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(7203);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=template&id=b8a39120&scoped=true&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-spin',{staticClass:"layout layout-input-all-setting",class:{ 'no-border': !_vm.data.config.border, 'save-pdf': _vm.showLine, 'ant-form-noBorder': _vm.data.config.componentsNoBorder },style:({ 'overflow-x': _vm.data.config.layout === 'horizontal' ? 'auto' : 'initial' }),attrs:{"spinning":_vm.formLoading,"tip":_vm.formLoadingTip}},[_c('a-form-model',{ref:"Form",attrs:{"hideRequiredMark":true,"model":_vm.models,"rules":_vm.rules,"wrapper-col":{}},on:{"update:rules":function($event){_vm.rules=$event},"validate":_vm.validate}},_vm._l((_vm.widgetList),function(list,listindex){return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.widgetList[0].length > 0),expression:"widgetList[0].length > 0"}],key:listindex,staticClass:"paper",style:(_vm.contentStyle)},[(listindex == 0)?_vm._t("default"):_vm._e(),(listindex == 0)?_c('div',{staticClass:"form-title",style:(Object.assign({}, {height: _vm.formNameHeight}, _vm.formNameStyle))},[_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameLeftContent || '')}}),_vm._v(_vm._s(_vm.data.config.formName)),_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameRightContent || '')}})]):_vm._e(),(_vm.value && _vm.value.formIndex)?_c('div',{staticStyle:{"text-align":"right","font-weight":"bold"}},[_vm._v(_vm._s(_vm.value.formIndex))]):_vm._e(),(_vm.data.config.pageHeader && listindex === 0)?_c('div',{style:(_vm.data.config.headerHeight),domProps:{"innerHTML":_vm._s(_vm.data.config.pageHeader)}}):_vm._e(),_c('div',{staticClass:"page-border",style:({ borderColor: _vm.data.config.borderColor })},[_vm._l((list),function(widget,index){return [(widget.type == 'table')?[(
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=template&id=e591d05c&scoped=true&
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-spin',{staticClass:"layout layout-input-all-setting",class:{ 'no-border': !_vm.data.config.border, 'save-pdf': _vm.showLine, 'ant-form-noBorder': _vm.data.config.componentsNoBorder },style:({ 'overflow-x': _vm.data.config.layout === 'horizontal' ? 'auto' : 'initial' }),attrs:{"spinning":_vm.formLoading,"tip":_vm.formLoadingTip}},[(_vm.pageLoading && _vm.showLayoutLoading)?_c('div',{class:{ form_skeleton: _vm.pageLoading }},[(_vm.pageLoading)?_c('a-skeleton',{attrs:{"active":"","loading":_vm.pageLoading,"paragraph":{ rows: 12 }}}):_vm._e()],1):_vm._e(),_c('a-form-model',{ref:"Form",attrs:{"hideRequiredMark":true,"model":_vm.models,"rules":_vm.rules,"wrapper-col":{}},on:{"update:rules":function($event){_vm.rules=$event},"validate":_vm.validate}},_vm._l((_vm.widgetList),function(list,listindex){return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.widgetList[0].length > 0),expression:"widgetList[0].length > 0"}],key:listindex,staticClass:"paper",style:(_vm.contentStyle)},[(listindex == 0)?_vm._t("default"):_vm._e(),(listindex == 0)?_c('div',{staticClass:"form-title",style:(Object.assign({}, {height: _vm.formNameHeight}, _vm.formNameStyle))},[_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameLeftContent || '')}}),_vm._v(_vm._s(_vm.data.config.formName)),_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameRightContent || '')}})]):_vm._e(),(_vm.value && _vm.value.formIndex)?_c('div',{staticStyle:{"text-align":"right","font-weight":"bold"}},[_vm._v(_vm._s(_vm.value.formIndex))]):_vm._e(),(_vm.data.config.pageHeader && listindex === 0)?_c('div',{style:(_vm.data.config.headerHeight),domProps:{"innerHTML":_vm._s(_vm.data.config.pageHeader)}}):_vm._e(),_c('div',{staticClass:"page-border",style:({ borderColor: _vm.data.config.borderColor })},[_vm._l((list),function(widget,index){return [(widget.type == 'table')?[(
                   widget.options.layoutModel === 'auto' ||
                   widget.options.layoutModel === undefined
                 )?_c('a-spin',{directives:[{name:"show",rawName:"v-show",value:(widget.options.canView),expression:"widget.options.canView"}],key:index,staticClass:"row-item",class:[widget.options.inline == true ? 'row-table' : ''],style:({ borderColor: _vm.data.config.borderColor }),attrs:{"spinning":_vm.tableLoading && !_vm.formLoading,"tip":"数据加载中"}},[(widget.options.inline)?_c('div',{staticClass:"table-left",style:({
@@ -119757,15 +119783,15 @@ var staticRenderFns = []
 var layoutForPapervue_type_script_lang_js_ = __webpack_require__(1936);
 ;// CONCATENATED MODULE: ./src/form/modules/layout/layoutForPaper.vue?vue&type=script&lang=js&
  /* harmony default export */ var layout_layoutForPapervue_type_script_lang_js_ = (layoutForPapervue_type_script_lang_js_/* default */.Z); 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=b8a39120&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=e591d05c&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=b8a39120&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=e591d05c&prod&lang=less&scoped=true&
 
-;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=b8a39120&prod&lang=css&
+;// CONCATENATED MODULE: ./node_modules/_mini-css-extract-plugin@2.7.6@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.8.1@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=e591d05c&prod&lang=css&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=b8a39120&prod&lang=css&
+;// CONCATENATED MODULE: ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=e591d05c&prod&lang=css&
 
 // EXTERNAL MODULE: ./node_modules/_vue-loader@15.10.2@vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(7506);
@@ -119785,7 +119811,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "b8a39120",
+  "e591d05c",
   null
   
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zscreate/form-component",
-  "version": "1.1.151",
+  "version": "1.1.153",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",