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

package/env.d.ts

@@ -1,38 +1,42 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-	readonly VITE_APP_TYPE: string;
-	// 更多环境变量...
-}
-
-interface ImportMeta {
-	readonly env: ImportMetaEnv;
-}
-
-import * as Vue from 'vue';
-
-declare module '*.vue' {
-	import type { App, defineComponent } from 'vue';
-	// // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
-	// // const component: DefineComponent<{}, {}, any>
-	const component: ReturnType<typeof defineComponent> & {
-		install(app: App): void;
-	};
-	export default component;
-}
-
-import { SlateDescendant, SlateElement, SlateText } from '@wangeditor/editor';
-declare module '@wangeditor/editor' {
-	// 扩展 Text
-	interface SlateText {
-		text: string;
-	}
-
-	// 扩展 Element
-	interface SlateElement {
-		type: string;
-		children: SlateDescendant[];
-	}
-}
-
-declare module '*.js';
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_APP_TYPE: string;
+  // 更多环境变量...
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
+
+import * as Vue from 'vue';
+
+
+declare module '*.vue' {
+// @ts-ignore
+  import type { App, defineComponent } from 'vue';
+  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+  // // const component: DefineComponent<{}, {}, any>
+  const component: ReturnType<typeof defineComponent> & {
+    install(app: App): void;
+  };
+  // @ts-ignore
+  export default component;
+}
+
+import { SlateDescendant, SlateElement, SlateText } from '@wangeditor/editor';
+
+declare module '@wangeditor/editor' {
+  // 扩展 Text
+  interface SlateText {
+    text: string;
+  }
+
+  // 扩展 Element
+  interface SlateElement {
+    type: string;
+    children: SlateDescendant[];
+  }
+}
+
+declare module '*.js';

package/es/packages/big-table/index2.mjs

@@ -1,5 +1,5 @@
-import { KEY_COMPONENT_NAME } from 'cnhis-design-vue/es/src/global/variable';
-import { safeComponentRegister, getComponentName } from 'cnhis-design-vue/es/src/utils';
+import { COMPONENT_NAMESPACE } from 'cnhis-design-vue/es/src/global/variable';
+import { safeComponentRegister } from 'cnhis-design-vue/es/src/utils';
 import { loadVxeTable } from 'cnhis-design-vue/es/src/utils/loadVxe';
 import { expandXEUtils } from 'cnhis-design-vue/es/src/utils/utilExpand';
 import { CGrid } from 'cnhis-design-vue/es/packages/index';
@@ -8,8 +8,8 @@ import script from './src/BigTable.vue_vue_type_script_setup_true_lang.mjs';
 
 const BigTable = script;
 BigTable.install = function(app) {
-  safeComponentRegister(app, BigTable, KEY_COMPONENT_NAME + getComponentName(BigTable));
-  safeComponentRegister(app, CGrid, KEY_COMPONENT_NAME + getComponentName(CGrid));
+  safeComponentRegister(app, BigTable, COMPONENT_NAMESPACE + "BigTable");
+  safeComponentRegister(app, CGrid, COMPONENT_NAMESPACE + "Grid");
   loadVxeTable(app);
   expandXEUtils();
 };

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.mjs

@@ -15,7 +15,7 @@ import SvgIcon from 'cnhis-design-vue/es/src/components/SvgIcon';
 import { useMessage, NIcon, NTooltip, NPopconfirm, NButton, NInputGroup, NInput, NCheckbox, NCheckboxGroup, NSpace, NProgress, NDropdown, NSwitch, NPopover } from 'naive-ui';
 import CGrid from 'cnhis-design-vue/es/packages/grid';
 import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
