kz-ui-base 1.0.58 → 1.0.60

package/common/src/components/base/dialog/editDialog.vue

@@ -48,12 +48,12 @@
 <script>
 import { addEntity, updateEntity } from "../../../api/common/common";
 
-// import FormColumns from "@components/customForm/formColumns";
+import FormColumns from "@srcComponents/customForm/formColumns";
 
 export default {
   name: "EditDialog",
   components: {
-    // FormColumns,
+    FormColumns,
   },
   props: {
     //微服务模块名称

package/components/customForm/dropDownList.vue

@@ -69,6 +69,38 @@
       placeholder="请选择"
     />
   </el-form-item>
+
+  <el-form-item
+    v-else-if="setting.inputDropdown"
+    class="selectwidth"
+    :label="column.text"
+    :prop="column.property"
+  >
+    <el-popover
+      v-model="visible"
+      trigger="click"
+      popper-class="select-input"
+      placement="bottom"
+      width="400"
+    >
+      <div class="container">
+        <div
+          class="item"
+          v-for="(item, index) in items"
+          :key="index"
+          @click="chooseItem(item)"
+        >
+          {{ item.text }}
+        </div>
+      </div>
+      <el-input
+        slot="reference"
+        v-model="input"
+        placeholder="请输入内容"
+        @input="inputChange"
+      ></el-input>
+    </el-popover>
+  </el-form-item>
   <el-form-item
     v-else
     class="selectwidth"
@@ -122,7 +154,7 @@ import {
   Emit,
   Mixins,
 } from "vue-property-decorator";
-import { listEntity, ajaxUrl } from "kz-ui-base/common/src/api/common/common";
+import { listEntity, ajaxUrl } from "../../../../common/src/api/common/common";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {
@@ -169,6 +201,8 @@ export default class dropDownList extends Vue {
   private remote = false;
   private formatKeyValue = false;
   private itemList = [];
+  input = "";
+  visible = false;
   //查询返回的数组
   objList = [];
   // 列表查询参数
@@ -256,6 +290,9 @@ export default class dropDownList extends Vue {
     if (this.setting.parameter) {
       this.queryParams = { ...this.queryParams, ...this.setting.parameter };
     }
+    if (this.setting.inputDropdown) {
+      this.input = this.entity[this.column.property];
+    }
     if (this.setting.searchRules) {
       this.hasDependence = false;
       for (var rule of this.setting.searchRules) {
@@ -833,5 +870,49 @@ export default class dropDownList extends Vue {
       children: node.children,
     };
   }
+  chooseItem(item) {
+    this.input = item.text;
+    this.visible = false;
+    this.entity[this.column.property] = item.value;
+    this.$emit("change", {
+      property: this.column.property,
+      value: item.value,
+      data: this.entity,
+      column: this.column,
+    });
+    // this.$emit('update:inputValue', item[this.selectObj.value])
+  }
+  inputChange() {
+    this.visible = false;
+    this.entity[this.column.property] = this.input;
+    this.$emit("change", {
+      property: this.column.property,
+      value: this.input,
+      data: this.entity,
+      column: this.column,
+    });
+  }
 }
 </script>
+<style lang="scss" scoped>
+.container {
+  margin-top: 12px;
+  overflow: auto;
+  min-width: 192.5px;
+  max-height: 500px;
+}
+.item {
+  cursor: pointer;
+  padding: 0 20px;
+  height: 34px;
+  line-height: 34px;
+  &:hover {
+    background: #f5f7fa;
+  }
+}
+</style>
+<style>
+.select-input {
+  padding: 6px 0 !important;
+}
+</style>

package/list-base-page/listBasePageTs.vue

@@ -1045,8 +1045,39 @@ import WfDialog from "@/components/base/dialog/wfDialog.vue";
 
 import { getToken } from "@utils/auth";
 import _ from "lodash";
+import KZ_DropDownList from "@srcComponents/customForm/dropDownList.vue";
+import KZ_TextBox from "@srcComponents/customForm/textBox.vue";
+import EditDialog from "@components/base/dialog/editDialog.vue";
+import KZ_CheckBox from "@srcComponents/customForm/checkBox.vue";
+import KZ_DatePicker from "@srcComponents/customForm/datePicker.vue";
+import KZ_Switch from "@srcComponents/customForm/switch.vue";
+import KZ_UploadButton from "@srcComponents/customForm/uploadButton.vue";
+import KZ_TextArea from "@srcComponents/customForm/textarea.vue";
+import KZ_Cascader from "@srcComponents/customForm/cascader.vue";
+import KZ_Radio from "@srcComponents/customForm/radio.vue";
+import UploadDialog from "@srcComponents/customForm/uploadDialog.vue";
+import PrintDialog from "@srcComponents/customForm/printDialog.vue";
+import KZ_Lookup from "@srcComponents/customForm/lookup.vue";
 @Component({
-  components: {},
+  components: {
+    // TableDialog,
+    // Treeselect,
+    EditDialog,
+    UploadDialog,
+    PrintDialog,
+    KZ_DropDownList,
+    KZ_TextBox,
+    KZ_Cascader,
+    KZ_CheckBox,
+    // KZ_ColorPicker,
+    KZ_DatePicker,
+    KZ_Switch,
+    // KZ_Upload,
+    KZ_TextArea,
+    KZ_UploadButton,
+    KZ_Radio,
+    KZ_Lookup,
+  },
 })
 export default class listBasePage extends Vue {
   @Prop()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kz-ui-base",
-  "version": "1.0.58",
+  "version": "1.0.60",
   "description": "",
   "main": "index.js",
   "scripts": {