cnhis-design-vue 3.1.7-beta.1 → 3.1.7-beta.2

package/es/packages/index.css

@@ -2588,3 +2588,83 @@ body > .vxe-table--tooltip-wrapper {
   font-size: 14px;
   text-decoration: none !important;
 }
+.formily-render__wrapper {
+  display: grid !important;
+  grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
+  gap: 0 8px;
+}
+.formily-render__formItem {
+  grid-column: span var(--form-item-column) / span var(--form-item-column);
+}
+.formily-render__formItem .n-date-picker {
+  width: 100%;
+}
+.formily-render__collapse {
+  grid-column: span var(--column) / span var(--column);
+}
+.formily-render__collapseHeader {
+  cursor: pointer;
+  display: flex;
+  background: #fafafa;
+  height: 36px;
+  align-items: center;
+  padding: 0 16px;
+  margin-bottom: 8px;
+  border: 1px solid #d9d9d9;
+}
+.formily-render__collapseItem {
+  display: grid !important;
+  grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
+  gap: 0 8px;
+}
+.formily-render__inputGroup {
+  grid-column: span var(--column) / span var(--column);
+  display: flex;
+  align-items: flex-end;
+}
+.formily-render__inputGroup > div {
+  flex: 1;
+}
+.formily-render__inputGroup > div:not(:last-of-type) .n-input__border,
+.formily-render__inputGroup > div:not(:last-of-type) .n-base-selection__border {
+  border-right: 0;
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+.formily-render__inputGroup > div:last-of-type .n-input__border,
+.formily-render__inputGroup > div:last-of-type .n-base-selection__border {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+}
+.formily-render__combination {
+  width: 100%;
+}
+.formily-render__combinationHeader {
+  display: flex;
+  gap: 12px;
+}
+.formily-render__combinationHeader > h3 {
+  font-size: 16px;
+  font-weight: 700;
+  padding: 0;
+  margin: 0;
+}
+.formily-render__combinationClose {
+  position: absolute;
+  right: 0;
+  top: 5px;
+  width: 14px;
+  height: 14px;
+  border-radius: 50%;
+  background: red;
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  color: white;
+  vertical-align: middle;
+  font-size: 16px;
+}
+.formily-render__combinationContent {
+  position: relative;
+}

package/es/packages/index.d.ts

@@ -14,8 +14,11 @@ import CInfoHeader from './info-header';
 import CTimeLine from './time-line';
 import CBpmnWorkflow from './bpmn-workflow';
 import Editor from './editor';
-export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CFormTable, CInfoHeader, CTimeLine, CBpmnWorkflow, Editor };
+import FormRender from './form-render';
+export * from './form-render';
+declare function install(app: App): void;
+export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CFormTable, CInfoHeader, CTimeLine, CBpmnWorkflow, Editor, FormRender };
 declare const _default: {
-    install: (app: App<any>) => void;
+    install: typeof install;
 };
 export default _default;

package/es/packages/index.less

@@ -2942,3 +2942,120 @@ body {
   }
 }
 
+@block: ~"formily-render";
+
+#formily-grid() {
+  .display(@column) {
+    display: grid !important;
+    grid-template-columns: repeat(@column, minmax(0px, 1fr));
+    gap: 0 8px;
+  }
+  .item(@column) {
+    grid-column: span @column / span @column;
+  }
+}
+
+#formily-input-group(@direction) {
+  border-bottom-@{direction}-radius: 0;
+  border-top-@{direction}-radius: 0;
+}
+
+.@{block} {
+  @display: #formily-grid .display(var(--column));
+  @item: #formily-grid .item(var(--column));
+  @form-item: #formily-grid .item(var(--form-item-column));
+
+  &__wrapper {
+    @display();
+  }
+
+  &__formItem {
+    @form-item();
+
+    .n-date-picker {
+      width: 100%;
+    }
+  }
+
+  &__collapse {
+    @item();
+
+    &Header {
+      cursor: pointer;
+      display: flex;
+      background: #fafafa;
+      height: 36px;
+      align-items: center;
+      padding: 0 16px;
+      margin-bottom: 8px;
+      border: 1px solid #d9d9d9;
+    }
+
+    &Item {
+      @display();
+    }
+  }
+
+  &__inputGroup {
+    @item();
+    display: flex;
+    align-items: flex-end;
+
+    > div {
+      flex: 1;
+
+      &:not(:last-of-type) {
+        .n-input__border,
+        .n-base-selection__border {
+          border-right: 0;
+          #formily-input-group(right);
+        }
+      }
+
+      &:last-of-type {
+        .n-input__border,
+        .n-base-selection__border {
+          #formily-input-group(left);
+        }
+      }
+    }
+  }
+
+  &__combination {
+    width: 100%;
+
+    &Header {
+      > h3 {
+        font-size: 16px;
+        font-weight: 700;
+        padding: 0;
+        margin: 0;
+      }
+
+      display: flex;
+      gap: 12px;
+    }
+
+    &Close {
+      position: absolute;
+      right: 0;
+      top: 5px;
+      width: 14px;
+      height: 14px;
+      border-radius: 50%;
+      background: red;
+      cursor: pointer;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      color: white;
+      vertical-align: middle;
+      font-size: 16px;
+    }
+
+    &Content {
+      position: relative;
+    }
+  }
+}
+

