epx-frame 4.0.8 → 4.0.9

package/lib/form-item.js

@@ -5033,7 +5033,7 @@ ___CSS_LOADER_EXPORT___.push([module.i, ".container[data-v-6ccbc828]{width:96%}.
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_0___default()(function(i){return i[1]});
 // Module
-___CSS_LOADER_EXPORT___.push([module.i, ".edit-input[data-v-2c97c8b9]{display:flex;align-items:center}.language-icon[data-v-2c97c8b9]{cursor:pointer;margin-left:8px;font-size:16px;color:#0874e7}[data-theme=purple] .language-icon[data-v-2c97c8b9]{color:#7569e2}[data-theme=palevioletred] .language-icon[data-v-2c97c8b9]{color:#ce4545}[data-theme=forestgreen] .language-icon[data-v-2c97c8b9]{color:#3d8a50}[data-theme=deepblue] .language-icon[data-v-2c97c8b9]{color:#0f5fbd}[data-theme=orange] .language-icon[data-v-2c97c8b9]{color:#ea6000}[data-theme=skyblue] .language-icon[data-v-2c97c8b9]{color:#1a4586}[data-theme=aurorablue] .language-icon[data-v-2c97c8b9]{color:#383b9e}[data-theme=tiffanyblue] .language-icon[data-v-2c97c8b9]{color:#00aaad}[data-theme=tsinghuapurple] .language-icon[data-v-2c97c8b9]{color:#5f2167}[data-theme=creativeblue] .language-icon[data-v-2c97c8b9]{color:#418cff}[data-theme=njhkht] .language-icon[data-v-2c97c8b9]{color:#1d2088}.language[data-v-2c97c8b9]{padding:10px}.language-item[data-v-2c97c8b9]{display:flex;align-items:center}.language-item[data-v-2c97c8b9]:not(:last-child){margin-bottom:20px}.language-item__label[data-v-2c97c8b9]{width:80px;margin-right:10px;text-align:right}.language-item__input[data-v-2c97c8b9]{width:220px}.language-item__input[data-v-2c97c8b9] .el-input__inner{width:220px}.language-operate[data-v-2c97c8b9]{float:right;margin:10px 0}\n", ""]);
+___CSS_LOADER_EXPORT___.push([module.i, ".edit-input[data-v-3d4a1dbb]{display:flex;align-items:center}.language-icon[data-v-3d4a1dbb]{cursor:pointer;margin-left:8px;font-size:16px;color:#0874e7}[data-theme=purple] .language-icon[data-v-3d4a1dbb]{color:#7569e2}[data-theme=palevioletred] .language-icon[data-v-3d4a1dbb]{color:#ce4545}[data-theme=forestgreen] .language-icon[data-v-3d4a1dbb]{color:#3d8a50}[data-theme=deepblue] .language-icon[data-v-3d4a1dbb]{color:#0f5fbd}[data-theme=orange] .language-icon[data-v-3d4a1dbb]{color:#ea6000}[data-theme=skyblue] .language-icon[data-v-3d4a1dbb]{color:#1a4586}[data-theme=aurorablue] .language-icon[data-v-3d4a1dbb]{color:#383b9e}[data-theme=tiffanyblue] .language-icon[data-v-3d4a1dbb]{color:#00aaad}[data-theme=tsinghuapurple] .language-icon[data-v-3d4a1dbb]{color:#5f2167}[data-theme=creativeblue] .language-icon[data-v-3d4a1dbb]{color:#418cff}[data-theme=njhkht] .language-icon[data-v-3d4a1dbb]{color:#1d2088}.language[data-v-3d4a1dbb]{padding:10px}.language-item[data-v-3d4a1dbb]{display:flex;align-items:center}.language-item[data-v-3d4a1dbb]:not(:last-child){margin-bottom:20px}.language-item__label[data-v-3d4a1dbb]{width:80px;margin-right:10px;text-align:right}.language-item__input[data-v-3d4a1dbb]{width:220px}.language-item__input[data-v-3d4a1dbb] .el-input__inner{width:220px}.language-operate[data-v-3d4a1dbb]{float:right;margin:10px 0}\n", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["a"] = (___CSS_LOADER_EXPORT___);
 
@@ -5177,7 +5177,7 @@ ___CSS_LOADER_EXPORT___.push([module.i, ".textarea-container[data-v-d2a0ba56]{wi
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_0___default()(function(i){return i[1]});
 // Module
-___CSS_LOADER_EXPORT___.push([module.i, ".option-text.has-bg[data-v-1acc82b6]{padding:4px 8px;border-radius:2px}.option-text>i[data-v-1acc82b6]{margin-right:4px}.option-text+.option-text[data-v-1acc82b6]{margin-left:6px}.m-form-select[data-v-1acc82b6]{width:100%}\n", ""]);
+___CSS_LOADER_EXPORT___.push([module.i, ".option-text.has-bg[data-v-4e09744b]{padding:4px 8px;border-radius:2px}.option-text>i[data-v-4e09744b]{margin-right:4px}.option-text+.option-text[data-v-4e09744b]{margin-left:6px}.m-form-select[data-v-4e09744b]{width:100%}\n", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["a"] = (___CSS_LOADER_EXPORT___);
 
@@ -9856,8 +9856,8 @@ var Html_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var Html = (Html_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Input.vue?vue&type=template&id=2c97c8b9&scoped=true
-var Inputvue_type_template_id_2c97c8b9_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Input.vue?vue&type=template&id=3d4a1dbb&scoped=true
+var Inputvue_type_template_id_3d4a1dbb_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -10060,11 +10060,11 @@ var Inputvue_type_template_id_2c97c8b9_scoped_true_render = function () {
     2
   )
 }
-var Inputvue_type_template_id_2c97c8b9_scoped_true_staticRenderFns = []
-Inputvue_type_template_id_2c97c8b9_scoped_true_render._withStripped = true
+var Inputvue_type_template_id_3d4a1dbb_scoped_true_staticRenderFns = []
+Inputvue_type_template_id_3d4a1dbb_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/frame/packages/form-item/Input.vue?vue&type=template&id=2c97c8b9&scoped=true
+// CONCATENATED MODULE: ./src/frame/packages/form-item/Input.vue?vue&type=template&id=3d4a1dbb&scoped=true
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Input.vue?vue&type=script&lang=js
 
@@ -10208,6 +10208,7 @@ Inputvue_type_template_id_2c97c8b9_scoped_true_render._withStripped = true
     value: {
       type: String
     },
+    valueLabel: String,
     i18nValue: {
       type: Object
     },
@@ -10284,7 +10285,7 @@ Inputvue_type_template_id_2c97c8b9_scoped_true_render._withStripped = true
     },
     _value: {
       get: function get() {
-        return this.$_.isNil(this.value) ? this.data[this.attriName] : this.value;
+        return this.$_.isNil(this.value) ? this.data[this.attriName + '#'] || this.data[this.attriName] : this.valueLabel || this.value;
       },
       set: function set(v) {
         this.$emit('change', v);
@@ -10422,24 +10423,24 @@ Inputvue_type_template_id_2c97c8b9_scoped_true_render._withStripped = true
 });
 // CONCATENATED MODULE: ./src/frame/packages/form-item/Input.vue?vue&type=script&lang=js
  /* harmony default export */ var form_item_Inputvue_type_script_lang_js = (Inputvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Input.vue?vue&type=style&index=0&id=2c97c8b9&prod&lang=scss&scoped=true
-var Inputvue_type_style_index_0_id_2c97c8b9_prod_lang_scss_scoped_true = __webpack_require__(294);
+// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Input.vue?vue&type=style&index=0&id=3d4a1dbb&prod&lang=scss&scoped=true
+var Inputvue_type_style_index_0_id_3d4a1dbb_prod_lang_scss_scoped_true = __webpack_require__(294);
 
-// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Input.vue?vue&type=style&index=0&id=2c97c8b9&prod&lang=scss&scoped=true
+// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Input.vue?vue&type=style&index=0&id=3d4a1dbb&prod&lang=scss&scoped=true
 
             
 
-var Inputvue_type_style_index_0_id_2c97c8b9_prod_lang_scss_scoped_true_options = {};
+var Inputvue_type_style_index_0_id_3d4a1dbb_prod_lang_scss_scoped_true_options = {};
 
-Inputvue_type_style_index_0_id_2c97c8b9_prod_lang_scss_scoped_true_options.insert = "head";
-Inputvue_type_style_index_0_id_2c97c8b9_prod_lang_scss_scoped_true_options.singleton = false;
+Inputvue_type_style_index_0_id_3d4a1dbb_prod_lang_scss_scoped_true_options.insert = "head";
+Inputvue_type_style_index_0_id_3d4a1dbb_prod_lang_scss_scoped_true_options.singleton = false;
 
-var Inputvue_type_style_index_0_id_2c97c8b9_prod_lang_scss_scoped_true_update = injectStylesIntoStyleTag_default()(Inputvue_type_style_index_0_id_2c97c8b9_prod_lang_scss_scoped_true["a" /* default */], Inputvue_type_style_index_0_id_2c97c8b9_prod_lang_scss_scoped_true_options);
+var Inputvue_type_style_index_0_id_3d4a1dbb_prod_lang_scss_scoped_true_update = injectStylesIntoStyleTag_default()(Inputvue_type_style_index_0_id_3d4a1dbb_prod_lang_scss_scoped_true["a" /* default */], Inputvue_type_style_index_0_id_3d4a1dbb_prod_lang_scss_scoped_true_options);
 
 
 
-/* harmony default export */ var form_item_Inputvue_type_style_index_0_id_2c97c8b9_prod_lang_scss_scoped_true = (Inputvue_type_style_index_0_id_2c97c8b9_prod_lang_scss_scoped_true["a" /* default */].locals || {});
-// CONCATENATED MODULE: ./src/frame/packages/form-item/Input.vue?vue&type=style&index=0&id=2c97c8b9&prod&lang=scss&scoped=true
+/* harmony default export */ var form_item_Inputvue_type_style_index_0_id_3d4a1dbb_prod_lang_scss_scoped_true = (Inputvue_type_style_index_0_id_3d4a1dbb_prod_lang_scss_scoped_true["a" /* default */].locals || {});
+// CONCATENATED MODULE: ./src/frame/packages/form-item/Input.vue?vue&type=style&index=0&id=3d4a1dbb&prod&lang=scss&scoped=true
 
 // CONCATENATED MODULE: ./src/frame/packages/form-item/Input.vue
 
@@ -10452,11 +10453,11 @@ var Inputvue_type_style_index_0_id_2c97c8b9_prod_lang_scss_scoped_true_update =
 
 var Input_component = Object(componentNormalizer["a" /* default */])(
   form_item_Inputvue_type_script_lang_js,
-  Inputvue_type_template_id_2c97c8b9_scoped_true_render,
-  Inputvue_type_template_id_2c97c8b9_scoped_true_staticRenderFns,
+  Inputvue_type_template_id_3d4a1dbb_scoped_true_render,
+  Inputvue_type_template_id_3d4a1dbb_scoped_true_staticRenderFns,
   false,
   null,
-  "2c97c8b9",
+  "3d4a1dbb",
   null
   
 )
@@ -13966,8 +13967,8 @@ var Scope_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var Scope = (Scope_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Select.vue?vue&type=template&id=1acc82b6&scoped=true
-var Selectvue_type_template_id_1acc82b6_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Select.vue?vue&type=template&id=4e09744b&scoped=true
+var Selectvue_type_template_id_4e09744b_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14197,11 +14198,11 @@ var Selectvue_type_template_id_1acc82b6_scoped_true_render = function () {
     2
   )
 }
-var Selectvue_type_template_id_1acc82b6_scoped_true_staticRenderFns = []
-Selectvue_type_template_id_1acc82b6_scoped_true_render._withStripped = true
+var Selectvue_type_template_id_4e09744b_scoped_true_staticRenderFns = []
+Selectvue_type_template_id_4e09744b_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/frame/packages/form-item/Select.vue?vue&type=template&id=1acc82b6&scoped=true
+// CONCATENATED MODULE: ./src/frame/packages/form-item/Select.vue?vue&type=template&id=4e09744b&scoped=true
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Select.vue?vue&type=script&lang=js
 
@@ -14516,12 +14517,24 @@ Selectvue_type_template_id_1acc82b6_scoped_true_render._withStripped = true
       }
     },
     onChange: function onChange(v) {
-      // 查找label
-      var item = this.options.find(function (item) {
-        return item.code === v;
-      });
-      if (item) {
-        this.$set(this.data, this.attriName + '#', item.name);
+      var _this6 = this;
+      if (!v) {
+        this.$set(this.data, this.attriName + '#', '');
+      } else if (Array.isArray(v)) {
+        var name = v.map(function (vItem) {
+          var item = _this6.options.find(function (item) {
+            return item.code === vItem;
+          }) || {};
+          return item.name || vItem;
+        }).join(',');
+        this.$set(this.data, this.attriName + '#', name);
+      } else {
+        var item = this.options.find(function (item) {
+          return item.code === v;
+        });
+        if (item) {
+          this.$set(this.data, this.attriName + '#', item.name);
+        }
       }
     },
     confirm: function confirm(v) {
@@ -14530,7 +14543,7 @@ Selectvue_type_template_id_1acc82b6_scoped_true_render._withStripped = true
       this.showPicker = false;
     },
     excuteEvent: function excuteEvent(key) {
-      var _this6 = this;
+      var _this7 = this;
       for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
         args[_key - 1] = arguments[_key];
       }
@@ -14539,31 +14552,31 @@ Selectvue_type_template_id_1acc82b6_scoped_true_render._withStripped = true
       var _events$key = events[key],
         keyEvents = _events$key === void 0 ? [] : _events$key;
       keyEvents.map(function (event) {
-        return _this6.executeCustomJs.apply(_this6, [event].concat(args));
+        return _this7.executeCustomJs.apply(_this7, [event].concat(args));
       });
     }
   }
 });
 // CONCATENATED MODULE: ./src/frame/packages/form-item/Select.vue?vue&type=script&lang=js
  /* harmony default export */ var form_item_Selectvue_type_script_lang_js = (Selectvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Select.vue?vue&type=style&index=0&id=1acc82b6&prod&lang=scss&scoped=true
-var Selectvue_type_style_index_0_id_1acc82b6_prod_lang_scss_scoped_true = __webpack_require__(303);
+// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Select.vue?vue&type=style&index=0&id=4e09744b&prod&lang=scss&scoped=true
+var Selectvue_type_style_index_0_id_4e09744b_prod_lang_scss_scoped_true = __webpack_require__(303);
 
-// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Select.vue?vue&type=style&index=0&id=1acc82b6&prod&lang=scss&scoped=true
+// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/form-item/Select.vue?vue&type=style&index=0&id=4e09744b&prod&lang=scss&scoped=true
 
             
 
-var Selectvue_type_style_index_0_id_1acc82b6_prod_lang_scss_scoped_true_options = {};
+var Selectvue_type_style_index_0_id_4e09744b_prod_lang_scss_scoped_true_options = {};
 
-Selectvue_type_style_index_0_id_1acc82b6_prod_lang_scss_scoped_true_options.insert = "head";
-Selectvue_type_style_index_0_id_1acc82b6_prod_lang_scss_scoped_true_options.singleton = false;
+Selectvue_type_style_index_0_id_4e09744b_prod_lang_scss_scoped_true_options.insert = "head";
+Selectvue_type_style_index_0_id_4e09744b_prod_lang_scss_scoped_true_options.singleton = false;
 
-var Selectvue_type_style_index_0_id_1acc82b6_prod_lang_scss_scoped_true_update = injectStylesIntoStyleTag_default()(Selectvue_type_style_index_0_id_1acc82b6_prod_lang_scss_scoped_true["a" /* default */], Selectvue_type_style_index_0_id_1acc82b6_prod_lang_scss_scoped_true_options);
+var Selectvue_type_style_index_0_id_4e09744b_prod_lang_scss_scoped_true_update = injectStylesIntoStyleTag_default()(Selectvue_type_style_index_0_id_4e09744b_prod_lang_scss_scoped_true["a" /* default */], Selectvue_type_style_index_0_id_4e09744b_prod_lang_scss_scoped_true_options);
 
 
 
-/* harmony default export */ var form_item_Selectvue_type_style_index_0_id_1acc82b6_prod_lang_scss_scoped_true = (Selectvue_type_style_index_0_id_1acc82b6_prod_lang_scss_scoped_true["a" /* default */].locals || {});
-// CONCATENATED MODULE: ./src/frame/packages/form-item/Select.vue?vue&type=style&index=0&id=1acc82b6&prod&lang=scss&scoped=true
+/* harmony default export */ var form_item_Selectvue_type_style_index_0_id_4e09744b_prod_lang_scss_scoped_true = (Selectvue_type_style_index_0_id_4e09744b_prod_lang_scss_scoped_true["a" /* default */].locals || {});
+// CONCATENATED MODULE: ./src/frame/packages/form-item/Select.vue?vue&type=style&index=0&id=4e09744b&prod&lang=scss&scoped=true
 
 // CONCATENATED MODULE: ./src/frame/packages/form-item/Select.vue
 
@@ -14576,11 +14589,11 @@ var Selectvue_type_style_index_0_id_1acc82b6_prod_lang_scss_scoped_true_update =
 
 var Select_component = Object(componentNormalizer["a" /* default */])(
   form_item_Selectvue_type_script_lang_js,
-  Selectvue_type_template_id_1acc82b6_scoped_true_render,
-  Selectvue_type_template_id_1acc82b6_scoped_true_staticRenderFns,
+  Selectvue_type_template_id_4e09744b_scoped_true_render,
+  Selectvue_type_template_id_4e09744b_scoped_true_staticRenderFns,
   false,
   null,
-  "1acc82b6",
+  "4e09744b",
   null
   
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epx-frame",
-  "version": "4.0.8",
+  "version": "4.0.9",
   "private": false,
   "main": "./lib/epx-frame.common.js",
   "files": [