@panpanzhao/component-ui 0.0.10 → 0.0.12

package/lib/components/form-input.js

@@ -308,13 +308,13 @@ module.exports = require("element-ui/lib/checkbox-button");
 /* 46 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/switch");
+module.exports = require("element-ui/lib/cascader");
 
 /***/ }),
 /* 47 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/cascader");
+module.exports = require("element-ui/lib/switch");
 
 /***/ }),
 /* 48 */
@@ -586,8 +586,8 @@ var option_default = /*#__PURE__*/__webpack_require__.n(option_);
 var option_group_ = __webpack_require__(40);
 var option_group_default = /*#__PURE__*/__webpack_require__.n(option_group_);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/SelectTree.vue?vue&type=template&id=626a2185&
-var SelectTreevue_type_template_id_626a2185_render = function render() {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/SelectTree.vue?vue&type=template&id=b7fb5e4e&
+var SelectTreevue_type_template_id_b7fb5e4e_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -657,11 +657,11 @@ var SelectTreevue_type_template_id_626a2185_render = function render() {
     1
   )
 }
-var SelectTreevue_type_template_id_626a2185_staticRenderFns = []
-SelectTreevue_type_template_id_626a2185_render._withStripped = true
+var SelectTreevue_type_template_id_b7fb5e4e_staticRenderFns = []
+SelectTreevue_type_template_id_b7fb5e4e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/item/SelectTree.vue?vue&type=template&id=626a2185&
+// CONCATENATED MODULE: ./src/components/form/src/item/SelectTree.vue?vue&type=template&id=b7fb5e4e&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/SelectTree.vue?vue&type=script&lang=js&
 /* harmony default export */ var SelectTreevue_type_script_lang_js_ = ({
@@ -718,6 +718,17 @@ SelectTreevue_type_template_id_626a2185_render._withStripped = true
   },
 
   watch: {
+    value: function value(val) {
+      if (!val) {
+        if (this.$refs.tree) {
+          this.$refs.tree.setCurrentKey(null);
+          this.$refs.tree.setCheckedKeys([]);
+        }
+        this.selectedData = null;
+        return;
+      }
+      this.initData();
+    },
     options: {
       handler: function handler() {
         var _this = this;
@@ -830,9 +841,11 @@ SelectTreevue_type_template_id_626a2185_render._withStripped = true
     },
     emitChange: function emitChange() {
       if (this.multiple) {
+        this.$emit("input", this.checkedKeys, this.checkedData);
         this.$emit("change", this.checkedKeys, this.checkedData);
         return false;
       }
+      this.$emit("input", this.checkedData && this.checkedData[this.optionProps.value], this.checkedData);
       this.$emit("change", this.checkedData && this.checkedData[this.optionProps.value], this.checkedData);
     },
     setSingleData: function setSingleData(data) {
@@ -856,6 +869,11 @@ SelectTreevue_type_template_id_626a2185_render._withStripped = true
       if (this.multiple) {
         return false;
       }
+      if (data.disabled) {
+        this.$refs.tree.setCurrentKey(this.value || null);
+        console.warn("该节点数据disabled为true,不能选择");
+        return false;
+      }
       this.setSingleData(data);
       this.emitChange();
       this.$refs.select.handleClose();
@@ -897,8 +915,8 @@ SelectTreevue_type_template_id_626a2185_render._withStripped = true
 
 var SelectTree_component = Object(componentNormalizer["a" /* default */])(
   item_SelectTreevue_type_script_lang_js_,
-  SelectTreevue_type_template_id_626a2185_render,
-  SelectTreevue_type_template_id_626a2185_staticRenderFns,
+  SelectTreevue_type_template_id_b7fb5e4e_render,
+  SelectTreevue_type_template_id_b7fb5e4e_staticRenderFns,
   false,
   null,
   null,
@@ -932,16 +950,18 @@ var formula_ = __webpack_require__(3);
   },
   props: {
     selectMode: String,
+    dictCode: String,
     options: {
       type: Array,
       default: function _default() {
         return null;
       }
     },
+    optionRender: Function,
     api: {
       type: Object,
       default: function _default() {
-        return null;
+        return {};
       }
     },
     apiOpen: {
@@ -953,11 +973,7 @@ var formula_ = __webpack_require__(3);
     optionProps: {
       type: Object,
       default: function _default() {
-        return {
-          value: "value",
-          label: "label",
-          children: "children"
-        };
+        return {};
       }
     }
   },
@@ -970,8 +986,15 @@ var formula_ = __webpack_require__(3);
     attrs: function attrs() {
       return Object.assign({}, this.$attrs);
     },
+    dictOption: function dictOption() {
+      if (this.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
+        return this.$COMPONENT.dataSource.dict[this.dictCode];
+      }
+      return [];
+    },
     optionData: function optionData() {
-      return this.options || this.apiOptions || [];
+      var options = this.options || this.apiOptions;
+      return Array.isArray(options) ? options : this.dictOption;
     },
     _form: function _form() {
       var parent = this.$parent;
@@ -984,6 +1007,13 @@ var formula_ = __webpack_require__(3);
       }
       return false;
     },
+    _optionProps: function _optionProps() {
+      return Object.assign({
+        value: "value",
+        label: "label",
+        children: "children"
+      }, this.optionProps);
+    },
     request: function request() {
       return this.api.request || this._form && this._form.request || (this.$COMPONENT || {}).request;
     }
@@ -1003,26 +1033,36 @@ var formula_ = __webpack_require__(3);
   },
   methods: {
     transformOption: function transformOption(item) {
-      item.value = item[this.optionProps.value];
-      item.label = item[this.optionProps.label];
-      if (item[this.optionProps.children]) {
-        item.children = this.transformOption(item[this.optionProps.children]);
+      item.value = item[this._optionProps.value];
+      item.label = item[this._optionProps.label];
+      if (item[this._optionProps.children]) {
+        item.children = this.transformOption(item[this._optionProps.children]);
       }
       return item;
     },
     initApi: function initApi() {
       var _this = this;
-      if (!(this.api && this.request)) {
+      if (!(this.api.url && this.request)) {
         return false;
       }
+      var reqData = Object(external_lodash_["merge"])({}, this.api.data);
+      if (typeof this.api.before === "function") {
+        reqData = this.api.before.call(this, reqData, {
+          form: this._form,
+          formModel: this._form && this._form.formModel
+        });
+      }
       this.request({
-        url: Object(formula_["evaluate"])(this.api.url, this.api.data),
+        url: Object(formula_["evaluate"])(this.api.url, reqData),
         method: this.api.method || "GET",
-        data: this.api.data
+        headers: this.api.headers,
+        data: reqData
       }).then(function (res) {
-        if (typeof _this.api.transform === "function") {
-          _this.apiOptions = _this.api.transform.call(_this, resData);
-          return false;
+        if (typeof _this.api.after === "function") {
+          res = _this.api.after.call(_this, res, {
+            form: _this._form,
+            formModel: _this._form && _this._form.formModel
+          });
         }
         _this.apiOptions = _this.api.dataPath ? Object(external_lodash_["get"])(res, _this.api.dataPath, []) : res;
       }).catch(function (error) {
@@ -1033,19 +1073,22 @@ var formula_ = __webpack_require__(3);
       var _this2 = this;
       return this.optionData.map(function (item) {
         return h("el-option-group", {
-          "key": item[_this2.optionProps.value],
+          "key": item[_this2._optionProps.value],
           "attrs": {
-            "label": item[_this2.optionProps.label]
+            "label": item[_this2._optionProps.label]
           }
-        }, [item[_this2.optionProps.children] && item[_this2.optionProps.children].map(function (itemOpt) {
+        }, [item[_this2._optionProps.children] && item[_this2._optionProps.children].map(function (itemOpt) {
           return h("el-option", {
-            "key": itemOpt[_this2.optionProps.value],
+            "key": itemOpt[_this2._optionProps.value],
             "attrs": {
-              "value": itemOpt[_this2.optionProps.value],
-              "label": itemOpt[_this2.optionProps.label],
+              "value": itemOpt[_this2._optionProps.value],
+              "label": itemOpt[_this2._optionProps.label],
               "disabled": itemOpt.disabled
             }
-          });
+          }, [_this2.optionRender ? _this2.optionRender.call(_this2, h, itemOpt, {
+            form: _this2._form,
+            formModel: _this2._form && _this2._form.formModel
+          }) : null]);
         })]);
       });
     },
@@ -1053,7 +1096,7 @@ var formula_ = __webpack_require__(3);
       var param = {
         attrs: Object.assign({}, this.$attrs, {
           options: this.optionData,
-          optionProps: this.optionProps
+          optionProps: this._optionProps
         }),
         slots: this.$slots,
         scopedSlots: this.$slots,
@@ -1066,14 +1109,17 @@ var formula_ = __webpack_require__(3);
       if (this.selectMode === "group") {
         return this.renderGroup(h, scoped);
       }
-      return this.optionData.map(function (item) {
+      return this.optionData.map(function (itemOpt) {
         return h("el-option", {
-          "key": item[_this3.optionProps.value],
+          "key": itemOpt[_this3._optionProps.value],
           "attrs": {
-            "value": item[_this3.optionProps.value],
-            "label": item[_this3.optionProps.label]
+            "value": itemOpt[_this3._optionProps.value],
+            "label": itemOpt[_this3._optionProps.label]
           }
-        });
+        }, [_this3.optionRender ? _this3.optionRender.call(_this3, h, itemOpt, {
+          form: _this3._form,
+          formModel: _this3._form && _this3._form.formModel
+        }) : null]);
       });
     }
   },
@@ -1148,6 +1194,7 @@ var radio_button_default = /*#__PURE__*/__webpack_require__.n(radio_button_);
   },
   props: {
     size: String,
+    dictCode: String,
     border: {
       type: Boolean,
       default: function _default() {
@@ -1196,8 +1243,14 @@ var radio_button_default = /*#__PURE__*/__webpack_require__.n(radio_button_);
         border: this.border
       });
     },
+    dictOption: function dictOption() {
+      if (this.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
+        return this.$COMPONENT.dataSource.dict[this.dictCode];
+      }
+      return [];
+    },
     optionData: function optionData() {
-      return this.options || this.apiOptions || [];
+      return this.options || this.apiOptions || this.dictOption;
     },
     _form: function _form() {
       var parent = this.$parent;
@@ -1343,6 +1396,7 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
   },
   props: {
     size: String,
+    dictCode: String,
     border: {
       type: Boolean,
       default: function _default() {
@@ -1371,11 +1425,7 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
     optionProps: {
       type: Object,
       default: function _default() {
-        return {
-          value: "value",
-          label: "label",
-          name: "name"
-        };
+        return {};
       }
     }
   },
@@ -1391,8 +1441,14 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
         border: this.border
       });
     },
+    dictOption: function dictOption() {
+      if (this.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
+        return this.$COMPONENT.dataSource.dict[this.dictCode];
+      }
+      return [];
+    },
     optionData: function optionData() {
-      return this.options || this.apiOptions || [];
+      return this.options || this.apiOptions || this.dictOption;
     },
     _form: function _form() {
       var parent = this.$parent;
@@ -1405,6 +1461,13 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
       }
       return false;
     },
+    _optionProps: function _optionProps() {
+      return Object.assign({
+        value: "value",
+        label: "label",
+        children: "children"
+      }, this.optionProps);
+    },
     request: function request() {
       return this.api.request || this._form && this._form.request || (this.$COMPONENT || {}).request;
     }
@@ -1446,12 +1509,12 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
       var _this2 = this;
       return this.optionData.map(function (item) {
         return h("el-checkbox-button", {
-          "key": item[_this2.optionProps.value],
+          "key": item[_this2._optionProps.value],
           "attrs": {
-            "label": item[_this2.optionProps.value],
-            "disabled": item[_this2.optionProps.disabled]
+            "label": item[_this2._optionProps.value],
+            "disabled": item[_this2._optionProps.disabled]
           }
-        }, [item[_this2.optionProps.label]]);
+        }, [item[_this2._optionProps.label]]);
       });
     },
     renderOptions: function renderOptions(h, scoped) {
@@ -1461,15 +1524,15 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
       }
       return this.optionData.map(function (item) {
         return h("el-checkbox", {
-          "key": item[_this3.optionProps.value],
+          "key": item[_this3._optionProps.value],
           "attrs": {
-            "value": item[_this3.optionProps.value],
-            "label": item[_this3.optionProps.value],
-            "disabled": item[_this3.optionProps.disabled],
+            "value": item[_this3._optionProps.value],
+            "label": item[_this3._optionProps.value],
+            "disabled": item[_this3._optionProps.disabled],
             "border": _this3.border,
             "size": _this3.size
           }
-        }, [item[_this3.optionProps.label]]);
+        }, [item[_this3._optionProps.label]]);
       });
     }
   },
