cnhis-design-vue 0.2.65-beta → 0.2.68-beta

package/packages/big-table/src/components/edit-form/edit-component/config-data/index.js

@@ -20,7 +20,8 @@ const configData = {
     editDatePicker: "editDatePicker", // 旧版兼容字段
     editSelect: "editSelect",
     editInputPassword: "editInputPassword",
-    editSelectMultiple: "editSelectMultiple"
+    editSelectMultiple: "editSelectMultiple",
+    SWITCH_COMPONENT: 'editSwitch'
   },
   getComName(v = {}) {
     const { isMonthPicker_com, isDate_com, isTimePicker_com, isSelect_com, isPassword_com } = this;

package/packages/big-table/src/components/edit-form/edit-component/edit-search/edit-search.vue

@@ -5,7 +5,7 @@
       :ref="'search-' + item.val_key"
       :dropdownMatchSelectWidth="(item.elem_width || 6) > 11"
       class="formItem-select editItem-search"
-      :placeholder="item.placeholder || $t('1.1.6.12')"
+      :placeholder="item.placeholder || '请输入关键字'"
       :autoFocus="false"
       :defaultActiveFirstOption="true"
       :allowClear="item.is_empty == 0"
@@ -17,14 +17,13 @@
       @select="handleSearchSelect($event, item, 'select')"
       @change="handleSearchSelect($event, item)"
       :dropdownClassName="selectIsOpen ? 'form-default-select' : 'hide-select-drop'"
-      :notFoundContent="fetching ? undefined : $t('1.1.6.11')"
+      :notFoundContent="fetching ? undefined : '暂无数据'"
       :dropdownStyle="{
         maxWidth: optionsMaxWidth
       }"
       optionLabelProp="label"
     >
       <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-      <!-- :placeholder="item.placeholder || $t('1.1.6.12')" -->
       <a-select-option
         v-for="(v, k) in curOptions"
         :key="k"

package/packages/big-table/src/components/edit-form/edit-component/edit-search-more/edit-search-more.vue

@@ -11,7 +11,7 @@
     mode="multiple"
     labelInValue
     :allowClear="item.is_empty == 0"
-    :placeholder="item.placeholder || $t('1.1.6.12')"
+    :placeholder="item.placeholder || '请输入关键字'"
     :filterOption="false"
     :showSearch="selectIsOpen"
     :maxTagTextLength="10"
@@ -20,7 +20,7 @@
     @select="multipleSelect($event, item)"
     @deselect="multipleDeselect($event, item)"
     @change="searchMoreOnChange($event, item)"
-    :notFoundContent="fetching ? undefined : $t('1.1.6.11')"
+    :notFoundContent="fetching ? undefined : '暂无数据'"
     :dropdownStyle="{
       maxWidth: optionsMaxWidth
     }"

package/packages/big-table/src/components/edit-form/edit-component/edit-select/edit-select.vue

@@ -8,7 +8,7 @@
     :allowClear="item.is_empty == 0"
     :disabled="item.is_edit == 0"
     :dropdownMatchSelectWidth="true"
-    :placeholder="item.placeholder || `${$t('1.1.6.7')}${item.name}` || ''"
+    :placeholder="item.placeholder || `请选择${item.name}` || ''"
     @dropdownVisibleChange="dropdownVisibleChange"
   >
     <a-select-option v-for="(v, y) in item.option" :key="(y + 9).toString(36) + y" :value="v.value">{{ v.text }}</a-select-option>

package/packages/big-table/src/components/edit-form/edit-component/edit-select-multiple/edit-select-multiple.vue

@@ -10,7 +10,7 @@
     :allowClear="item.is_empty == 0"
     :disabled="item.is_edit == 0"
     :dropdownMatchSelectWidth="true"
-    :placeholder="item.placeholder || `${$t('1.1.6.7')}${item.name}` || ''"
+    :placeholder="item.placeholder || `请选择${item.name}` || ''"
     @dropdownVisibleChange="dropdownVisibleChange"
     :filterOption="$utils.filterOption"
   >

package/packages/big-table/src/components/edit-form/edit-component/edit-switch/edit-switch.vue