package/es/packages/index.mjs

@@ -13,4 +13,14 @@ export { default as CInfoHeader } from './info-header/index2.mjs';
 export { default as CTimeLine } from './time-line/index2.mjs';
 export { default as CBpmnWorkflow } from './bpmn-workflow/index2.mjs';
 export { default as Editor } from './editor/index2.mjs';
+export { default as FormRender } from './form-render/index2.mjs';
+export { useFieldList2Schema } from './form-render/src/hooks/useFieldList2Schema2.mjs';
+export { useFormRequest } from './form-render/src/hooks/useFormRequest2.mjs';
+export { useCommonLog } from './form-render/src/hooks/useCommonLog2.mjs';
+export { useFormField } from './form-render/src/hooks/useFormField2.mjs';
+export { AsyncQueue, useAsyncQueue } from './form-render/src/hooks/useAsyncQueue2.mjs';
+export { useFieldVisitor } from './form-render/src/hooks/useFieldVisitor2.mjs';
+export { useTypeNormalize } from './form-render/src/hooks/useTypeNormalize2.mjs';
+export { useFormValidator } from './form-render/src/hooks/useFormValidator2.mjs';
+export { BusinessCollector, useBusinessBinding } from './form-render/src/hooks/useBusinessBinding2.mjs';
 export { CCheckbox, CDatetime, CRadio, CScaleView, CSelect } from './scale-view/index2.mjs';

package/es/packages/index2.mjs

@@ -28,6 +28,8 @@ import BpmnWorkflow from './bpmn-workflow/index2.mjs';
 export { default as CBpmnWorkflow } from './bpmn-workflow/index2.mjs';
 import Editor from './editor/index2.mjs';
 export { default as Editor } from './editor/index2.mjs';