-import { handleTableHeight, setTableConfig, handleGroupColums, checkMethod, setTreeGroupTitle, handleName, handlerInitSearchItem, getEvaluate, getMapVal, getCandidateComponents, getageShowType, isLink, showFilter, reScrollFilterWrap, hideFilterWrap, mergeConObjFn, setDefaultFormData, handleImgArr, handleImgSrc, modalDetailImage, handleQrCodeContent, getInlineEditBtn, isCopy, setVisibleCheckAllWrap, setFilterStatus, handleTableImageSize, getRowStyle, getFooterGroup, flattenRow, intersectRow, removeCheckedDisabledRows } from './utils2.mjs';
+import { handleTableHeight, setTableConfig, handleGroupColums, checkMethod, setTreeGroupTitle, handleName, generateEditRender, handlerInitSearchItem, getEvaluate, getMapVal, getCandidateComponents, getageShowType, isLink, showFilter, reScrollFilterWrap, hideFilterWrap, mergeConObjFn, setDefaultFormData, handleImgArr, handleImgSrc, modalDetailImage, handleQrCodeContent, getInlineEditBtn, isCopy, setVisibleCheckAllWrap, setFilterStatus, handleTableImageSize, getRowStyle, getFooterGroup, flattenRow, intersectRow, removeCheckedDisabledRows } from './utils2.mjs';
 import xb_big from 'cnhis-design-vue/es/src/assets/img/xb_big.png';
 import qr from 'cnhis-design-vue/es/src/assets/img/qr.png';
 import script$1 from './components/NoData.vue_vue_type_script_setup_true_lang.mjs';
@@ -450,7 +450,8 @@ var script = /* @__PURE__ */ defineComponent({
                 return createVNode("span", null, [getDefaultValue(params, item)]);
               }
             }