@@ -0,0 +1,43 @@
+<template>
+  <a-checkbox
+    :ref="`switch-${item.val_key}`"
+    :checked="item.useFormValue"
+    :disabled="item.is_edit == 0"
+    :placeholder="item.placeholder || ''"
+    @change="onChange"
+  >
+  </a-checkbox>
+</template>
+<script>
+export default {
+  name: "editSwitch",
+  components: {},
+  inject: {
+    /** baseForm */
+    mainForm: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  props: {
+    item: Object
+  },
+  data() {
+    return {};
+  },
+
+  computed: {},
+  watch: {},
+  // 生命周期
+  created() {},
+  mounted() {},
+
+  // 方法
+  methods: {
+    onChange(e) {
+      this.item.useFormValue = e.target.checked;
+    }
+  }
+};
+</script>
+<style lang="less" scoped></style>

package/packages/big-table/src/components/edit-form/edit-component/mixins/dateType.js

@@ -1,3 +1,4 @@
+import vexutils from '@/utils/vexutils';
 export default {
   methods: {
     // 日期组件支持相互约束配置
@@ -47,12 +48,12 @@ export default {
     disabledTimePicker(current, item) {
       if (!item.validate) return;
       if (item.date_format === "YYYY-MM-dd HH:mm:ss") {
-        if (this.$utils.isEmpty(item.validate.timeRange) || !item.validate.isSpliceHour) {
+        if (vexutils.isEmpty(item.validate.timeRange) || !item.validate.isSpliceHour) {
           this.disabledMethodTimeRange(item);
         }
       }
       const { timeRange = {} } = item.validate;
-      if (!this.$utils.isEmpty(timeRange)) {
+      if (!vexutils.isEmpty(timeRange)) {
         const { hArr = [], mArr = [], sArr = [] } = timeRange;
         let hRange = this.range(hArr[0], hArr[1]);
         if (item.date_format === "YYYY-MM-dd HH:mm:ss") {
@@ -92,11 +93,11 @@ export default {
     // 时间选择器 约束
     disabledHours(item, type) {
       if (!item.validate) return;
-      if (this.$utils.isEmpty(item.validate.timeRange) || !item.validate.isSpliceHour) {
+      if (vexutils.isEmpty(item.validate.timeRange) || !item.validate.isSpliceHour) {
         this.disabledMethodTimeRange(item);
       }
       const { timeRange = {} } = item.validate;
-      if (!this.$utils.isEmpty(timeRange)) {
+      if (!vexutils.isEmpty(timeRange)) {
         const { hArr = [], mArr = [], sArr = [] } = timeRange;
         let hRange = this.range(hArr[0], hArr[1]);
         if (item.validate.min_date && item.validate.max_date) {

package/packages/big-table/src/components/edit-form/edit-component/mixins/item-default.js

@@ -5,10 +5,34 @@ import globalProps from '../../edit-item/global-props';
 import validateRules from '../../edit-item/validate-rules';
 import formUtils from '../../edit-utils/index';
 import boundDate from '../mixins/bound-date';
+
+import {
+  Icon,
+  Checkbox,
+  Tooltip,
+  Input,
+  FormModel,
+  Divider,
+  Button,
+  Select
+} from "ant-design-vue";
+
+
 // import { mapGetters } from 'vuex';
 export default {
   mixins: [formCommom, formEvent, renderMethods, globalProps, validateRules, boundDate],
-  components: {},
+  components: {
+    [Icon.name]: Icon,
+    [Input.name]: Input,
+    [Input.Search.name]: Input.Search,
+    [Checkbox.name]: Checkbox,
+    [Divider.name]: Divider,
+    [Button.name]: Button,
+    [FormModel.name]: FormModel,
+    [FormModel.Item.name]: FormModel.Item,
+    [Tooltip.name]: Tooltip,
+    [Select.name]: Select,
+  },
   data() {
     return {};
   },
@@ -109,8 +133,9 @@ export default {
     },
     styleSetting: {
       type: Object,
-      default: () => {}
-    }
+      default: () => { }
+    },
+    editFormApiConfig: Object // 编辑表格api
   },
   beforeCreate() {
     // this.formFieldListCopy = [];
@@ -128,6 +153,27 @@ export default {
     }
   },
   methods: {
+    /**
+    * 获取配置的 api 方法
+    * @param {*} params  调用参数
+    * @param {String} key 方法名
+    * @param {Object} config 其他配置
+    */
+    async handleGetConfigApi(params, key, config = {}) {
+      try {
+        // TODO: 判断 fn 是异步函数还是同步
+        const editFormApiConfig = this?.editFormApiConfig || {};
+        const fn = editFormApiConfig[key] || null;
+        if (typeof fn === 'function') {
+          let res = await fn(params, config);
+          return Promise.resolve(res);
+        } else {
+          return Promise.reject(new Error(`${key} Is not a function`));
+        }
+      } catch (error) {
+        return Promise.reject(error);
+      }
+    },
     defaultInit() {
       // this.formFieldListCopy = JSON.parse(JSON.stringify(this.formFieldList));
       const { validate = {}, name, default_val } = this.item;
@@ -295,7 +341,7 @@ export default {
                 value: idCarNo,
                 errors: [
                   {
-                    message: this.$t('1.1.7.32')
+                    message: '请输入正确的身份证号码'
                   }
                 ]
               }
@@ -458,7 +504,6 @@ export default {
       const selectedReg = /(^[0-9]{11,11}$)/;
       if (!checkingInput) return { status: 'noPass' };
       if (!selectedReg.test(checkingInput)) {
-        // this.$t("1.1.7.29")
         this.baseForm.setFields({
           [item.val_key]: {
             value: checkingInput,