+import FormRender from './form-render/index2.mjs';
+export { default as FormRender } from './form-render/index2.mjs';
 
 const components = {
   CGrid: Grid,
@@ -49,16 +51,14 @@ const components = {
   CInfoHeader: InfoHeader,
   CTimeLine: TimeLine,
   CBpmnWorkflow: BpmnWorkflow,
-  Editor
+  Editor,
+  FormRender
 };
-const install = function(app) {
+function install(app) {
   Object.values(components).forEach((component) => {
     component.install(app);
   });
-};
-var index = {
-  install,
-  ...components
-};
+}
+var index = { install, ...components };
 
 export { index as default };

package/es/packages/info-header/src/HiddenContent.vue_vue_type_script_setup_true_lang.mjs

@@ -3,7 +3,6 @@ import { NEllipsis } from 'naive-ui';
 
 const _hoisted_1 = { class: "c-info-header__hidden--content" };
 var script = /* @__PURE__ */ defineComponent({
-  name: "HiddenContent",
   props: {
     content: { type: String, default: "" },
     width: { type: Number }

package/es/packages/info-header/src/InfoHeader.vue_vue_type_script_setup_true_lang.mjs

@@ -26,7 +26,6 @@ const _hoisted_9 = /* @__PURE__ */ createElementVNode("i", { class: "iconfont ic
 const _hoisted_10 = /* @__PURE__ */ createElementVNode("i", { class: "iconfont icon-setting" }, null, -1);
 const _hoisted_11 = /* @__PURE__ */ createElementVNode("i", { class: "iconfont icon-double_down" }, null, -1);
 var script = /* @__PURE__ */ defineComponent({
-  name: "InfoHeader",
   props: {
     compact: { type: Boolean, required: true },
     separator: { type: String, default: ":" },

package/es/packages/map/src/Map.vue_vue_type_script_setup_true_lang.mjs

@@ -15,7 +15,6 @@ const _hoisted_8 = /* @__PURE__ */ createTextVNode("\u786E\u5B9A");
 const _hoisted_9 = ["onClick"];
 const _hoisted_10 = { class: "title" };
 var script = /* @__PURE__ */ defineComponent({
-  name: "Map",
   props: {
     locationProp: { type: String, default: "" },
     ak: {
@@ -280,8 +279,8 @@ var script = /* @__PURE__ */ defineComponent({
         createElementVNode("div", _hoisted_2, [
           createElementVNode("div", _hoisted_3, [
             createVNode(unref(NInput), {
-              value: state.searchKey,
-              "onUpdate:value": _cache[0] || (_cache[0] = ($event) => state.searchKey = $event),
+              value: unref(state).searchKey,
+              "onUpdate:value": _cache[0] || (_cache[0] = ($event) => unref(state).searchKey = $event),
               placeholder: "\u8BF7\u8F93\u5165\u5730\u5740",
               "enter-button": "\u68C0\u7D22"
             }, null, 8, ["value"]),
@@ -300,13 +299,13 @@ var script = /* @__PURE__ */ defineComponent({
           ])
         ]),
         _hoisted_6,
-        state.addressList && state.addressList.length ? (openBlock(), createElementBlock("ul", _hoisted_7, [
+        unref(state).addressList && unref(state).addressList.length ? (openBlock(), createElementBlock("ul", _hoisted_7, [
           createElementVNode("li", null, [
             createTextVNode(" \u5730\u5740:" + toDisplayString(unref(defAdress)) + " ", 1),
             createVNode(unref(NButton), {
               type: "primary",
               size: "small",
-              onClick: _cache[1] || (_cache[1] = ($event) => selectLocation(state.addressList[0]))
+              onClick: _cache[1] || (_cache[1] = ($event) => selectLocation(unref(state).addressList[0]))
             }, {
               default: withCtx(() => [
                 _hoisted_8
@@ -314,7 +313,7 @@ var script = /* @__PURE__ */ defineComponent({
               _: 1
             })
           ]),
-          (openBlock(true), createElementBlock(Fragment, null, renderList(state.addressList, (item, index) => {
+          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(state).addressList, (item, index) => {
             return openBlock(), createElementBlock("li", {
               class: "address-item",
               key: index

package/es/packages/scale-view/src/ScaleView.vue_vue_type_script_setup_true_lang.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, reactive, ref, watch, nextTick, openBlock, createElementBlock, createCommentVNode, Fragment, unref, createBlock, mergeProps, createElementVNode, normalizeClass, normalizeStyle, createVNode, withCtx, renderList, toDisplayString, resolveDynamicComponent, createTextVNode, h } from 'vue';
+import { defineComponent, reactive, ref, watch, nextTick, openBlock, createElementBlock, createCommentVNode, unref, Fragment, createBlock, mergeProps, createElementVNode, normalizeClass, normalizeStyle, createVNode, withCtx, renderList, toDisplayString, resolveDynamicComponent, createTextVNode, h } from 'vue';
 import useNoData from './hooks/use-noData2.mjs';
 import ScaleViewState from './hooks/scaleview-state2.mjs';
 import ScaleViewProps from './hooks/scaleview-props2.mjs';
@@ -39,7 +39,6 @@ const _hoisted_7 = {
 const _hoisted_8 = /* @__PURE__ */ createTextVNode("\u53D6\u6D88");
 const _hoisted_9 = /* @__PURE__ */ createTextVNode("\u4FDD\u5B58");
 var script = /* @__PURE__ */ defineComponent({
-  name: "ScaleView",
   props: ScaleViewProps,
   emits: ["onCloseSetting", "submitNoRequest", "onSubmit"],
   setup(__props, { emit }) {
@@ -270,7 +269,7 @@ var script = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [
         createCommentVNode(' <template v-if="state.spinning">\r\n      <n-spin :show="state.spinning" description="\u52A0\u8F7D\u4E2D"></n-spin>\r\n    </template> '),
-        !state.spinning && !state.hasFrontAddress ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+        !unref(state).spinning && !unref(state).hasFrontAddress ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
           unref(noDataState).noData ? (openBlock(), createBlock(script$1, {
             key: 0,
             noDataImg: unref(noDataState).noDataImg,
@@ -288,17 +287,17 @@ var script = /* @__PURE__ */ defineComponent({
               }, [
                 unref(hasScore) ? (openBlock(), createBlock(unref(ScaleScore), {
                   key: 0,
-                  config: state.config,
-                  maxScore: state.maxScore
+                  config: unref(state).config,
+                  maxScore: unref(state).maxScore
                 }, null, 8, ["config", "maxScore"])) : createCommentVNode("v-if", true),
                 createVNode(unref(NForm), {
                   ref_key: "formRef",
                   ref: formRef,
-                  model: state.form,
-                  rules: state.rules
+                  model: unref(state).form,
+                  rules: unref(state).rules
                 }, {
                   default: withCtx(() => [
-                    (openBlock(true), createElementBlock(Fragment, null, renderList(state.formArray, (item, index) => {
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(unref(state).formArray, (item, index) => {
                       return openBlock(), createElementBlock(Fragment, {
                         key: (item.id || item.seq) + index
                       }, [
@@ -353,7 +352,7 @@ var script = /* @__PURE__ */ defineComponent({
                 !props.isLock ? (openBlock(), createBlock(unref(NButton), {
                   key: 0,
                   onClick: onSubmit,
-                  disabled: state.banSubmit,
+                  disabled: unref(state).banSubmit,
                   type: "info"
                 }, {
                   default: withCtx(() => [
@@ -363,8 +362,8 @@ var script = /* @__PURE__ */ defineComponent({
                 }, 8, ["disabled"])) : createCommentVNode("v-if", true)
               ])) : createCommentVNode("v-if", true)
             ], 64))
-          ], 64))
-        ], 64)) : createCommentVNode("v-if", true)
+          ], 2112))
+        ], 2112)) : createCommentVNode("v-if", true)
       ]);
     };
   }

package/es/packages/scale-view/src/components/AnswerParse.vue_vue_type_script_setup_true_lang.mjs

@@ -12,7 +12,6 @@ const _hoisted_5 = /* @__PURE__ */ createElementVNode("p", null, "\u6B63\u786E\u
 const _hoisted_6 = { class: "answer-key" };
 const _hoisted_7 = /* @__PURE__ */ createElementVNode("p", null, "\u7B54\u6848\u89E3\u6790\uFF1A", -1);
 var script = /* @__PURE__ */ defineComponent({
-  name: "AnswerParse",
   props: {
     item: { type: Object, default: () => ({}) }
   },

package/es/packages/scale-view/src/components/EvaluateCountdown.vue_vue_type_script_setup_true_lang.mjs

@@ -5,7 +5,6 @@ import SvgIcon from 'cnhis-design-vue/es/src/components/SvgIcon';
 
 const _hoisted_1 = { class: "answered-wrap" };
 var script = /* @__PURE__ */ defineComponent({
-  name: "EvaluateCountdown",
   props: {
     formArray: { type: Array, default: () => [] },
     evaluateResultConfig: { type: Object, default: () => ({}) },
@@ -98,7 +97,7 @@ var script = /* @__PURE__ */ defineComponent({
           createVNode(unref(SvgIcon), { "icon-class": "zhongtai-zujianliebiao-gongzuoshijian" })
         ], 2)) : createCommentVNode("v-if", true),
         createElementVNode("div", _hoisted_1, [
-          createTextVNode(" \u7B54\u9898\u60C5\u51B5\uFF1A " + toDisplayString(state.setAnswered) + "/ ", 1),
+          createTextVNode(" \u7B54\u9898\u60C5\u51B5\uFF1A " + toDisplayString(unref(state).setAnswered) + "/ ", 1),
           createElementVNode("span", null, toDisplayString(unref(evaluateState).totalLen), 1)
         ])
       ], 2);

package/es/packages/scale-view/src/components/EvaluatePage.vue_vue_type_script_setup_true_lang.mjs

@@ -23,7 +23,6 @@ const _hoisted_10 = {
   class: "evaluate-time-range"
 };
 var script = /* @__PURE__ */ defineComponent({
-  name: "EvaluatePage",
   props: {
     formArray: { type: Array, default: () => [] },
     evaluateResultConfig: { type: Object, default: () => ({}) },
@@ -115,18 +114,18 @@ var script = /* @__PURE__ */ defineComponent({
               _hoisted_9
             ])) : createCommentVNode("v-if", true)
           ]),
-          unref(showRange) ? (openBlock(), createElementBlock("div", _hoisted_10, toDisplayString(state.timeRange), 1)) : createCommentVNode("v-if", true),
+          unref(showRange) ? (openBlock(), createElementBlock("div", _hoisted_10, toDisplayString(unref(state).timeRange), 1)) : createCommentVNode("v-if", true),
           createVNode(unref(NButton), {
             class: "evaluate-btn",
             type: "primary",
             onClick: writeGuage,
-            disabled: unref(disabledEvaluate) || state.banStart
+            disabled: unref(disabledEvaluate) || unref(state).banStart
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString(unref(getEvaluateText)) + " ", 1),
               !unref(evaluateState).isTimeOut && unref(evaluateState).countdownStr ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                 createTextVNode("\uFF08" + toDisplayString(unref(evaluateState).countdownStr) + "\uFF09", 1)
-              ], 64)) : createCommentVNode("v-if", true)
+              ], 2112)) : createCommentVNode("v-if", true)
             ]),
             _: 1
           }, 8, ["disabled"])

package/es/packages/scale-view/src/components/NoData.vue_vue_type_script_setup_true_lang.mjs

@@ -8,7 +8,6 @@ const _hoisted_1 = { class: "no-data-tip NoData-page" };
 const _hoisted_2 = ["src"];
 const _hoisted_3 = { key: 1 };
 var script = /* @__PURE__ */ defineComponent({
-  name: "NoData",
   props: {
     noDataTip: {
       type: String,

package/es/packages/scale-view/src/components/composables/choose-common.d.ts

@@ -1,5 +1,5 @@
 export default function (props: any, state: any): {
-    choiceUseKey: import("vue").ComputedRef<"value" | "key">;
+    choiceUseKey: import("vue").ComputedRef<"key" | "value">;
     choiceColor: import("vue").ComputedRef<(p: any) => string>;
     showImgWrap: import("vue").ComputedRef<(o: any) => any>;
     isRadioItem: import("vue").ComputedRef<boolean>;

package/es/packages/scale-view/src/components/formitem/text-over-tooltip/TextOverTooltip.vue.d.ts

@@ -176,7 +176,6 @@ declare const _default: import("vue").DefineComponent<{
         onClickoutside: import("vue").PropType<(e: MouseEvent) => void>;
         'onUpdate:show': import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(value: boolean) => void>>;
         onUpdateShow: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(value: boolean) => void>>;
-        internalDeactivateImmediately: BooleanConstructor;
         internalSyncTargetWithParent: BooleanConstructor;
         internalInheritedEventHandlers: {
             type: import("vue").PropType<import("naive-ui/es/popover/src/Popover").TriggerEventHandlers[]>;
@@ -241,11 +240,10 @@ declare const _default: import("vue").DefineComponent<{
                 opacity5: string;
                 dividerColor: string;
                 borderColor: string;
-                closeIconColor: string;
-                closeIconColorHover: string;
-                closeIconColorPressed: string;
+                closeColor: string;
                 closeColorHover: string;
                 closeColorPressed: string;
+                closeColorDisabled: string;
                 clearColor: string;
                 clearColorHover: string;
                 clearColorPressed: string;
@@ -477,7 +475,6 @@ declare const _default: import("vue").DefineComponent<{
         onClickoutside: import("vue").PropType<(e: MouseEvent) => void>;
         'onUpdate:show': import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(value: boolean) => void>>;
         onUpdateShow: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(value: boolean) => void>>;
-        internalDeactivateImmediately: BooleanConstructor;
         internalSyncTargetWithParent: BooleanConstructor;
         internalInheritedEventHandlers: {
             type: import("vue").PropType<import("naive-ui/es/popover/src/Popover").TriggerEventHandlers[]>;
@@ -513,7 +510,6 @@ declare const _default: import("vue").DefineComponent<{
         arrowPointToCenter: boolean;
         displayDirective: "show" | "if";
         keepAliveOnHover: boolean;
-        internalDeactivateImmediately: boolean;
         animated: boolean;
         internalTrapFocus: boolean;
         defaultShow: boolean;