@zscreate/form-component 1.1.460 → 1.1.461

package/dist/form-component.umd.js

@@ -67239,7 +67239,7 @@ let getFileExt = filename => {
 /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(9548);
 /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(4063);
 /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(8548);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(1104);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(5135);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(1528);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_9__);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(9274);
@@ -70323,7 +70323,7 @@ module.exports = {
 
 /***/ }),
 
-/***/ 1104:
+/***/ 5135:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -102610,13 +102610,13 @@ var FileUpload_widgetDesign_component = (0,componentNormalizer/* default */.A)(
   widgetSetup: FileUpload_widgetSetup,
   widgetDesign: FileUpload_widgetDesign
 });
-;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/DepartSelector/component.vue?vue&type=template&id=0ff58d80&scoped=true
-var componentvue_type_template_id_0ff58d80_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[_c('a-input',{attrs:{"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"placeholder":_vm.widget.options.placeholder,"readonly":""},nativeOn:{"click":function($event){return _vm.openModal.apply(null, arguments)}},model:{value:(_vm.departNames),callback:function ($$v) {_vm.departNames=$$v},expression:"departNames"}},[_c('a-icon',{attrs:{"slot":"prefix","type":"cluster","title":"部门选择控件"},slot:"prefix"}),(!_vm.isEmpty(_vm.dataModel))?[(!_vm.widget.options.disabled || _vm.isdisabled)?_c('a-icon',{staticStyle:{"cursor":"pointer"},attrs:{"slot":"suffix","type":"close-circle","title":"清空"},nativeOn:{"click":function($event){$event.stopPropagation();return _vm.handleEmpty.apply(null, arguments)}},slot:"suffix"}):_vm._e()]:_vm._e()],2),_c('div',{class:[
+;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/DepartSelector/component.vue?vue&type=template&id=dbdb6ed6&scoped=true
+var componentvue_type_template_id_dbdb6ed6_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px' })},[_c('a-form-model-item',{ref:_vm.widget.model,attrs:{"colon":false,"label-col":_vm.labelCol,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[_c('a-input',{attrs:{"disabled":_vm.isdisabled ? _vm.show : _vm.widget.options.disabled,"placeholder":_vm.widget.options.placeholder,"readonly":""},nativeOn:{"click":function($event){return _vm.openModal.apply(null, arguments)}},model:{value:(_vm.departNames),callback:function ($$v) {_vm.departNames=$$v},expression:"departNames"}},[_c('a-icon',{attrs:{"slot":"prefix","type":"cluster","title":"部门选择控件"},slot:"prefix"}),(!_vm.isEmpty(_vm.dataModel))?[(!_vm.widget.options.disabled || _vm.isdisabled)?_c('a-icon',{staticStyle:{"cursor":"pointer"},attrs:{"slot":"suffix","type":"close-circle","title":"清空"},nativeOn:{"click":function($event){$event.stopPropagation();return _vm.handleEmpty.apply(null, arguments)}},slot:"suffix"}):_vm._e()]:_vm._e()],2),_c('div',{class:[
         _vm.config.align,
         _vm.config.validate === true && _vm.widget.options.required === true
           ? 'is_required'
           : 'no_required' ],style:({ color: this.config.color }),attrs:{"slot":"label"},slot:"label"},[_vm._v(" "+_vm._s(_vm.widget.name)+" ")])],1),(!_vm.widget.options.disabled || _vm.isdisabled)?_c('select-depart-modal',{ref:"innerDepartSelectModal",attrs:{"modal-width":"800px","multi":_vm.widget.options.multiple,"rootOpened":true,"depart-id":_vm.departIds,"departRelation":_vm.widget.options.departRelation,"departType":_vm.widget.options.departType},on:{"ok":_vm.handleOK,"initComp":_vm.initComp}}):_vm._e()],1):_vm._e()}
