cnhis-design-vue 3.1.9-beta.5 → 3.1.9-beta.6

package/es/packages/form-render/src/components/select.mjs

@@ -1 +1,136 @@
-export { SELECT } from './select2.mjs';
+import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
+import { cloneDeep } from 'lodash-es';
+import { InjectAsyncQueue, InjectionFormItemDepsCollector, InjectionChangeContextCollector } from '../constants/index.mjs';
+import { assignUpdateValue, formRenderLog, generateUrlParams } from '../utils/index.mjs';
+import { isObject } from '@vueuse/core';
+import { connect, mapProps } from '@formily/vue';
+import { NSelect } from 'naive-ui';
+import { useFormField } from '../hooks/useFormField.mjs';
+
+const script = defineComponent({
+  name: "FormSelect",
+  props: {
+    value: {
+      type: String
+    },
+    options: {
+      type: Array,
+      default: () => []
+    },
+    urlConfig: {
+      type: Object
+    },
+    onChange: {
+      type: Function
+    }
+  },
+  emits: ["update:value"],
+  setup(props, {
+    slots,
+    emit
+  }) {
+    const _options = ref(null);
+    let cachedOptions = null;
+    let lastSearch = ref("");
+    const asyncQueue = inject(InjectAsyncQueue);
+    const {
+      title,
+      field,
+      fieldKey
+    } = useFormField();
+    function filterOption(options, searchContent) {
+      return options.filter((option) => {
+        return !searchContent || String(option[labelKey.value]).includes(searchContent);
+      });
+    }
+    async function fetchData(content) {
+      if (content === lastSearch.value) {
+        if (cachedOptions)
+          return;
+      } else {
+        lastSearch.value = content || "";
+      }
+      const config = props.urlConfig;
+      if (!config) {
+        return cachedOptions = _options.value = null;
+      }
+      if (!isObject(config)) {
+        formRenderLog(`invalid urlConfig (${config}) in SELECT => ${title.value}`, "warn");
+        return cachedOptions = _options.value = null;
+      }
+      if (cachedOptions) {
+        return _options.value = filterOption(cachedOptions, content);
+      }
+      try {
+        const data = await asyncQueue.addAsync({
+          ...config,
+          key: title.value,
+          params: Object.assign({}, config.params, generateUrlParams(field.value, config.dependKey))
+        });
+        _options.value = data.reduce((res, d) => {
+          var _a;
+          if (((_a = d[labelKey.value]) == null ? void 0 : _a.includes(content)) || !content) {
+            res.push(d);
+          }
+          return res;
+        }, []);
+        cachedOptions = _options.value;
+      } catch (e) {
+        _options.value = null;
+      }
+    }
+    const renderOptions = computed(() => {
+      if (_options.value)
+        return _options.value;
+      if (!Array.isArray(props.options))
+        return [];
+      return filterOption(props.options, lastSearch.value);
+    });
+    const formItemDepsCollector = inject(InjectionFormItemDepsCollector);
+    watch(() => props.urlConfig, (config) => {
+      cachedOptions = null;
+      config && formItemDepsCollector.setDeps(fieldKey.value, config.dependKey || [], () => {
+        cachedOptions = null;
+        props.value && fetchData();
+      });
+    }, {
+      immediate: true
+    });
+    watch(() => props.value, (n, o) => {
+      if (o == null && n != null) {
+        fetchData();
+      }
+    }, {
+      immediate: true
+    });
+    const changeContextCollector = inject(InjectionChangeContextCollector);
+    function update(v, option) {
+      changeContextCollector == null ? void 0 : changeContextCollector.setContext(fieldKey.value, "currentOption", cloneDeep(option));
+      emit("update:value", v);
+    }
+    const labelKey = computed(() => {
+      var _a, _b;
+      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
+    });
+    const valueKey = computed(() => {
+      var _a, _b;
+      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
+    });
+    return () => createVNode(NSelect, {
+      "value": props.value,
+      "onUpdate:value": update,
+      "remote": true,
+      "filterable": true,
+      "labelField": labelKey.value,
+      "valueField": valueKey.value,
+      "onSearch": fetchData,
+      "onUpdate:show": (show) => show && fetchData(),
+      "options": renderOptions.value
+    }, slots);
+  }
+});
+const SELECT = connect(script, mapProps({
+  dataSource: "options"
+}, assignUpdateValue));
+
+export { SELECT };

