@zscreate/form-component 1.1.98 → 1.1.99-asd.2

package/dist/form-component.umd.js

@@ -63497,7 +63497,7 @@ module.exports = /******/function (modules) {
 /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(38);
 /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(6955);
 /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3485);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9519);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6600);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(9616);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(7203);
@@ -64132,7 +64132,9 @@ module.exports = /******/function (modules) {
             item.tableColCanEdit = true;
           }
           addModelObject[item.model] = item.defaultValue ? item.defaultValue : item.options.defaultValue;
+          // if (addModelObject[item.model] === undefined) addModelObject[item.model] = ''
         });
+
         if (!Array.isArray(this.models[model])) {
           this.models[model] = [];
         }
@@ -64309,18 +64311,31 @@ module.exports = /******/function (modules) {
         }, 0);
       }
     },
-    generateModle(genList) {
+    syncLayoutSubscribe(widget) {
+      let subscribeKey = widget.options.subscribeOptions ? widget.options.subscribeOptions.subscribeKey : "";
+      pubsub_js__WEBPACK_IMPORTED_MODULE_4___default().subscribe(subscribeKey, (msg, data) => {
+        console.log('isClickByUser', data.isClickByUser);
+        let list = data.msg;
+        eval(data.operateValue);
+        // this.updateModelByScript(data, data.msg);
+      });
+    },
+
+    generateModle(genList, parentWidget) {
       if (Array.isArray(genList) && genList.length > 0) {
         genList.forEach((widget, index) => {
+          if (["grid", "grid-lay-out", "all-lay-out", 'table'].includes(widget.type)) {
+            this.syncLayoutSubscribe(widget);
+          }
           // 此类组件 需要深度遍历columns.list
           if (["grid", "grid-lay-out", "all-lay-out"].includes(widget.type)) {
             widget.columns.forEach(column => {
-              this.generateModle(column.list);
+              this.generateModle(column.list, widget);
             });
             return false;
           }
           // 设置rules
-          this.generateRules(widget);
+          this.generateRules(widget, parentWidget);
 
           // values里面存在当前字段的值
           if (this.value && Object.keys(this.value).indexOf(widget.model) >= 0) {
@@ -64390,7 +64405,7 @@ module.exports = /******/function (modules) {
           return false;
       }
     },
-    generateRules(widget) {
+    generateRules(widget, parentWidget) {
       if (widget.type === "table") {
         var tableRlues = {};
         if (widget.columns.length > 0) {
@@ -64401,6 +64416,10 @@ module.exports = /******/function (modules) {
                   return {
                     ...i,
                     validator: (rule, value, callback) => {
+                      // 子表单组件不可见的时候， 内部组件都不校验
+                      if (!widget.options.canView) {
+                        return callback();
+                      }
                       if (!item.options.canView || item.options.disabled || !rule.required) {
                         return callback();
                       }
@@ -64436,6 +64455,7 @@ module.exports = /******/function (modules) {
               return {
                 ...item,
                 validator: (rule, value, callback) => {
+                  if (parentWidget && !parentWidget.options.canView) return callback();
                   if (!widget.options.canView || widget.options.disabled || !rule.required) {
                     return callback();
                   }
@@ -64454,6 +64474,7 @@ module.exports = /******/function (modules) {
                 ...item,
                 pattern: eval(item.pattern),
                 asyncValidator(rule, value, callback, source, options) {
+                  if (parentWidget && !parentWidget.options.canView) return callback();
                   if (!widget.options.canView || widget.options.disabled || !widget.options.canEdit) {
                     return callback();
                   }
@@ -64464,6 +64485,7 @@ module.exports = /******/function (modules) {
               return {
                 ...item,
                 asyncValidator(rule, value, callback, source, options) {
+                  if (parentWidget && !parentWidget.options.canView) return callback();
                   if (!widget.options.canView || widget.options.disabled || !widget.options.canEdit) {
                     return callback();
                   }
@@ -67408,6 +67430,7 @@ const API = '/form/formdesiger/countLeaveDays';
         if (subscribeKey == 'time') {
           console.log('timecount', ++timecount);
         }
+        if (["grid", "grid-lay-out", "all-lay-out", 'table'].includes(this.widget.type)) return;
         this.pubsubSign = pubsub_js__WEBPACK_IMPORTED_MODULE_1___default().subscribe(subscribeKey, (msg, data) => {
           console.log('isClickByUser', data.isClickByUser);
           if (data.hasOwnProperty('updateModel') && data.updateModel) {
@@ -67780,7 +67803,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 9519:
+/***/ 6600:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -68514,17 +68537,17 @@ var formDataBindModal_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var formDataBindModal = (formDataBindModal_component.exports);
-;// 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/common/Modals/relateSubModal.vue?vue&type=template&id=4b742c9e&scoped=true&
-var relateSubModalvue_type_template_id_4b742c9e_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{staticClass:"formDataBindModal",staticStyle:{"height":"70%","overflow-y":"hidden"},attrs:{"title":'联动字段配置',"width":1200,"visible":_vm.visible,"destroyOnClose":true,"centered":true,"cancelText":"关闭","zIndex":110000,"maskClosable":false},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel}},[_c('div',[_c('a-row',{staticClass:"option_row_header"},[_c('a-col',{attrs:{"span":6}},[_vm._v("关联字段")]),_c('a-col',{attrs:{"span":6}},[_vm._v("联动方式")]),_c('a-col',{attrs:{"span":10}},[_vm._v("条件")]),_c('a-col',{attrs:{"span":2},on:{"click":_vm.addRelateOptions}},[_c('a-button',{attrs:{"type":"link"}},[_vm._v("添加")])],1)],1),_vm._l((_vm.optionsConfig),function(option,o_index){return _c('a-row',{key:o_index,staticClass:"option_row"},[_c('a-col',{attrs:{"span":6}},[_c('a-select',{staticStyle:{"width":"200px"},attrs:{"dropdownStyle":{
+;// 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/common/Modals/relateSubModal.vue?vue&type=template&id=13e7183b&scoped=true&
+var relateSubModalvue_type_template_id_13e7183b_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-modal',{staticClass:"formDataBindModal",staticStyle:{"height":"70%","overflow-y":"hidden"},attrs:{"title":'联动字段配置',"width":1200,"visible":_vm.visible,"destroyOnClose":true,"centered":true,"cancelText":"关闭","zIndex":110000,"maskClosable":false},on:{"ok":_vm.handleOk,"cancel":_vm.handleCancel}},[_c('div',[_c('a-row',{staticClass:"option_row_header"},[_c('a-col',{attrs:{"span":6}},[_vm._v("关联字段")]),_c('a-col',{attrs:{"span":6}},[_vm._v("联动方式")]),_c('a-col',{attrs:{"span":10}},[_vm._v("条件")]),_c('a-col',{attrs:{"span":2},on:{"click":_vm.addRelateOptions}},[_c('a-button',{attrs:{"type":"link"}},[_vm._v("添加")])],1)],1),_vm._l((_vm.optionsConfig),function(option,o_index){return _c('a-row',{key:o_index,staticClass:"option_row"},[_c('a-col',{attrs:{"span":6}},[_c('a-select',{staticStyle:{"width":"200px"},attrs:{"dropdownStyle":{
             'z-index': '110001',
-          }},on:{"change":_vm.handleChange},model:{value:(_vm.optionsConfig[o_index]['publishKey']),callback:function ($$v) {_vm.$set(_vm.optionsConfig[o_index], 'publishKey', $$v)},expression:"optionsConfig[o_index]['publishKey']"}},[_vm._l((_vm.datalist),function(widgetItem,index){return [(widgetItem.type == 'table')?_c('a-select-opt-group',{key:index},[_c('span',{attrs:{"slot":"label"},slot:"label"},[_c('a-icon',{staticStyle:{"margin-right":"10px"},attrs:{"type":"table"}}),_vm._v(" "+_vm._s(widgetItem.name)+" ")],1),_vm._l((widgetItem.columns),function(col,_index){return _c('a-select-option',{directives:[{name:"show",rawName:"v-show",value:(col.model !== _vm.widget.model),expression:"col.model !== widget.model"}],key:_index,attrs:{"value":col.model}},[_vm._v(_vm._s(col.name))])})],2):(
+          }},on:{"change":_vm.handleChange},model:{value:(_vm.optionsConfig[o_index]['publishKey']),callback:function ($$v) {_vm.$set(_vm.optionsConfig[o_index], 'publishKey', $$v)},expression:"optionsConfig[o_index]['publishKey']"}},[_vm._l((_vm.datalist),function(widgetItem,index){return [(widgetItem.type == 'table')?_c('a-select-opt-group',{key:index},[_c('p',{staticStyle:{"overflow":"hidden","height":"100%","text-overflow":"ellipsis","white-space":"nowrap","cursor":"pointer"},attrs:{"slot":"label","title":widgetItem.name},slot:"label"},[_c('a-icon',{staticStyle:{"margin-right":"10px"},attrs:{"type":"table"}}),_vm._v(" "+_vm._s(widgetItem.name)+" ")],1),_vm._l((widgetItem.columns),function(col,_index){return _c('a-select-option',{directives:[{name:"show",rawName:"v-show",value:(col.model !== _vm.widget.model),expression:"col.model !== widget.model"}],key:_index,attrs:{"value":col.model}},[_vm._v(_vm._s(col.name))])})],2):_vm._e(),(widgetItem.type == 'table')?[_c('a-select-option',{directives:[{name:"show",rawName:"v-show",value:(widgetItem.model !== _vm.widget.model),expression:"widgetItem.model !== widget.model"}],key:widgetItem.model,attrs:{"value":widgetItem.model}},[_c('a-icon',{staticStyle:{"margin-right":"10px"},attrs:{"type":"table"}}),_vm._v(_vm._s(widgetItem.name))],1)]:(
                 widgetItem.type === 'grid-lay-out' ||
                 widgetItem.type === 'all-lay-out' ||
                 widgetItem.type === 'grid'
-              )?[_vm._l((widgetItem.columns),function(columns){return _vm._l((columns.list),function(item){return _c('a-select-option',{directives:[{name:"show",rawName:"v-show",value:(item.model !== _vm.widget.model),expression:"item.model !== widget.model"}],key:item.model,attrs:{"value":item.model}},[_vm._v(_vm._s(item.name))])})})]:(
+              )?[_c('a-select-option',{directives:[{name:"show",rawName:"v-show",value:(widgetItem.model !== _vm.widget.model),expression:"widgetItem.model !== widget.model"}],key:widgetItem.model,attrs:{"value":widgetItem.model}},[_c('a-icon',{staticStyle:{"margin-right":"10px"},attrs:{"type":"table"}}),_vm._v(_vm._s(widgetItem.name))],1),_vm._l((widgetItem.columns),function(columns){return _vm._l((columns.list),function(item){return _c('a-select-option',{directives:[{name:"show",rawName:"v-show",value:(item.model !== _vm.widget.model),expression:"item.model !== widget.model"}],key:item.model,attrs:{"value":item.model}},[_vm._v(_vm._s(item.name))])})})]:(
                 _vm.widget.type !== 'table' && widgetItem.model !== _vm.widget.model
               )?_c('a-select-option',{key:index,attrs:{"value":widgetItem.model}},[_vm._v(_vm._s(widgetItem.name))]):_vm._e()]})],2)],1),_c('a-col',{attrs:{"span":6}},[_c('a-radio-group',{on:{"change":_vm.onChange},model:{value:(_vm.optionsConfig[o_index]['operate']),callback:function ($$v) {_vm.$set(_vm.optionsConfig[o_index], 'operate', $$v)},expression:"optionsConfig[o_index]['operate']"}},[_c('a-radio',{attrs:{"value":"updateModel"}},[_vm._v("改值")]),_c('a-radio',{attrs:{"value":"canView"}},[_vm._v("隐藏")]),_c('a-radio',{attrs:{"value":"disabled"}},[_vm._v("禁用")]),_c('a-radio',{attrs:{"value":"jsScript"}},[_vm._v("脚本")])],1)],1),_c('a-col',{staticClass:"code-col",attrs:{"span":10}},[_c('div',{staticClass:"code"},[_c('codemirror',{attrs:{"options":_vm.cmOptions},model:{value:(_vm.optionsConfig[o_index]['operateValue']),callback:function ($$v) {_vm.$set(_vm.optionsConfig[o_index], 'operateValue', $$v)},expression:"optionsConfig[o_index]['operateValue']"}})],1)]),_c('a-col',{attrs:{"span":2}},[_c('a-button',{staticClass:"delete",attrs:{"type":"link"},on:{"click":function($event){return _vm.deleteItem(o_index)}}},[_vm._v("删除")]),_c('a-button',{staticClass:"getTemp",attrs:{"type":"link"},on:{"click":function($event){return _vm.getTemp(o_index)}}},[_vm._v("获取条件模板")])],1)],1)}),(_vm.optionsConfig.length == 0)?_c('a-row',{staticClass:"no-data"},[_c('a-col',{on:{"click":_vm.addRelateOptions}},[_vm._v("请点击添加")])],1):_vm._e()],2)])}
-var relateSubModalvue_type_template_id_4b742c9e_scoped_true_staticRenderFns = []
+var relateSubModalvue_type_template_id_13e7183b_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/_core-js@3.32.1@core-js/modules/es.array.push.js
@@ -68715,6 +68738,18 @@ var active_line = __webpack_require__(4609);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -68850,6 +68885,9 @@ if(templist.includes('匹配条件字段的值')){
       if (datalist && datalist.length == 0) return false;
       datalist.forEach(item => {
         if (item.columns && Array.isArray(item.columns)) {
+          if (['grid-lay-out', 'all-lay-out', 'grid', 'table'].includes(item.type)) {
+            this.selectList.push(item);
+          }
           if (item.type === "table") {
             this.setSelectList(item.columns, item.model);
           } else {
@@ -68903,10 +68941,10 @@ if(templist.includes('匹配条件字段的值')){
 });
 ;// CONCATENATED MODULE: ./src/form/modules/common/Modals/relateSubModal.vue?vue&type=script&lang=js&
  /* harmony default export */ var Modals_relateSubModalvue_type_script_lang_js_ = (relateSubModalvue_type_script_lang_js_); 
-;// 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/common/Modals/relateSubModal.vue?vue&type=style&index=0&id=4b742c9e&prod&scoped=true&lang=less&
+;// 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/common/Modals/relateSubModal.vue?vue&type=style&index=0&id=13e7183b&prod&scoped=true&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/modules/common/Modals/relateSubModal.vue?vue&type=style&index=0&id=4b742c9e&prod&scoped=true&lang=less&
+;// CONCATENATED MODULE: ./src/form/modules/common/Modals/relateSubModal.vue?vue&type=style&index=0&id=13e7183b&prod&scoped=true&lang=less&
 
 ;// CONCATENATED MODULE: ./src/form/modules/common/Modals/relateSubModal.vue
 
@@ -68919,11 +68957,11 @@ if(templist.includes('匹配条件字段的值')){
 
 var relateSubModal_component = (0,componentNormalizer/* default */.Z)(
   Modals_relateSubModalvue_type_script_lang_js_,
-  relateSubModalvue_type_template_id_4b742c9e_scoped_true_render,
-  relateSubModalvue_type_template_id_4b742c9e_scoped_true_staticRenderFns,
+  relateSubModalvue_type_template_id_13e7183b_scoped_true_render,
+  relateSubModalvue_type_template_id_13e7183b_scoped_true_staticRenderFns,
   false,
   null,
-  "4b742c9e",
+  "13e7183b",
   null
   
 )
@@ -102405,9 +102443,9 @@ var DepartSelector_component_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var DepartSelector_component = (DepartSelector_component_component.exports);
-;// 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/components/DepartSelector/widgetSetup.vue?vue&type=template&id=78e97d32&scoped=true&
-var widgetSetupvue_type_template_id_78e97d32_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control"},[_c('div',{staticClass:"form_wrap"},[_c('div',{staticClass:"form"},[_c('a-form-model-item',{attrs:{"label":"展示部门类型："}},[_c('a-radio-group',{model:{value:(_vm.widget.options.departType),callback:function ($$v) {_vm.$set(_vm.widget.options, "departType", $$v)},expression:"widget.options.departType"}},[_c('a-radio',{attrs:{"value":""}},[_vm._v("所有")]),_c('a-radio',{attrs:{"value":"JX"}},[_vm._v("教学")]),_c('a-radio',{attrs:{"value":"XZ"}},[_vm._v("行政")])],1)],1),_c('a-form-model-item',{attrs:{"label":"字段联动"}},[_c('a-button',{attrs:{"type":"primary"},on:{"click":_vm.showModal}},[_vm._v("联动配置")])],1),_c('a-form-model-item',{ref:"title",attrs:{"label":"默认值","prop":"title"}},[_c('a-radio-group',{attrs:{"button-style":"solid"},model:{value:(_vm.source),callback:function ($$v) {_vm.source=$$v},expression:"source"}},[_c('a-radio-button',{attrs:{"value":"1"}},[_vm._v("选择数据")]),_c('a-radio-button',{attrs:{"value":"2"}},[_vm._v("表单绑定")])],1),(_vm.source == '1')?_c('j-dict-select-tag',{attrs:{"triggerChange":true,"dictCode":"BDMRZ","placeholder":"请选择默认值"},on:{"change":_vm.input},model:{value:(_vm.widget.options.defaultValue),callback:function ($$v) {_vm.$set(_vm.widget.options, "defaultValue", $$v)},expression:"widget.options.defaultValue"}}):_vm._e(),(_vm.source == '2')?_c('a-input',{attrs:{"placeholder":"请点击选择绑定表单字段","read-only":""},on:{"click":_vm.openformDataBindModal},model:{value:(_vm.widget.options.defaultValue),callback:function ($$v) {_vm.$set(_vm.widget.options, "defaultValue", $$v)},expression:"widget.options.defaultValue"}}):_vm._e()],1),_c('a-form-model-item',{attrs:{"label":"事项内容"}},[_c('a-switch',{model:{value:(_vm.widget.options.matterContentEnable),callback:function ($$v) {_vm.$set(_vm.widget.options, "matterContentEnable", $$v)},expression:"widget.options.matterContentEnable"}})],1),_c('a-form-model-item',{attrs:{"label":"角色"}},[_c('a-input',{attrs:{"read-only":"","type":"hidden"},model:{value:(_vm.widget.options.role),callback:function ($$v) {_vm.$set(_vm.widget.options, "role", $$v)},expression:"widget.options.role"}}),_c('a-input',{attrs:{"read-only":""},on:{"click":_vm.selectRole},model:{value:(_vm.roleName),callback:function ($$v) {_vm.roleName=$$v},expression:"roleName"}})],1)],1),_c('form-data-bind-modal',{ref:"formDataBindModal",on:{"okSubStr":_vm.okSubStr}}),_c('relate-sub-modal',{ref:"relateSubModal",attrs:{"datalist":_vm.datalist,"widget":_vm.widget},on:{"okSubStr":_vm.okSubStr}}),_c('select-role-modal',{ref:"selectRoleModal",on:{"ok":_vm.handleRoleOk}})],1)])}
-var widgetSetupvue_type_template_id_78e97d32_scoped_true_staticRenderFns = []
+;// 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/components/DepartSelector/widgetSetup.vue?vue&type=template&id=524196c3&scoped=true&
+var widgetSetupvue_type_template_id_524196c3_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control"},[_c('div',{staticClass:"form_wrap"},[_c('div',{staticClass:"form"},[_c('a-form-model-item',{attrs:{"label":"展示部门类型："}},[_c('a-radio-group',{model:{value:(_vm.widget.options.departType),callback:function ($$v) {_vm.$set(_vm.widget.options, "departType", $$v)},expression:"widget.options.departType"}},[_c('a-radio',{attrs:{"value":""}},[_vm._v("所有")]),_c('a-radio',{attrs:{"value":"JX"}},[_vm._v("教学")]),_c('a-radio',{attrs:{"value":"XZ"}},[_vm._v("行政")])],1)],1),_c('a-form-model-item',{attrs:{"label":"字段联动"}},[_c('a-button',{attrs:{"type":"primary"},on:{"click":_vm.showModal}},[_vm._v("联动配置")])],1),_c('a-form-model-item',{ref:"title",attrs:{"label":"默认值","prop":"title"}},[_c('a-radio-group',{attrs:{"button-style":"solid"},model:{value:(_vm.source),callback:function ($$v) {_vm.source=$$v},expression:"source"}},[_c('a-radio-button',{attrs:{"value":"1"}},[_vm._v("选择数据")]),_c('a-radio-button',{attrs:{"value":"2"}},[_vm._v("表单绑定")])],1),(_vm.source == '1')?_c('j-dict-select-tag',{attrs:{"triggerChange":true,"dictCode":"BDMRZ","placeholder":"请选择默认值"},on:{"change":_vm.input},model:{value:(_vm.widget.options.defaultValue),callback:function ($$v) {_vm.$set(_vm.widget.options, "defaultValue", $$v)},expression:"widget.options.defaultValue"}}):_vm._e(),(_vm.source == '2')?_c('a-input',{attrs:{"placeholder":"请点击选择绑定表单字段","read-only":""},on:{"click":_vm.openformDataBindModal},model:{value:(_vm.widget.options.defaultValue),callback:function ($$v) {_vm.$set(_vm.widget.options, "defaultValue", $$v)},expression:"widget.options.defaultValue"}}):_vm._e()],1),_c('a-form-model-item',{attrs:{"label":"事项内容"}},[_c('a-switch',{model:{value:(_vm.widget.options.matterContentEnable),callback:function ($$v) {_vm.$set(_vm.widget.options, "matterContentEnable", $$v)},expression:"widget.options.matterContentEnable"}})],1),_c('a-form-model-item',{attrs:{"label":"角色"}},[_c('a-input',{attrs:{"read-only":"","type":"hidden"},model:{value:(_vm.widget.options.role),callback:function ($$v) {_vm.$set(_vm.widget.options, "role", $$v)},expression:"widget.options.role"}}),_c('a-input',{attrs:{"read-only":""},on:{"click":_vm.selectRole},model:{value:(_vm.roleName),callback:function ($$v) {_vm.roleName=$$v},expression:"roleName"}})],1)],1),_c('form-data-bind-modal',{ref:"formDataBindModal",on:{"okSubStr":_vm.okSubStr}}),_c('relate-sub-modal',{ref:"relateSubModal",attrs:{"datalist":_vm.datalist,"widget":_vm.widget},on:{"okSubStr":_vm.okSubStr}}),_c('select-role-modal',{ref:"selectRoleModal",on:{"ok":_vm.handleRoleOk}})],1)])}
+var widgetSetupvue_type_template_id_524196c3_scoped_true_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/DepartSelector/widgetSetup.vue?vue&type=script&lang=js&
@@ -102520,8 +102558,14 @@ var widgetSetupvue_type_template_id_78e97d32_scoped_true_staticRenderFns = []
     selectRoleModal: selectRoleModal
   },
   watch: {
-    "widget.options.role"(val) {
-      this.getRoleName(val);
+    // "widget.options.role"(val) {
+    //   this.getRoleName(val)
+    // },
+    "widget.options.role": {
+      handler(val) {
+        this.getRoleName(val);
+      },
+      immediate: true
     }
   },
   created() {},
@@ -102546,6 +102590,7 @@ var widgetSetupvue_type_template_id_78e97d32_scoped_true_staticRenderFns = []
       this.$refs.selectRoleModal.init();
     },
     getRoleName(val) {
+      if (!val) return;
       (0,manage/* getAction */.s7)("/sys/role/list", {
         id: val
       }).then(res => {
@@ -102572,11 +102617,11 @@ var widgetSetupvue_type_template_id_78e97d32_scoped_true_staticRenderFns = []
 ;
 var DepartSelector_widgetSetup_component = (0,componentNormalizer/* default */.Z)(
   components_DepartSelector_widgetSetupvue_type_script_lang_js_,
-  widgetSetupvue_type_template_id_78e97d32_scoped_true_render,
-  widgetSetupvue_type_template_id_78e97d32_scoped_true_staticRenderFns,
+  widgetSetupvue_type_template_id_524196c3_scoped_true_render,
+  widgetSetupvue_type_template_id_524196c3_scoped_true_staticRenderFns,
   false,
   null,
-  "78e97d32",
+  "524196c3",
   null
   
 )
@@ -110932,7 +110977,7 @@ var CorrectionItemvue_type_template_id_4d910d38_scoped_true_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 854 modules
-var components = __webpack_require__(9519);
+var components = __webpack_require__(6600);
 ;// CONCATENATED MODULE: ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.3.0@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.10.2@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/CorrectionItem.vue?vue&type=script&lang=js&
 //
 //
@@ -112777,7 +112822,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(1474);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 854 modules
-var components = __webpack_require__(9519);
+var components = __webpack_require__(6600);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(767);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -113394,7 +113439,7 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__7203__;
 /***/ (function(module) {
 
 "use strict";
-module.exports = {"i8":"1.1.98"};
+module.exports = JSON.parse('{"i8":"1.1.99-asd.2"}');
 
 /***/ })
 
@@ -113527,7 +113572,7 @@ 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=78d92637&scoped=true&
+;// 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=5c74b4ed&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:({ height: _vm.formNameHeight })},[_vm._v(" "+_vm._s(_vm.data.config.formName)+" ")]):_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
@@ -113563,15 +113608,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=78d92637&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=5c74b4ed&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=78d92637&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=5c74b4ed&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=78d92637&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=5c74b4ed&prod&lang=css&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=78d92637&prod&lang=css&
+;// CONCATENATED MODULE: ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=5c74b4ed&prod&lang=css&
 
 // EXTERNAL MODULE: ./node_modules/_vue-loader@15.10.2@vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(7506);
@@ -113591,7 +113636,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "78d92637",
+  "5c74b4ed",
   null
   
 )
@@ -114918,7 +114963,7 @@ var es_array_push = __webpack_require__(9211);
 // EXTERNAL MODULE: ./src/form/util/util.js
 var util = __webpack_require__(6955);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 854 modules
-var components = __webpack_require__(9519);
+var components = __webpack_require__(6600);
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(1474);
 // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 6 modules

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zscreate/form-component",
-  "version": "1.1.98",
+  "version": "1.1.99-asd.2",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",