-var componentvue_type_template_id_0ff58d80_scoped_true_staticRenderFns = []
+var componentvue_type_template_id_dbdb6ed6_scoped_true_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/selectDepartModal.vue?vue&type=template&id=85d61f9a&scoped=true
@@ -103020,7 +103020,6 @@ var selectDepartModal_component = (0,componentNormalizer/* default */.A)(
     return {
       visible: false,
       confirmLoading: false,
-      departNames: "",
       departIds: "",
       dataModel: ""
     };
@@ -103030,27 +103029,35 @@ var selectDepartModal_component = (0,componentNormalizer/* default */.A)(
     this.getDepartIds();
     this.$bus.$on("dept", msg => {
       // A发送来的消息
-      this.departNames = msg;
+      // this.departNames = msg;
     });
   },
   destroyed() {
     this.$bus.$off("dept");
   },
+  computed: {
+    departNames() {
+      const rows = this.dataModel;
+      if (!rows || Array.isArray(rows) && !rows.length) {
+        return "";
+      } else {
+        let temp = "";
+        for (let item of rows) {
+          temp += "," + item.departName;
+        }
+        return temp.substring(1);
+      }
+    }
+  },
   watch: {
     dataModel: {
       handler(val) {
         this.pulishMsg(val);
         if (!val) this.departIds = '';
-        if (Array.isArray(val) && val.length == 0) {
-          this.departNames = "";
-        } else {
-          this.getDepartNamesByRows(val); //删除子表单 值不更新
-        }
         this.$emit("updateModels", val);
       },
       deep: true
-    },
-    departNames(v) {}
+    }
   },
   methods: {
     isEmpty: isEmpty/* default */.A,
@@ -103064,28 +103071,14 @@ var selectDepartModal_component = (0,componentNormalizer/* default */.A)(
         this.departIds = this.dataModel;
       }
     },
-    initComp(departNames) {
-      this.departNames = departNames;
-    },
+    initComp(departNames) {},
     openModal() {
       if (!this.isdisabled && this.widget.options.disabled) return false;
       this.getDepartIds();
       this.$refs.innerDepartSelectModal.show();
     },
-    getDepartNamesByRows(rows) {
-      if (!rows) {
-        this.departNames = "";
-      } else {
-        let temp = "";
-        for (let item of rows) {
-          temp += "," + item.departName;
-        }
-        this.departNames = temp.substring(1);
-        //避免帮部门的children带到参数
-      }
-    },
+    getDepartNamesByRows(rows) {},
     handleOK(rows, idstr) {
-      this.getDepartNamesByRows(rows);
       this.departIds = idstr;
       if (!rows) {
         this.dataModel = idstr ? idstr : "";
@@ -103124,11 +103117,11 @@ var selectDepartModal_component = (0,componentNormalizer/* default */.A)(
 ;
 var DepartSelector_component_component = (0,componentNormalizer/* default */.A)(
   components_DepartSelector_componentvue_type_script_lang_js,
-  componentvue_type_template_id_0ff58d80_scoped_true_render,
-  componentvue_type_template_id_0ff58d80_scoped_true_staticRenderFns,
+  componentvue_type_template_id_dbdb6ed6_scoped_true_render,
+  componentvue_type_template_id_dbdb6ed6_scoped_true_staticRenderFns,
   false,
   null,
-  "0ff58d80",
+  "dbdb6ed6",
   null
   
 )
@@ -135480,7 +135473,7 @@ var staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 968 modules
-var components = __webpack_require__(1104);
+var components = __webpack_require__(5135);
 ;// 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.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/CorrectionItem.vue?vue&type=script&lang=js
 //
 //
@@ -137525,7 +137518,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /* harmony default export */ const CorrectionModal = (component.exports);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 968 modules
-var components = __webpack_require__(1104);
+var components = __webpack_require__(5135);
 // EXTERNAL MODULE: ./node_modules/_pubsub-js@1.9.4@pubsub-js/src/pubsub.js
 var pubsub = __webpack_require__(1528);
 var pubsub_default = /*#__PURE__*/__webpack_require__.n(pubsub);
@@ -138695,7 +138688,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(8501);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 968 modules
-var components = __webpack_require__(1104);
+var components = __webpack_require__(5135);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(1509);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -153873,7 +153866,7 @@ function toString(value) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"rE":"1.1.460"};
+module.exports = {"rE":"1.1.461"};
 
 /***/ })
 
@@ -168350,7 +168343,7 @@ var es_array_unshift = __webpack_require__(8900);
 // EXTERNAL MODULE: ./src/form/util/util.js
 var util_util = __webpack_require__(4063);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 968 modules
-var components = __webpack_require__(1104);
+var components = __webpack_require__(5135);
 // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 6 modules
 var widgetFormItem = __webpack_require__(4859);
 // EXTERNAL MODULE: ./src/form/modules/WidgetIdeaSignItem.vue + 5 modules

package/package.json

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