package/es/packages/form-render/src/components/slider.mjs

@@ -1 +1,16 @@
-export { SLIDER } from './slider2.mjs';
+import { connect, mapProps } from '@formily/vue';
+import { NSlider } from 'naive-ui';
+import { assignUpdateValue } from 'cnhis-design-vue/es/packages/form-render/src/utils';
+
+const SLIDER = connect(NSlider, mapProps((props, field) => {
+  const _props = assignUpdateValue(props, field);
+  if (Array.isArray(_props.option)) {
+    _props.marks = _props.option.reduce((fin, option) => {
+      fin[option.value] = option.text;
+      return fin;
+    }, {});
+  }
+  return _props;
+}));
+
+export { SLIDER };

package/es/packages/form-render/src/components/switch.mjs

@@ -1 +1,47 @@
-export { SWITCH } from './switch2.mjs';
+import { defineComponent, computed, createVNode, createTextVNode } from 'vue';
+import { NSwitch } from 'naive-ui';
+import { assignUpdateValue } from '../utils/index.mjs';
+import { connect, mapProps } from '@formily/vue';
+
+const script = defineComponent({
+  name: "FormSwitch",
+  props: {
+    openDescription: {
+      type: Object
+    },
+    closeDescription: {
+      type: Object
+    },
+    onChange: {}
+  },
+  setup(props) {
+    return () => {
+      const checkedValue = computed(() => {
+        var _a, _b;
+        return (_b = (_a = props.openDescription) == null ? void 0 : _a.value) != null ? _b : true;
+      });
+      const uncheckedValue = computed(() => {
+        var _a, _b;
+        return (_b = (_a = props.closeDescription) == null ? void 0 : _a.value) != null ? _b : false;
+      });
+      const checked = () => {
+        var _a, _b;
+        return createTextVNode((_b = (_a = props.openDescription) == null ? void 0 : _a.describe) != null ? _b : "");
+      };
+      const unchecked = () => {
+        var _a, _b;
+        return createTextVNode((_b = (_a = props.closeDescription) == null ? void 0 : _a.describe) != null ? _b : "");
+      };
+      return createVNode(NSwitch, {
+        "checkedValue": checkedValue.value,
+        "uncheckedValue": uncheckedValue.value
+      }, {
+        checked,
+        unchecked
+      });
+    };
+  }
+});
+const SWITCH = connect(script, mapProps(assignUpdateValue));
+
+export { SWITCH };

package/es/packages/form-render/src/components/textarea.mjs

@@ -1 +1,11 @@
-export { TEXTAREA } from './textarea2.mjs';
+import { assignUpdateValue } from '../utils/index.mjs';
+import { connect, mapProps } from '@formily/vue';
+import { NInput } from 'naive-ui';
+
+const TEXTAREA = connect(NInput, mapProps((props, field) => {
+  const _props = assignUpdateValue(props, field);
+  _props.type = "textarea";
+  return _props;
+}));
+
+export { TEXTAREA };

package/es/packages/form-render/src/constants/index.mjs

