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

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

@@ -1,116 +1,121 @@
-@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;
-    }
-  }
-}
+@block: ~"form-render";
+
+#form-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;
+  }
+}
+
+#form-input-group(@direction) {
+  border-bottom-@{direction}-radius: 0;
+  border-top-@{direction}-radius: 0;
+}
+
+.@{block} {
+  @display: #form-grid .display(var(--column));
+  @item: #form-grid .item(var(--column));
+  @form-item: #form-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;
+          #form-input-group(right);
+        }
+      }
+
+      &:last-of-type {
+        .n-input__border,
+        .n-base-selection__border {
+          #form-input-group(left);
+        }
+      }
+    }
+  }
+
+  &__combination {
+    width: 100%;
+
+    &Header {
+      > h3 {
+        font-size: 16px;
+        font-weight: 700;
+        padding: 0;
+        margin: 0;
+      }
+
+      display: flex;
+      gap: 12px;
+    }
+
+    &HeaderText {
+      font-size: 16px;
+      font-weight: 500;
+    }
+
+    &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/form-table/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/FormTable2.mjs';
 import script from './src/FormTable.vue_vue_type_script_setup_true_lang.mjs';
 
 const FormTable = script;
 FormTable.install = function(app) {
-  safeComponentRegister(app, FormTable, KEY_COMPONENT_NAME + getComponentName(FormTable));
+  safeComponentRegister(app, FormTable, COMPONENT_NAMESPACE + "FormTable");
 };
 
 export { FormTable as default };

package/es/packages/grid/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 { loadVxeTable } from 'cnhis-design-vue/es/src/utils/loadVxe';
 import { expandXEUtils } from 'cnhis-design-vue/es/src/utils/utilExpand';
 import script from './src/Grid2.mjs';
 
 const Grid = script;
 Grid.install = function(app) {
-  safeComponentRegister(app, Grid, KEY_COMPONENT_NAME + getComponentName(Grid));
+  safeComponentRegister(app, Grid, COMPONENT_NAMESPACE + "Grid");
   loadVxeTable(app);
   expandXEUtils();
 };

package/es/packages/index.css

@@ -2588,21 +2588,21 @@ body > .vxe-table--tooltip-wrapper {
   font-size: 14px;
   text-decoration: none !important;
 }
-.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;
@@ -2612,44 +2612,48 @@ body > .vxe-table--tooltip-wrapper {
   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;
@@ -2665,6 +2669,6 @@ body > .vxe-table--tooltip-wrapper {
   vertical-align: middle;
   font-size: 16px;
 }
-.formily-render__combinationContent {
+.form-render__combinationContent {
   position: relative;
 }

package/es/packages/index.d.ts

@@ -14,10 +14,10 @@ import CInfoHeader from './info-header';
 import CTimeLine from './time-line';
 import CBpmnWorkflow from './bpmn-workflow';
 import Editor from './editor';
-import FormRender from './form-render';
+import CFormRender 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 };
+export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CFormTable, CInfoHeader, CTimeLine, CBpmnWorkflow, Editor, CFormRender };
 declare const _default: {
     install: typeof install;
 };

package/es/packages/index.less

@@ -2942,120 +2942,125 @@ 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;
-    }
-  }
-}
+@block: ~"form-render";
+
+#form-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;
+  }
+}
+
+#form-input-group(@direction) {
+  border-bottom-@{direction}-radius: 0;
+  border-top-@{direction}-radius: 0;
+}
+
+.@{block} {
+  @display: #form-grid .display(var(--column));
+  @item: #form-grid .item(var(--column));
+  @form-item: #form-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;
+          #form-input-group(right);
+        }
+      }
+
+      &:last-of-type {
+        .n-input__border,
+        .n-base-selection__border {
+          #form-input-group(left);
+        }
+      }
+    }
+  }
+
+  &__combination {
+    width: 100%;
+
+    &Header {
+      > h3 {
+        font-size: 16px;
+        font-weight: 700;
+        padding: 0;
+        margin: 0;
+      }
+
+      display: flex;
+      gap: 12px;
+    }
+
+    &HeaderText {
+      font-size: 16px;
+      font-weight: 500;
+    }
+
+    &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,7 +13,7 @@ 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 { default as CFormRender } 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';

package/es/packages/index2.mjs

@@ -29,7 +29,7 @@ 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';
+export { default as CFormRender } from './form-render/index2.mjs';
 
 const components = {
   CGrid: Grid,
@@ -52,7 +52,7 @@ const components = {
   CTimeLine: TimeLine,
   CBpmnWorkflow: BpmnWorkflow,
   Editor,
-  FormRender
+  CFormRender: FormRender
 };
 function install(app) {
   Object.values(components).forEach((component) => {

package/es/packages/info-header/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/InfoHeader2.mjs';
 import script from './src/InfoHeader.vue_vue_type_script_setup_true_lang.mjs';
 
 const InfoHeader = script;
 InfoHeader.install = function(app) {
-  safeComponentRegister(app, InfoHeader, KEY_COMPONENT_NAME + getComponentName(InfoHeader));
+  safeComponentRegister(app, InfoHeader, COMPONENT_NAMESPACE + "InfoHeader");
 };
 
 export { InfoHeader as default };

package/es/packages/map/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/Map2.mjs';
 import script from './src/Map.vue_vue_type_script_setup_true_lang.mjs';
 
 const Map = script;
 Map.install = function(app) {
-  safeComponentRegister(app, Map, KEY_COMPONENT_NAME + getComponentName(Map));
+  safeComponentRegister(app, Map, COMPONENT_NAMESPACE + "Map");
 };
 
 export { Map as default };