-          }
+          },
+          editRender: isEdit ? {} : generateEditRender(item)
         });
         if (filterField && !props.isNestTable && !isScanMultiTable2) {
           state.filterFields[item.columnName] = Object.assign({}, vexutils.clone(item, true), {

package/es/packages/bpmn-workflow/index2.mjs

@@ -1,11 +1,11 @@
-import { KEY_COMPONENT_NAME } from 'cnhis-design-vue/es/src/global/variable';
-import { safeComponentRegister, getComponentName } from 'cnhis-design-vue/es/src/utils';
+import { COMPONENT_NAMESPACE } from 'cnhis-design-vue/es/src/global/variable';
+import { safeComponentRegister } from 'cnhis-design-vue/es/src/utils';
 import './src/BpmnWorkflow2.mjs';
 import script from './src/BpmnWorkflow.vue_vue_type_script_setup_true_lang.mjs';
 
 const BpmnWorkflow = script;
 BpmnWorkflow.install = function(app) {
-  safeComponentRegister(app, BpmnWorkflow, KEY_COMPONENT_NAME + getComponentName(BpmnWorkflow));
+  safeComponentRegister(app, BpmnWorkflow, COMPONENT_NAMESPACE + "BpmnWorkflow");
 };
 
 export { BpmnWorkflow as default };

package/es/packages/button-print/index2.mjs

@@ -1,11 +1,11 @@
-import { KEY_COMPONENT_NAME } from 'cnhis-design-vue/es/src/global/variable';
-import { safeComponentRegister, getComponentName } from 'cnhis-design-vue/es/src/utils';
+import { COMPONENT_NAMESPACE } from 'cnhis-design-vue/es/src/global/variable';
+import { safeComponentRegister } from 'cnhis-design-vue/es/src/utils';
 import './src/ButtonPrint2.mjs';
 import script from './src/ButtonPrint.vue_vue_type_script_setup_true_lang.mjs';
 
 const ButtonPrint = script;
 ButtonPrint.install = function(app) {
-  safeComponentRegister(app, ButtonPrint, KEY_COMPONENT_NAME + getComponentName(ButtonPrint));
+  safeComponentRegister(app, ButtonPrint, COMPONENT_NAMESPACE + "ButtonPrint");
 };
 
 export { ButtonPrint as default };

package/es/packages/chunk-upload/index2.mjs

@@ -1,15 +1,15 @@
-import { KEY_COMPONENT_NAME } from 'cnhis-design-vue/es/src/global/variable';
+import { COMPONENT_NAMESPACE } from 'cnhis-design-vue/es/src/global/variable';
 import './src/vod-chunk-upload/vod-chunk-upload2.mjs';
 import uploader from 'vue-simple-uploader';
 import 'vue-simple-uploader/dist/style.css';
-import { safeComponentRegister, getComponentName } from 'cnhis-design-vue/es/src/utils';
+import { safeComponentRegister } from 'cnhis-design-vue/es/src/utils';
 import { expandXEUtils } from 'cnhis-design-vue/es/src/utils/utilExpand';
 import script from './src/vod-chunk-upload/vod-chunk-upload.vue_vue_type_script_setup_true_lang.mjs';
 
 const VodChunkUpload = script;
 VodChunkUpload.install = function(app) {
   app.use(uploader);
-  safeComponentRegister(app, VodChunkUpload, KEY_COMPONENT_NAME + getComponentName(VodChunkUpload));
+  safeComponentRegister(app, VodChunkUpload, COMPONENT_NAMESPACE + "VodChunkUpload");
   expandXEUtils();
 };
 

package/es/packages/drag-layout/index2.mjs

@@ -1,12 +1,12 @@
-import { KEY_COMPONENT_NAME } from 'cnhis-design-vue/es/src/global/variable';
-import { safeComponentRegister, getComponentName } from 'cnhis-design-vue/es/src/utils';
+import { COMPONENT_NAMESPACE } from 'cnhis-design-vue/es/src/global/variable';
+import { safeComponentRegister } from 'cnhis-design-vue/es/src/utils';
 import { expandXEUtils } from 'cnhis-design-vue/es/src/utils/utilExpand';
 import './src/DragLayout2.mjs';
 import script from './src/DragLayout.vue_vue_type_script_setup_true_lang.mjs';
 
 const DragLayout = script;
 DragLayout.install = function(app) {
-  safeComponentRegister(app, DragLayout, KEY_COMPONENT_NAME + getComponentName(DragLayout));
+  safeComponentRegister(app, DragLayout, COMPONENT_NAMESPACE + "DragLayout");
   expandXEUtils();
 };
 

package/es/packages/editor/index2.mjs

@@ -1,10 +1,10 @@
-import { KEY_COMPONENT_NAME } from 'cnhis-design-vue/es/src/global/variable';
-import { safeComponentRegister, getComponentName } from 'cnhis-design-vue/es/src/utils';
+import { COMPONENT_NAMESPACE } from 'cnhis-design-vue/es/src/global/variable';
+import { safeComponentRegister } from 'cnhis-design-vue/es/src/utils';
 import script from './src/Editor2.mjs';
 
 const Editor = script;
 Editor.install = function(app) {
-  safeComponentRegister(app, Editor, KEY_COMPONENT_NAME + getComponentName(Editor));
+  safeComponentRegister(app, Editor, COMPONENT_NAMESPACE + "Editor");
 };
 
 export { Editor as default };

package/es/packages/field-set/index2.mjs

@@ -1,11 +1,11 @@
-import { KEY_COMPONENT_NAME } from 'cnhis-design-vue/es/src/global/variable';
-import { safeComponentRegister, getComponentName } from 'cnhis-design-vue/es/src/utils';
+import { COMPONENT_NAMESPACE } from 'cnhis-design-vue/es/src/global/variable';
+import { safeComponentRegister } from 'cnhis-design-vue/es/src/utils';
 import './src/index3.mjs';
 import script from './src/index.vue_vue_type_script_setup_true_lang2.mjs';
 
 const FieldSet = script;
 FieldSet.install = function(app) {
-  safeComponentRegister(app, FieldSet, KEY_COMPONENT_NAME + getComponentName(FieldSet));
+  safeComponentRegister(app, FieldSet, COMPONENT_NAMESPACE + "FieldSet");
 };
 
 export { FieldSet as default };

package/es/packages/form-render/index2.mjs

@@ -1,5 +1,5 @@
-import { KEY_COMPONENT_NAME } from 'cnhis-design-vue/es/src/global/variable';
-import { safeComponentRegister, getComponentName } from 'cnhis-design-vue/es/src/utils';
+import { COMPONENT_NAMESPACE } from 'cnhis-design-vue/es/src/global/variable';
+import { safeComponentRegister } from 'cnhis-design-vue/es/src/utils';
 import './src/FormRender2.mjs';
 import '@formily/core';
 import 'vue';
@@ -9,7 +9,7 @@ import script from './src/FormRender.vue_vue_type_script_setup_true_lang.mjs';
 
 const FormRender = script;
 FormRender.install = function(app) {
-  safeComponentRegister(app, FormRender, KEY_COMPONENT_NAME + getComponentName(FormRender));
+  safeComponentRegister(app, FormRender, COMPONENT_NAMESPACE + "FormRender");
 };
 
 export { FormRender as default };

package/es/packages/form-render/src/FormRender.vue_vue_type_script_setup_true_lang.mjs

@@ -72,7 +72,7 @@ var script = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("section", {
-        class: "formily-render__wrapper",
+        class: "form-render__wrapper",
         style: normalizeStyle({ "--column": __props.column })
       }, [
         createVNode(unref(FormProvider), { form: unref(formModel) }, {

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

@@ -1,6 +1,6 @@
 import { AnyObject } from 'cnhis-design-vue/es/src/types';
-import { FormRequestType } from "../types";
-import { PropType } from "vue";
+import { FormRequestType } from '../types';
+import { PropType } from 'vue';
 declare type UrlConfig = {
     method: FormRequestType;
     nameKey: string;

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, inject, computed, watch, createVNode, mergeProps } from 'vue';
+import { defineComponent, ref, inject, computed, watch, createVNode, Fragment, mergeProps } from 'vue';
 import { InjectAsyncQueue } from '../constants/index2.mjs';
 import { assignUpdateValue, formRenderLog } from '../utils/index2.mjs';
 import { isObject } from '@vueuse/core';
@@ -37,7 +37,9 @@ const script = defineComponent({
       if (!option && _options.value)
         return;
       const config = props.urlConfig;
-      if (!config || !isObject(config)) {
+      if (!config)
+        return;
+      if (!isObject(config)) {
         formRenderLog(`invalid urlConfig (${config}) in CASCADER => ${title.value}`, "warn");
         return;
       }
@@ -80,24 +82,36 @@ const script = defineComponent({
     }, {
       immediate: true
     });
-    const cascaderRef = ref();
-    function updateValue(v) {
-      emit("update:value", v);
+    function updateValue(v, _, options) {
+      var _a;
+      const payload = (_a = options == null ? void 0 : options.map((option) => option[labelKey.value])) == null ? void 0 : _a.join(" / ");
+      emit("update:value", payload);
     }
+    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";
+    });
+    const _attrs = computed(() => {
+      return {
+        ...attrs,
+        onChange: void 0
+      };
+    });
     return () => {
-      var _a, _b, _c, _d;
-      return createVNode(NCascader, mergeProps({
-        "ref": cascaderRef
-      }, attrs, {
+      return createVNode(Fragment, null, [createVNode(NCascader, mergeProps(_attrs.value, {
         "onUpdate:value": updateValue,
         "remote": true,
-        "labelField": (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text",
-        "valueField": (_d = (_c = props.urlConfig) == null ? void 0 : _c.valueKey) != null ? _d : "value",
+        "labelField": labelKey.value,
+        "valueField": valueKey.value,
         "options": renderOptions.value,
         "checkStrategy": "child",
         "onLoad": fetchData,
         "onUpdate:show": (show) => show && fetchData()
-      }), slots);
+      }), slots)]);
     };
   }
 });

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

@@ -32,12 +32,12 @@ const script = defineComponent({
     }
     return () => {
       return createVNode("section", {
-        "class": "formily-render__collapse"
+        "class": "form-render__collapse"
       }, [createVNode("header", {
-        "class": "formily-render__collapseHeader",
+        "class": "form-render__collapseHeader",
         "onClick": toggleShow
       }, [props.title]), createVNode(NCollapseTransition, {
-        "class": "formily-render__collapseItem",
+        "class": "form-render__collapseItem",
         "show": _show.value,
         "appear": false
       }, slots)]);

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

@@ -81,10 +81,12 @@ const script = defineComponent({
     const FormRenderComponent = script$1;
     return () => {
       return createVNode("section", {
-        "class": "formily-render__combination"
+        "class": "form-render__combination"
       }, [createVNode("header", {
-        "class": "formily-render__combinationHeader"
-      }, [createVNode("h3", null, [createTextVNode(" "), props.title]), createVNode(NButton, {
+        "class": "form-render__combinationHeader"
+      }, [createVNode("div", {
+        "class": "form-render__combinationHeaderText"
+      }, [props.title]), createVNode(NButton, {
         "onClick": add,
         "type": "info",
         "text": true
@@ -94,7 +96,7 @@ const script = defineComponent({
         length: combinationRepeat.value
       }).map((_, idx) => {
         return createVNode("section", {
-          "class": "formily-render__combinationContent"
+          "class": "form-render__combinationContent"
         }, [createVNode(FormRenderComponent, {
           "initialData": toRaw(_values.value[idx]) || {},
           "schema": _schema.value,
@@ -104,7 +106,7 @@ const script = defineComponent({
           "onChange": stop,
           "onFormChange": (payload) => onChange(idx, payload)
         }, null), idx !== 0 ? createVNode("i", {
-          "class": "formily-render__combinationClose",
+          "class": "form-render__combinationClose",
           "onClick": () => remove(idx)
         }, ["-"]) : null]);
       })]);

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

@@ -10,7 +10,7 @@ const FORM_ITEM = connect(NFormItem, mapProps({
   return {
     ...props,
     required: field.required,
-    class: "formily-render__formItem",
+    class: "form-render__formItem",
     style: {
       "--form-item-column": (_a = props.span) != null ? _a : 3
     },

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

@@ -2,7 +2,7 @@ import { connect, mapProps } from '@formily/vue';
 import { NInputGroup } from 'naive-ui';
 
 const INPUT_GROUP = connect(NInputGroup, mapProps((props) => {
-  return { style: { "--column": props.span || 3 }, class: "formily-render__inputGroup" };
+  return { style: { "--column": props.span || 3 }, class: "form-render__inputGroup" };
 }));
 
 export { INPUT_GROUP };

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

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

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

@@ -103,7 +103,7 @@ function useFieldList2Schema(collector) {
       step: item.step_length,
       max: item.max_length,
       min: item.min_length,
-      options: item.option
+      option: item.option
     });
     return schema;
   };

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

@@ -36,7 +36,7 @@ function useFormValidator() {
       });
     }
     if (max_length) {
-      rules.push({ len: max_length, message });
+      rules.push({ max: max_length, message });
     }
     const ruleCreator = vali_obj && validateMap.get(vali_obj);
     ruleCreator && rules.push(Object.assign({}, commonValidateConfig, ruleCreator(fieldItem)));

package/es/packages/form-render/src/types/fieldItem.d.ts

@@ -14,6 +14,7 @@ export declare type ValidateItem = Partial<{
 interface OptionItem {
     text: string;
     value: string;
+    children?: OptionItem[];
 }
 export interface Ievent {
     event_field: string;

package/es/packages/form-render/style/index.css

@@ -1,18 +1,18 @@
-.formily-render__wrapper {
+.form-render__wrapper {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
   gap: 0 8px;
 }
-.formily-render__formItem {
+.form-render__formItem {
   grid-column: span var(--form-item-column) / span var(--form-item-column);
 }
-.formily-render__formItem .n-date-picker {
+.form-render__formItem .n-date-picker {
   width: 100%;
 }
-.formily-render__collapse {
+.form-render__collapse {
   grid-column: span var(--column) / span var(--column);
 }
-.formily-render__collapseHeader {
+.form-render__collapseHeader {
   cursor: pointer;
   display: flex;
   background: #fafafa;
@@ -22,44 +22,48 @@
   margin-bottom: 8px;
   border: 1px solid #d9d9d9;
 }
-.formily-render__collapseItem {
+.form-render__collapseItem {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
   gap: 0 8px;
 }
-.formily-render__inputGroup {
+.form-render__inputGroup {
   grid-column: span var(--column) / span var(--column);
   display: flex;
   align-items: flex-end;
 }
-.formily-render__inputGroup > div {
+.form-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 {
+.form-render__inputGroup > div:not(:last-of-type) .n-input__border,
+.form-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 {
+.form-render__inputGroup > div:last-of-type .n-input__border,
+.form-render__inputGroup > div:last-of-type .n-base-selection__border {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
-.formily-render__combination {
+.form-render__combination {
   width: 100%;
 }
-.formily-render__combinationHeader {
+.form-render__combinationHeader {
   display: flex;
   gap: 12px;
 }
-.formily-render__combinationHeader > h3 {
+.form-render__combinationHeader > h3 {
   font-size: 16px;
   font-weight: 700;
   padding: 0;
   margin: 0;
 }
-.formily-render__combinationClose {
+.form-render__combinationHeaderText {
+  font-size: 16px;
+  font-weight: 500;
+}
+.form-render__combinationClose {
   position: absolute;
   right: 0;
   top: 5px;
@@ -75,6 +79,6 @@
   vertical-align: middle;
   font-size: 16px;
 }
-.formily-render__combinationContent {
+.form-render__combinationContent {
   position: relative;
 }