@@ -1 +1,28 @@
-export { FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, InjectAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionSchemaField } from './index2.mjs';
+const InjectAsyncQueue = Symbol("InjectAsyncQueue");
+const InjectionSchemaField = Symbol("InjectionSchemaField");
+const InjectionBusinessCollector = Symbol("InjectionBusinessCollector");
+const InjectionChangeContextCollector = Symbol("InjectionChangeContextCollector");
+const InjectionFormItemDepsCollector = Symbol("InjectionFormItemDepsCollector");
+var FIELD_BUSINESS_TYPE = /* @__PURE__ */ ((FIELD_BUSINESS_TYPE2) => {
+  FIELD_BUSINESS_TYPE2["PASSWORD"] = "password";
+  FIELD_BUSINESS_TYPE2["ID_CARD"] = "id_card";
+  FIELD_BUSINESS_TYPE2["AGE"] = "age";
+  FIELD_BUSINESS_TYPE2["MOBILE"] = "mobile";
+  FIELD_BUSINESS_TYPE2["TELEPHONE"] = "telephone";
+  FIELD_BUSINESS_TYPE2["EMAIL"] = "email";
+  FIELD_BUSINESS_TYPE2["SEX"] = "sex";
+  FIELD_BUSINESS_TYPE2["BIRTHDAY"] = "birthday";
+  FIELD_BUSINESS_TYPE2["BANK_CARD"] = "bank_card";
+  FIELD_BUSINESS_TYPE2["WEBSITE"] = "website";
+  FIELD_BUSINESS_TYPE2["GESTATIONAL_WEEKS"] = "gestational_weeks";
+  FIELD_BUSINESS_TYPE2["GESTATIONAL_STAGE"] = "gestational_stage";
+  FIELD_BUSINESS_TYPE2["CUSTOMER_NAME"] = "customer_name";
+  return FIELD_BUSINESS_TYPE2;
+})(FIELD_BUSINESS_TYPE || {});
+var FIELD_SEX_VALUE = /* @__PURE__ */ ((FIELD_SEX_VALUE2) => {
+  FIELD_SEX_VALUE2["MALE"] = "1";
+  FIELD_SEX_VALUE2["FEMALE"] = "2";
+  return FIELD_SEX_VALUE2;
+})(FIELD_SEX_VALUE || {});
+
+export { FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, InjectAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionSchemaField };

package/es/packages/form-render/src/hooks/index.mjs

@@ -1,11 +1,11 @@
-export { useFieldList2Schema } from './useFieldList2Schema2.mjs';
-export { useFormRequest } from './useFormRequest2.mjs';
-export { useCommonLog } from './useCommonLog2.mjs';
-export { useFormField } from './useFormField2.mjs';
-export { AsyncQueue, useAsyncQueue } from './useAsyncQueue2.mjs';
-export { useFieldVisitor } from './useFieldVisitor2.mjs';
-export { useTypeNormalize } from './useTypeNormalize2.mjs';
-export { useFormValidator } from './useFormValidator2.mjs';
-export { BusinessCollector, useBusinessBinding } from './useBusinessBinding2.mjs';
-export { ContextCollector, useChangeContext } from './useChangeContext2.mjs';
-export { FormItemDepsCollector, useFormItemDeps } from './useFormItemDeps2.mjs';
+export { useFieldList2Schema } from './useFieldList2Schema.mjs';
+export { useFormRequest } from './useFormRequest.mjs';
+export { useCommonLog } from './useCommonLog.mjs';
+export { useFormField } from './useFormField.mjs';
+export { AsyncQueue, useAsyncQueue } from './useAsyncQueue.mjs';
+export { useFieldVisitor } from './useFieldVisitor.mjs';
+export { useTypeNormalize } from './useTypeNormalize.mjs';
+export { useFormValidator } from './useFormValidator.mjs';
+export { BusinessCollector, useBusinessBinding } from './useBusinessBinding.mjs';
+export { ContextCollector, useChangeContext } from './useChangeContext.mjs';
+export { FormItemDepsCollector, useFormItemDeps } from './useFormItemDeps.mjs';

package/es/packages/form-render/src/hooks/useAsyncQueue.mjs

