cnhis-design-vue 3.1.12-beta.5 → 3.1.12

package/es/packages/fabric-chart/style/index.css

@@ -0,0 +1,43 @@
+.c-fabric-chart-popup-tip,
+.c-fabric-chart-popup-menu {
+  position: absolute;
+  z-index: 1001;
+  display: flex;
+  flex-flow: column nowrap;
+  margin: 0;
+  padding: 8px 12px;
+  font-size: 12px;
+}
+.c-fabric-chart-popup-tip > li,
+.c-fabric-chart-popup-menu > li {
+  list-style: none;
+}
+.c-fabric-chart-popup-tip {
+  border-radius: 4px;
+  background: rgba(0, 0, 0, 0.7);
+}
+.c-fabric-chart-popup-tip > li {
+  color: #fff;
+}
+.c-fabric-chart-popup-menu {
+  padding: 8px 5px !important;
+  z-index: 1001;
+  background: #fff;
+  box-shadow: 0 2px 12px 0 rgba(56, 56, 56, 0.2);
+  border: 1px solid #e2e6ed;
+  border-radius: 2px;
+}
+.c-fabric-chart-popup-menu > li {
+  padding: 5px;
+  background: #fff;
+  cursor: pointer;
+}
+.c-fabric-chart-popup-menu > li:hover {
+  background: #f0f7ff;
+}
+.c-fabric-chart-popup-menu > li.no-click {
+  cursor: default;
+}
+.c-fabric-chart-popup-menu > li.no-click:hover {
+  background: #fff;
+}

package/es/packages/form-render/src/components/renderer/cascader.js

@@ -1,4 +1,5 @@
 import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
+import { isField } from '@formily/core';
 import { isObject, isString } from 'lodash-es';
 import { InjectAsyncQueue } from '../../constants/index.js';
 import { assignUpdateValue, formRenderLog, arrayed } from '../../utils/index.js';