@@ -1565,14 +1628,81 @@ var InputText_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var InputText = (InputText_component.exports);
-// EXTERNAL MODULE: external "element-ui/lib/switch"
-var switch_ = __webpack_require__(46);
-var switch_default = /*#__PURE__*/__webpack_require__.n(switch_);
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/Cascader.vue?vue&type=template&id=1306b5bf&
+var Cascadervue_type_template_id_1306b5bf_render = function render() {
+  var _vm = this,
+    _c = _vm._self._c
+  return _c(
+    "el-cascader",
+    _vm._g(
+      _vm._b(
+        { attrs: { options: _vm.options } },
+        "el-cascader",
+        _vm.attrs,
+        false
+      ),
+      _vm.$listeners
+    )
+  )
+}
+var Cascadervue_type_template_id_1306b5bf_staticRenderFns = []
+Cascadervue_type_template_id_1306b5bf_render._withStripped = true
+
+
+// CONCATENATED MODULE: ./src/components/form/src/item/Cascader.vue?vue&type=template&id=1306b5bf&
 
 // EXTERNAL MODULE: external "element-ui/lib/cascader"
-var cascader_ = __webpack_require__(47);
+var cascader_ = __webpack_require__(46);
 var cascader_default = /*#__PURE__*/__webpack_require__.n(cascader_);
 
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/Cascader.vue?vue&type=script&lang=js&
+
+/* harmony default export */ var Cascadervue_type_script_lang_js_ = ({
+  name: "Cascader",
+  components: {
+    elCascader: cascader_default.a
+  },
+  props: {
+    size: String,
+    options: {
+      type: Array,
+      default: function _default() {
+        return null;
+      }
+    }
+  },
+  computed: {
+    attrs: function attrs() {
+      return Object.assign({}, this.$attrs);
+    }
+  }
+});
+// CONCATENATED MODULE: ./src/components/form/src/item/Cascader.vue?vue&type=script&lang=js&
+ /* harmony default export */ var item_Cascadervue_type_script_lang_js_ = (Cascadervue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./src/components/form/src/item/Cascader.vue
+
+
+
+
+
+/* normalize component */
+
+var Cascader_component = Object(componentNormalizer["a" /* default */])(
+  item_Cascadervue_type_script_lang_js_,
+  Cascadervue_type_template_id_1306b5bf_render,
+  Cascadervue_type_template_id_1306b5bf_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var Cascader = (Cascader_component.exports);
+// EXTERNAL MODULE: external "element-ui/lib/switch"
+var switch_ = __webpack_require__(47);
+var switch_default = /*#__PURE__*/__webpack_require__.n(switch_);
+
 // EXTERNAL MODULE: external "element-ui/lib/slider"
 var slider_ = __webpack_require__(48);
 var slider_default = /*#__PURE__*/__webpack_require__.n(slider_);
@@ -1604,6 +1734,7 @@ var upload_default = /*#__PURE__*/__webpack_require__.n(upload_);
 
 
 
+// import elCascader from "element-ui/packages/cascader";
 
 
 
@@ -1613,7 +1744,7 @@ var upload_default = /*#__PURE__*/__webpack_require__.n(upload_);
   name: "FormInput",
   inheritAttrs: false,
   components: {
-    Cascader: cascader_default.a,
+    Cascader: Cascader,
     Slider: slider_default.a,
     Transfer: transfer_default.a,
     Switchs: switch_default.a,

package/lib/components/form-item.js

@@ -167,7 +167,11 @@ var external_lodash_ = __webpack_require__(2);
   watch: {
     value: function value(val) {
       //监听form的formModel变化,处理config的value变化
-      this.config.value = val;
+      if (this.config.value === val) {
+        return false;
+      }
+      this.setValue(val);
+      this.execEvent("input", val);
       if (this.form && this.form.formModel) {
         this.$emit("formItemChange", {
           itemConfig: this.config,
@@ -227,8 +231,9 @@ var external_lodash_ = __webpack_require__(2);
       if (this.on && this.on[eventName]) {
         this.$emit.apply(this, [eventName, {
           trigger: this.form,
+          triggerConfig: this.form.formItemLayout[this.prop],
           triggerForm: this.form.formModel,
-          triggerConfig: this.form.formItemLayout[this.prop]
+          triggerFormConfig: this.form.formItemLayout
         }].concat(arg));
       }
       //联动配置事件
@@ -250,6 +255,16 @@ var external_lodash_ = __webpack_require__(2);
         triggerConfig: this.form.formItemLayout[this.prop],
         targetConfig: targetConfig
       }].concat(arg));
+    },
+    setValue: function setValue(val) {
+      if (this.form) {
+        if (this.prop && this.prop.indexOf(".") != -1) {
+          Object(external_lodash_["set"])(this.form.formModel, this.prop, val);
+        } else {
+          this.form.formModel[this.prop] = val;
+        }
+      }
+      this.config.value = val;
     }
   },
   render: function render(h) {
@@ -261,30 +276,27 @@ var external_lodash_ = __webpack_require__(2);
         config: this.config
       });
     }
+    // disabled用的多，特殊处理下支持函数
+    var disabled = this.config.disabled;
+    if (typeof this.config.disabled === "function") {
+      disabled = this.config.disabled.call(this, {
+        form: this.form,
+        formModel: this.form.formModel,
+        config: this.config
+      });
+    }
     var itemProp = {
-      attrs: Object.assign({}, this.config),
+      attrs: Object.assign({}, this.config, {
+        disabled: disabled
+      }),
       on: Object.assign({}, this.eventOn, this.actionEventOn, {
         input: function input(val) {
+          _this2.setValue(val);
           _this2.execEvent("input", val);
-          if (_this2.form) {
-            if (_this2.prop && _this2.prop.indexOf(".") != -1) {
-              Object(external_lodash_["set"])(_this2.form.formModel, _this2.prop, val);
-            } else {
-              _this2.form.formModel[_this2.prop] = val;
-            }
-          }
-          _this2.config.value = val;
         },
         change: function change(val, selectOption) {
+          _this2.setValue(val);
           _this2.execEvent("change", val, selectOption);
-          if (_this2.form) {
-            if (_this2.prop && _this2.prop.indexOf(".") != -1) {
-              Object(external_lodash_["set"])(_this2.form.formModel, _this2.prop, val);
-            } else {
-              _this2.form.formModel[_this2.prop] = val;
-            }
-          }
-          _this2.config.value = val;
         }
       })
     };

package/lib/components/form.js

@@ -210,7 +210,7 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/form.vue?vue&type=template&id=26d7095f&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/form.vue?vue&type=template&id=dfeb985e&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -281,7 +281,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=26d7095f&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=dfeb985e&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -414,6 +414,9 @@ var external_lodash_ = __webpack_require__(2);
     var _this2 = this;
     this.formItems.forEach(function (item) {
       _this2.formItemLayout[item.prop] = item;
+      if (typeof item.value === "function") {
+        item.value = item.value.call(_this2);
+      }
       _this2.defaultModel[item.prop] = item.value;
       //初始化值处理
       var formVal = Object(external_lodash_["get"])(_this2.formModel, item.prop);

package/lib/components/table-column.js

@@ -942,8 +942,8 @@ var date_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var date = (date_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/dict.vue?vue&type=template&id=1da75cb2&
-var dictvue_type_template_id_1da75cb2_render = function render() {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/dict.vue?vue&type=template&id=512d00c0&
+var dictvue_type_template_id_512d00c0_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -981,11 +981,11 @@ var dictvue_type_template_id_1da75cb2_render = function render() {
     )
   )
 }
-var dictvue_type_template_id_1da75cb2_staticRenderFns = []
-dictvue_type_template_id_1da75cb2_render._withStripped = true
+var dictvue_type_template_id_512d00c0_staticRenderFns = []
+dictvue_type_template_id_512d00c0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table/src/column/dict.vue?vue&type=template&id=1da75cb2&
+// CONCATENATED MODULE: ./src/components/table/src/column/dict.vue?vue&type=template&id=512d00c0&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/dict.vue?vue&type=script&lang=js&
 
@@ -995,6 +995,7 @@ dictvue_type_template_id_1da75cb2_render._withStripped = true
     elTableColumn: table_column_default.a
   },
   props: {
+    dictCode: String,
     options: {
       type: Array,
       required: true
@@ -1018,11 +1019,18 @@ dictvue_type_template_id_1da75cb2_render._withStripped = true
         "show-overflow-tooltip": true
       }, this.$attrs);
     },
+    dictOption: function dictOption() {
+      if (this.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
+        return this.$COMPONENT.dataSource.dict[this.dictCode];
+      }
+      return [];
+    },
     optionMap: function optionMap() {
       var _this = this;
-      if (Array.isArray(this.options)) {
+      var options = this.options || this.dictOption;
+      if (Array.isArray(options)) {
         var map = {};
-        this.options.forEach(function (item) {
+        options.forEach(function (item) {
           var valueKey = item[_this.optionProp.value || "value"];
           map[valueKey] = item;
         });
@@ -1056,8 +1064,8 @@ dictvue_type_template_id_1da75cb2_render._withStripped = true
 
 var dict_component = Object(componentNormalizer["a" /* default */])(
   column_dictvue_type_script_lang_js_,
-  dictvue_type_template_id_1da75cb2_render,
-  dictvue_type_template_id_1da75cb2_staticRenderFns,
+  dictvue_type_template_id_512d00c0_render,
+  dictvue_type_template_id_512d00c0_staticRenderFns,
   false,
   null,
   null,
@@ -1128,7 +1136,7 @@ var external_lodash_ = __webpack_require__(2);
   computed: {
     attrs: function attrs() {
       return Object.assign({
-        "show-overflow-tooltip": true
+        "show-overflow-tooltip": false
       }, this.$attrs, this.$props);
     },
     defaultItem: function defaultItem() {
@@ -1177,9 +1185,7 @@ var external_lodash_ = __webpack_require__(2);
       return template;
     },
     itemVNode: function itemVNode(h, itemRow, scoped) {
-      var cloneItem = Object.assign({
-        control: this.defaultItem.control
-      }, itemRow);
+      var cloneItem = Object(external_lodash_["merge"])({}, this.defaultItem, itemRow);
       cloneItem.parentData = scoped;
       if (typeof cloneItem.render === "function") {
         return cloneItem.render.call(this, h, scoped, cloneItem);