@@ -1 +1,138 @@
-export { AsyncQueue, useAsyncQueue } from './useAsyncQueue2.mjs';
+import { useCommonLog } from './useCommonLog.mjs';
+import { useFormRequest } from './useFormRequest.mjs';
+
+class AsyncQueueEntry {
+  constructor(item, key, callback) {
+    this.item = item;
+    this.key = key;
+    this.state = 0 /* PENDING */;
+    this.callback = callback;
+  }
+}
+class ArrayQueue {
+  constructor(items) {
+    this._list = items ? Array.from(items) : [];
+  }
+  enqueue(item) {
+    this._list.push(item);
+  }
+  dequeue() {
+    return this._list.shift();
+  }
+}
+class AsyncQueue {
+  constructor({ name, processor, getKey, parallelism }) {
+    this._queued = new ArrayQueue();
+    this._entries = /* @__PURE__ */ new Map();
+    this._activeTasks = 0;
+    this._processingLock = false;
+    this._stopped = false;
+    this.name = name;
+    this.processor = processor;
+    this.getKey = getKey;
+    this.parallelism = parallelism || 100;
+  }
+  add(item, callback) {
+    if (this._stopped)
+      return callback(new Error("Queue was stopped"));
+    const key = this.getKey(item);
+    if (this._entries.has(key)) {
+      const entry = this._entries.get(key);
+      if (entry.state === 1 /* DONE */) {
+        setTimeout(() => {
+          callback && callback(entry.error, entry.result);
+        });
+      } else if (!entry.callbacks) {
+        entry.callbacks = [callback];
+      } else {
+        entry.callbacks.push(callback);
+      }
+      return;
+    }
+    const newEntry = new AsyncQueueEntry(item, key, callback);
+    this._entries.set(key, newEntry);
+    this._queued.enqueue(newEntry);
+    if (!this._processingLock) {
+      this._processingLock = true;
+      Promise.resolve().then(this._ensureProcessing.bind(this));
+    }
+  }
+  addAsync(item) {
+    return new Promise((resolve, reject) => {
+      this.add(item, (err, result) => {
+        err && reject(err);
+        resolve(result);
+      });
+    });
+  }
+  _ensureProcessing() {
+    while (this._activeTasks < this.parallelism) {
+      const entry = this._queued.dequeue();
+      if (!entry)
+        break;
+      this._activeTasks++;
+      entry.state = 0 /* PENDING */;
+      this._startProcess(entry);
+    }
+    this._processingLock = false;
+  }
+  _startProcess(entry) {
+    this.processor(entry.item, (e, r) => {
+      if (e) {
+        this._handlerResult(entry, e);
+        return;
+      }
+      this._handlerResult(entry, e, r);
+    }, () => this._entries.delete(entry.key));
+  }
+  _handlerResult(entry, e, r) {
+    const callback = entry.callback;
+    entry.state = 1 /* DONE */;
+    entry.callback = void 0;
+    entry.result = r;
+    entry.error = e;
+    this._activeTasks--;
+    callback && callback(e, r);
+    if (entry.callbacks) {
+      entry.callbacks.forEach((cb) => cb(e, r));
+    }
+    if (!this._processingLock) {
+      this._processingLock = true;
+      Promise.resolve().then(this._ensureProcessing.bind(this));
+    }
+  }
+}
+function useAsyncQueue() {
+  const { getHttpInstance } = useFormRequest();
+  function create(parallelism = 3) {
+    return new AsyncQueue({
+      name: "FormRenderAsyncQueue",
+      parallelism,
+      async processor({ method = "post", params, url }, cb, removeCache) {
+        const http = getHttpInstance();
+        if (!http) {
+          useCommonLog().invalidHttpInstanceLog();
+          cb();
+          removeCache();
+          return;
+        }
+        try {
+          const res = await http[method](url, params);
+          const { data, success } = res;
+          if (!success)
+            throw new Error(`Request error => ${res}`);
+          cb(void 0, data);
+        } catch (e) {
+          cb(new Error(`Request error => ${e}`));
+          removeCache();
+        }
+      },
+      getKey(item) {
+        return item.url + JSON.stringify(item.params || {});
+      }
+    });
+  }
+  return { create };
+}
+
+export { AsyncQueue, useAsyncQueue };