@@ -33,6 +34,9 @@ const script = defineComponent({
       title
     } = useFormField();
     const asyncQueue = inject(InjectAsyncQueue);
+    const {
+      field
+    } = useFormField();
     async function fetchData(option) {
       var _a;
       if (!option && _options.value)
@@ -99,9 +103,13 @@ const script = defineComponent({
       return _options.value || props.options || [];
     });
     watch(() => props.value, (n, o) => {
+      var _a, _b;
       if (n != null && o == null) {
         fetchData();
       }
+      if (isField(field.value) && field.value.visited) {
+        (_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a);
+      }
     }, {
       immediate: true
     });
@@ -139,6 +147,11 @@ const script = defineComponent({
       show.value = !!v;
       v && fetchData();
     }
+    function onFocus() {
+      if (isField(field.value)) {
+        field.value.visited = true;
+      }
+    }
     return () => {
       return createVNode(NCascader, {
         "value": _value.value,
@@ -150,6 +163,7 @@ const script = defineComponent({
         "options": renderOptions.value,
         "checkStrategy": "child",
         "onLoad": fetchData,
+        "onFocus": onFocus,
         "onUpdate:show": updateShow
       }, slots);
     };

package/es/packages/form-render/src/components/renderer/checkbox.d.ts

@@ -9,6 +9,7 @@ export declare const CHECKBOX: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    onChange: {};
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     options: {
         type: PropType<AnyObject[]>;
@@ -18,6 +19,7 @@ export declare const CHECKBOX: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    onChange: {};
 }>>, {
     options: AnyObject[];
     vertical: boolean;

package/es/packages/form-render/src/components/renderer/checkbox.js

@@ -13,12 +13,11 @@ const script = defineComponent({
     vertical: {
       type: Boolean,
       default: false
-    }
+    },
+    onChange: {}
   },
-  setup(props, {
-    attrs
-  }) {
-    return () => createVNode(NCheckboxGroup, attrs, {
+  setup(props) {
+    return () => createVNode(NCheckboxGroup, null, {
       default: () => [createVNode(NSpace, {
         "vertical": props.vertical
       }, {

package/es/packages/form-render/src/components/renderer/date.js

@@ -32,20 +32,52 @@ const DATE = connect(script, mapProps((props, field) => {
         max_date
       } = props.validate;
       if (min_date || max_date) {
-        _props.isDateDisabled = (time) => {
-          let disabled = false;
-          if (min_date === "currTime") {
-            disabled = time < Date.now();
-          }
-          if (max_date === "currTime") {
-            disabled = time > Date.now();
-          }
-          return disabled;
-        };
+        _props.isDateDisabled = isDateDisabled;
+        _props.isTimeDisabled = isTimeDisabled;
       }
     }
   }
   return _props;
+  function minCurrentDate() {
+    var _a;
+    return ((_a = props.validate) == null ? void 0 : _a.min_date) === "currTime";
+  }
+  function maxCurrentDate() {
+    var _a;
+    return ((_a = props.validate) == null ? void 0 : _a.max_date) === "currTime";
+  }
+  function isDateDisabled(time) {
+    return minCurrentDate() && time < yesterday() || maxCurrentDate() && time > Date.now();
+    function yesterday() {
+      return Date.now() - 24 * 60 * 60 * 1e3;
+    }
+  }
+  function isTimeDisabled(time) {
+    const checkDate = new Date(time);
+    const currentDate = new Date();
+    return {
+      isHourDisabled,
+      isMinuteDisabled
+    };
+    function checkHour() {
+      return checkDate.getHours();
+    }
+    function currentHour() {
+      return currentDate.getHours();
+    }
+    function currentMinute() {
+      return currentDate.getMinutes();
+    }
+    function isHourDisabled(hour) {
+      return minCurrentDate() && hour < currentHour() || maxCurrentDate() && hour > currentHour();
+    }
+    function isMinuteDisabled(minute) {
+      if (checkHour() === currentHour()) {
+        return minCurrentDate() && minute < currentMinute() || maxCurrentDate() && minute > currentMinute();
+      }
+      return minCurrentDate() && checkHour() < currentHour() || maxCurrentDate() && checkHour() > currentHour();
+    }
+  }
 }));
 
 export { DATE };

package/es/packages/form-render/src/components/renderer/index.d.ts

@@ -14,3 +14,4 @@ export * from './radio';
 export * from './labelSelect';
 export * from './slider';
 export * from './complex';
+export * from './simpleComponent';

package/es/packages/form-render/src/components/renderer/index.js

@@ -14,3 +14,4 @@ export { RADIO } from './radio.js';
 export { LABEL } from './labelSelect.js';
 export { SLIDER } from './slider.js';
 export { COMPLEX } from './complex.js';
+export { BUTTON, TEXT } from './simpleComponent.js';

package/es/packages/form-render/src/components/renderer/linebar.js

@@ -58,7 +58,7 @@ const script = defineComponent({
       }) : createVNode("header", {
         "class": "form-render__linebarHeader",
         "onClick": toggleShow
-      }, [" ", props.title, " "]), createVNode(NCollapseTransition, {
+      }, [props.title]), createVNode(NCollapseTransition, {
         "class": "form-render__linebarItem",
         "show": _show.value
       }, slots)]);

package/es/packages/form-render/src/components/renderer/select.js

@@ -1,4 +1,5 @@
 import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
+import { isField } from '@formily/core';
 import { cloneDeep } from 'lodash-es';
 import { InjectAsyncQueue, InjectionFormItemDepsCollector, InjectionChangeContextCollector } from '../../constants/index.js';
 import { assignUpdateValue, formRenderLog, generateUrlParams } from '../../utils/index.js';
@@ -97,9 +98,13 @@ const script = defineComponent({
       immediate: true
     });
     watch(() => props.value, (n, o) => {
+      var _a, _b;
       if (o == null && n != null) {
         fetchData();
       }
+      if (isField(field.value) && field.value.visited) {
+        (_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a);
+      }
     }, {
       immediate: true
     });
@@ -116,6 +121,11 @@ const script = defineComponent({
       var _a, _b;
       return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
     });
+    function onFocus() {
+      if (isField(field.value)) {
+        field.value.visited = true;
+      }
+    }
     return () => createVNode(NSelect, {
       "value": props.value,
       "onUpdate:value": update,
@@ -125,6 +135,7 @@ const script = defineComponent({
       "valueField": valueKey.value,
       "onSearch": fetchData,
       "onUpdate:show": (show) => show && fetchData(),
+      "onFocus": onFocus,
       "options": parsedOptions.value
     }, slots);
   }

package/es/packages/form-render/src/components/renderer/simpleComponent.d.ts

@@ -0,0 +1,2 @@
+export declare const TEXT: (props: any) => JSX.Element;
+export declare const BUTTON: (props: any) => JSX.Element;

package/es/packages/form-render/src/components/renderer/simpleComponent.js

@@ -0,0 +1,64 @@
+import { createVNode, mergeProps, isVNode } from 'vue';
+import { connect, mapProps } from '@formily/vue';
+import { isObject, isFunction } from 'lodash-es';
+import { NButton } from 'naive-ui';
+
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
+}
+function createPropFor(props) {
+  return (property) => {
+    var _a;
+    return (_a = props.fieldItem) == null ? void 0 : _a[property];
+  };
+}
+function createSlot(renderer, props) {
+  if (isObject(renderer)) {
+    const result = {};
+    Object.entries(renderer).forEach(([key, renderer2]) => {
+      isFunction(renderer2) && (result[key] = () => renderer2(props));
+    });
+    return result;
+  }
+  return {
+    default() {
+      return isFunction(renderer) ? renderer(props) : renderer;
+    }
+  };
+}
+const textScript = (props) => {
+  var _a, _b, _c;
+  const propFor = createPropFor(props);
+  return createVNode("div", (_a = propFor("componentProps")) != null ? _a : {}, [(_c = (_b = createSlot(props.content, props)).default) == null ? void 0 : _c.call(_b)]);
+};
+const TEXT = connect(textScript, mapProps((props) => {
+  var _a;
+  return {
+    ...props,
+    content: (_a = props.fieldItem) == null ? void 0 : _a.content
+  };
+}));
+const buttonScript = (props) => {
+  var _a;
+  let _slot;
+  const propFor = createPropFor(props);
+  function onClick() {
+    var _a2;
+    const cb = propFor("onClick") || ((_a2 = propFor("componentProps")) == null ? void 0 : _a2.onClick);
+    return () => isFunction(cb) && cb(props.fieldItem);
+  }
+  return createVNode(NButton, mergeProps((_a = propFor("componentProps")) != null ? _a : {}, {
+    "onClick": onClick()
+  }), _isSlot(_slot = createSlot(props.content, props)) ? _slot : {
+    default: () => [_slot]
+  });
+};
+const BUTTON = connect(buttonScript, mapProps((props) => {
+  var _a;
+  return {
+    ...props,
+    content: (_a = props.fieldItem) == null ? void 0 : _a.content
+  };
+}));
+
+export { BUTTON, TEXT };

package/es/packages/form-render/src/components/renderer/slider.js

@@ -6,7 +6,7 @@ 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;
+      fin[+option.value] = option.text;
       return fin;
     }, {});
   }

package/es/packages/form-render/src/hooks/useFieldListAdaptor.d.ts

@@ -1,5 +1,5 @@
-import { FieldItem } from '../types';
 import { BusinessCollector } from '../../../../../es/packages/form-render';
+import { FieldItem } from '../types';
 /**
  * @description 胶水层, 将低代码平台中的fieldList转换为JSONSchema
  */

package/es/packages/form-render/src/hooks/useFieldListAdaptor.js

@@ -1,7 +1,7 @@
+import { isObject } from '@vueuse/core';
 import { isArray, pick } from 'lodash-es';
-import { arrayed, transformDateFormat } from '../utils/index.js';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
-import { isObject } from '@vueuse/core';
+import { arrayed, transformDateFormat } from '../utils/index.js';
 
 function useFieldListAdaptor(collector, uuid) {
   const { createValidatorSchema } = useFormValidator();
@@ -10,12 +10,6 @@ function useFieldListAdaptor(collector, uuid) {
       name: item.val_key,
       type: "string",
       title: item.alias || item.name,
-      "x-decorator": "FORM_ITEM",
-      "x-decorator-props": {
-        span: item.elem_width,
-        showLabel: item.hide_title !== "1",
-        id: `${uuid}-${item.val_key}`
-      },
       "x-component": item.html_type,
       "x-component-props": {
         placeholder: item.placeholder,
@@ -28,6 +22,17 @@ function useFieldListAdaptor(collector, uuid) {
     if (isObject(item.reactions)) {
       result["x-reactions"] = item.reactions;
     }
+    if (!item.noDecorator) {
+      Object.assign(result, {
+        "x-decorator": "FORM_ITEM",
+        "x-decorator-props": {
+          span: item.elem_width,
+          showLabel: item.hide_title !== "1",
+          id: `${uuid}-${item.val_key}`,
+          ...item.decoratorProps || {}
+        }
+      });
+    }
     const rules = createValidatorSchema(item);
     rules && (result["x-validator"] = rules);
     item.is_null === "0" && (result.required = true);
@@ -108,9 +113,9 @@ function useFieldListAdaptor(collector, uuid) {
   const createSliderSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
-      step: item.step_length,
-      max: item.max_length,
-      min: item.min_length,
+      step: +item.step_length,
+      max: +item.max_length,
+      min: +item.min_length,
       option: item.option
     });
     return schema;
@@ -183,22 +188,26 @@ function useFieldListAdaptor(collector, uuid) {
   const { normalize } = useTypeNormalize();
   function schemaAdaptor(fieldList) {
     let prevLinebar = null;
-    return fieldList.reduce((fin, cur) => {
+    return fieldList.reduce((fin, cur, idx) => {
       var _a;
       normalize(cur);
       const obj_type = (_a = cur.validate) == null ? void 0 : _a.obj_type;
       obj_type && collector.collect(obj_type, cur.val_key);
       if (cur.html_type === "LINEBAR") {
-        fin[createFieldName(cur)] = createLinebarSchema(cur);
+        fin[createFieldName(cur)] = bindIndex(createLinebarSchema(cur), idx);
         prevLinebar = fin[createFieldName(cur)].properties = {};
       } else if (prevLinebar) {
-        prevLinebar[createFieldName(cur)] = createWidgetSchema(cur);
+        prevLinebar[createFieldName(cur)] = bindIndex(createWidgetSchema(cur), idx);
       } else {
         prevLinebar = null;
-        fin[createFieldName(cur)] = createWidgetSchema(cur);
+        fin[createFieldName(cur)] = bindIndex(createWidgetSchema(cur), idx);
       }
       return fin;
     }, {});
+    function bindIndex(schema, idx) {
+      schema["x-index"] = idx;
+      return schema;
+    }
     function createFieldName(fieldItem) {
       if (isArray(fieldItem.suffixConfig)) {
         return [fieldItem.val_key, fieldItem.suffixConfig.map((f) => f.val_key)].join("-");

package/es/packages/index.css

@@ -1129,6 +1129,13 @@ body > .vxe-table--tooltip-wrapper {
 .n-dialog__title .svg-wrap {
   margin: 0 0 0 auto;
 }
+.n-dialog__title .svg-wrap .svg-icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
 .n-dialog__title .svg-wrap svg {
   font-size: 14px;
   cursor: pointer;
@@ -2725,3 +2732,46 @@ body > .vxe-table--tooltip-wrapper {
   display: flex !important;
   gap: 0 8px;
 }
+.c-fabric-chart-popup-tip,
+.c-fabric-chart-popup-menu {
+  position: absolute;
+  z-index: 1001;
+  display: flex;
+  flex-flow: column nowrap;
+  margin: 0;
+  padding: 8px 12px;
+  font-size: 12px;
+}
+.c-fabric-chart-popup-tip > li,
+.c-fabric-chart-popup-menu > li {
+  list-style: none;
+}
+.c-fabric-chart-popup-tip {
+  border-radius: 4px;
+  background: rgba(0, 0, 0, 0.7);
+}
+.c-fabric-chart-popup-tip > li {
+  color: #fff;
+}
+.c-fabric-chart-popup-menu {
+  padding: 8px 5px !important;
+  z-index: 1001;
+  background: #fff;
+  box-shadow: 0 2px 12px 0 rgba(56, 56, 56, 0.2);
+  border: 1px solid #e2e6ed;
+  border-radius: 2px;
+}
+.c-fabric-chart-popup-menu > li {
+  padding: 5px;
+  background: #fff;
+  cursor: pointer;
+}
+.c-fabric-chart-popup-menu > li:hover {
+  background: #f0f7ff;
+}
+.c-fabric-chart-popup-menu > li.no-click {
+  cursor: default;
+}
+.c-fabric-chart-popup-menu > li.no-click:hover {
+  background: #fff;
+}

package/es/packages/scale-view/src/hooks/scaleview-computed.js

@@ -120,12 +120,7 @@ const ScaleViewComputed = (props, state, config) => {
   const showAnswerParse = computed(() => (item) => {
     var _a;
     let { evaluateAnswer, checkAnswerMode, evaluateStartTime, evaluateTime } = ((_a = state.config) == null ? void 0 : _a.evaluateResultSetting) || {};
-    let arr = [
-      "EVALUATE_RADIO_BLOCK",
-      "EVALUATE_CHECKBOX_BLOCK",
-      "EVALUATE_SELECT",
-      "EVALUATE_INPUT"
-    ];
+    let arr = ["EVALUATE_RADIO_BLOCK", "EVALUATE_CHECKBOX_BLOCK", "EVALUATE_SELECT", "EVALUATE_INPUT"];
     let maxScore = (item == null ? void 0 : item.scoreConfigs) || 0;
     let isShow = evaluateAnswer && state.isFinished && arr.includes(item.type) && maxScore;
     if (!evaluateStartTime || !evaluateTime || checkAnswerMode && checkAnswerMode == 1) {
@@ -179,12 +174,12 @@ const ScaleViewComputed = (props, state, config) => {
     };
   });
   const comProsMap = {
-    "RSelectCom": selectProps.value,
-    "RCascaderCom": cascaderProps.value,
-    "RUploadCom": uploadProps.value,
-    "RMapCom": mapProps.value,
-    "RVodChunkUploadCom": vodChunkUploadProps.value,
-    "CSelectLabelCom": selectLabelProps.value
+    RSelectCom: selectProps.value,
+    RCascaderCom: cascaderProps.value,
+    RUploadCom: uploadProps.value,
+    RMapCom: mapProps.value,
+    RVodChunkUploadCom: vodChunkUploadProps.value,
+    CSelectLabelCom: selectLabelProps.value
   };
   const propsConfig = computed(() => (item, index) => {
     var _a;

package/es/packages/scale-view/src/hooks/scaleview-init.js

@@ -10,12 +10,7 @@ import { useDialog } from 'naive-ui';
 const ScaleViewInit = (props, state, emit, config) => {
   const dialog = useDialog();
   const { setNoData } = useNoData();
-  const {
-    hasEvaluateResultSetting,
-    hasparamsEvaluate,
-    hasDefault,
-    formKey
-  } = ScaleViewComputed(props, state, config);
+  const { hasEvaluateResultSetting, hasparamsEvaluate, hasDefault, formKey } = ScaleViewComputed(props, state, config);
   const { formatRules } = ScaleViewValidate(props, state, config);
   const { nextLogicEvent } = useEvent(props, state);
   const setEvaluateStartTime = (evaluateResultSetting) => {

package/es/packages/select-label/style/index.css

@@ -148,6 +148,13 @@
 .n-dialog__title .svg-wrap {
   margin: 0 0 0 auto;
 }
+.n-dialog__title .svg-wrap .svg-icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
 .n-dialog__title .svg-wrap svg {
   font-size: 14px;
   cursor: pointer;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "cnhis-design-vue",
 	"private": false,
-	"version": "3.1.12-beta.5",
+	"version": "3.1.12",
 	"license": "ISC",
 	"module": "es/packages/index.js",
 	"main": "es/packages/index.js",
@@ -59,7 +59,7 @@
 		"vue": "^3.2.0",
 		"vue-simple-uploader": "^1.0.0-beta.5",
 		"vuedraggable": "4.1.0",
-		"vxe-table": "^4.2.5",
+		"vxe-table": "4.2.5",
 		"xe-utils": "^3.5.4"
 	},
 	"devDependencies": {