package/es/packages/form-render/src/hooks/useBusinessBinding.mjs

@@ -1 +1,60 @@
-export { BusinessCollector, useBusinessBinding } from './useBusinessBinding2.mjs';
+import { isString } from '@vueuse/core';
+import { FIELD_BUSINESS_TYPE } from '../constants/index.mjs';
+import { isIdCard, parseIdCard } from '../utils/index.mjs';
+
+class BusinessCollector {
+  constructor() {
+    this.typeCollector = /* @__PURE__ */ new Map();
+    this.fieldNameCollector = /* @__PURE__ */ new Map();
+    this.handlerMap = /* @__PURE__ */ new Map([[FIELD_BUSINESS_TYPE.ID_CARD, this.handlerIdCardType.bind(this)]]);
+  }
+  collect(type, fieldName) {
+    const set = this.typeCollector.get(type) || /* @__PURE__ */ new Set();
+    set.add(fieldName);
+    this.typeCollector.set(type, set);
+    this.fieldNameCollector.set(fieldName, type);
+  }
+  getField(type) {
+    return [...this.typeCollector.get(type) || /* @__PURE__ */ new Set()];
+  }
+  getType(fieldName) {
+    return this.fieldNameCollector.get(fieldName);
+  }
+  handlerIdCardType(formModel, value) {
+    if (!value || !isString(value) || !isIdCard(value))
+      return;
+    const info = parseIdCard(value);
+    const ageFields = this.getField(FIELD_BUSINESS_TYPE.AGE);
+    ageFields.forEach((field) => {
+      formModel.setFieldState(field, (state) => {
+        state.value = info.age;
+      });
+    });
+    const sexFields = this.getField(FIELD_BUSINESS_TYPE.SEX);
+    sexFields.forEach((field) => {
+      formModel.setFieldState(field, (state) => {
+        state.value = info.sex;
+      });
+    });
+    const birthdayFields = this.getField(FIELD_BUSINESS_TYPE.BIRTHDAY);
+    birthdayFields.forEach((field) => {
+      formModel.setFieldState(field, (state) => {
+        state.value = info.birthday;
+      });
+    });
+  }
+  trigger(formModel, fieldName, value) {
+    const type = this.getType(fieldName);
+    if (!type || !this.handlerMap.has(type))
+      return;
+    this.handlerMap.get(type)(formModel, value);
+  }
+}
+function useBusinessBinding() {
+  function create() {
+    return new BusinessCollector();
+  }
+  return { create };
+}
+
+export { BusinessCollector, useBusinessBinding };

package/es/packages/form-render/src/hooks/useChangeContext.mjs

@@ -1 +1,21 @@
-export { ContextCollector, useChangeContext } from './useChangeContext2.mjs';
+class ContextCollector {
+  constructor() {
+    this.contextMap = /* @__PURE__ */ new Map();
+  }
+  setContext(key, prop, value) {
+    const context = this.contextMap.get(key) || {};
+    Reflect.set(context, prop, value);
+    this.contextMap.set(key, context);
+  }
+  getContext(key) {
+    return this.contextMap.get(key) || {};
+  }
+}
+function useChangeContext() {
+  function create() {
+    return new ContextCollector();
+  }
+  return { create };
+}
+
+export { ContextCollector, useChangeContext };

package/es/packages/form-render/src/hooks/useCommonLog.mjs

@@ -1 +1,10 @@
-export { useCommonLog } from './useCommonLog2.mjs';
+import { formRenderLog } from '../utils/index.mjs';
+
+function useCommonLog() {
+  function invalidHttpInstanceLog() {
+    formRenderLog(`before use http feature, you should regist http instance by useFormilyRequest.registGlobHttpInstance()`, "warn");
+  }
+  return { invalidHttpInstanceLog };
+}
+
+export { useCommonLog };