cnhis-design-vue 3.1.18-beta.3 → 3.1.18-beta.4

package/es/components/big-table/src/BigTable.vue.d.ts

@@ -1247,9 +1247,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorTextHoverPrimary: string;
                 textColorTextPressedPrimary: string;
                 textColorTextFocusPrimary: string;
-                textColorTextDisabledPrimary: string; /**
-                 * tsx渲染表格
-                 */
+                textColorTextDisabledPrimary: string;
                 textColorGhostPrimary: string;
                 textColorGhostHoverPrimary: string;
                 textColorGhostPressedPrimary: string;
@@ -1328,7 +1326,6 @@ declare const _default: import("vue").DefineComponent<{
                 textColorTextPressedWarning: string;
                 textColorTextFocusWarning: string;
                 textColorTextDisabledWarning: string;
-                /** string */
                 textColorGhostWarning: string;
                 textColorGhostHoverWarning: string;
                 textColorGhostPressedWarning: string;

package/es/components/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -1318,8 +1318,15 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const handlerClickRow = (data) => {
       var _a;
-      if (((_a = attr.checkboxConfig) == null ? void 0 : _a.trigger) === "default")
+      let {
+        row,
+        $event = {},
+        $rowIndex
+      } = data;
+      if (((_a = attr.checkboxConfig) == null ? void 0 : _a.trigger) === "default") {
+        emit("handlerClickRow", row, $rowIndex);
         return false;
+      }
       if (isScanMultiTable.value || props.isInlineOperating)
         return false;
       if (XEUtils.has(data == null ? void 0 : data.row, GROUP_TITLE_KEY))
@@ -1328,11 +1335,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return false;
       let table = xGrid.value;
       isAboutNestTable.value && emit("resetNestLastClickTable", table);
-      let {
-        row,
-        $event = {},
-        $rowIndex
-      } = data;
       let {
         className,
         tagName

package/es/components/field-set/src/FieldSet.js

@@ -36,15 +36,15 @@ const _hoisted_18 = /* @__PURE__ */ createElementVNode("span", {
 const _hoisted_19 = /* @__PURE__ */ createElementVNode("span", null, "\u62D6\u62FD\u8C03\u6574\u987A\u5E8F", -1);
 const _hoisted_20 = /* @__PURE__ */ createElementVNode("span", { style: { "width": "14px", "margin-right": "6px" } }, null, -1);
 const _hoisted_21 = { class: "width-show" };
-const _hoisted_22 = { class: "width-show" };
-const _hoisted_23 = {
+const _hoisted_22 = {
   key: 0,
   class: "width-show"
 };
-const _hoisted_24 = {
+const _hoisted_23 = {
   key: 1,
   class: "width-show"
 };
+const _hoisted_24 = { class: "width-show" };
 const _hoisted_25 = { class: "width-showed" };
 const _hoisted_26 = { class: "width-word" };
 const _hoisted_27 = { class: "width-showed" };
@@ -86,7 +86,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       columnName: "name",
       isShow: "show",
       isSort: "sort",
-      isFixed: "fixedShow",
+      isFixed: "fixedWay",
       colWidth: "columnWidth"
     };
     const selectOptions = [
@@ -110,11 +110,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         result.forEach((item) => {
           if (props.type == "old") {
             if (Reflect.has(item, key)) {
-              item[fieldsMapping[key]] = item[key];
+              if (key == "isFixed") {
+                item["fixedWay"] = item[key] == 1 ? "LEFT" : item[key] == 2 ? "RIGHT" : "NONE";
+              } else {
+                item[fieldsMapping[key]] = item[key];
+              }
               Reflect.deleteProperty(item, key);
             }
           }
-          item.columnWidth = Number(item.columnWidth);
+          item.columnWidth = +item.columnWidth;
+          if (!Reflect.has(item, "alias")) {
+            item.alias = "";
+          }
         });
       });
       return result;
@@ -151,7 +158,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               visible: item.show,
               sequence: i,
               sortable: item.sort,
-              title: item.alias || item.title,
+              title: item.alias,
               fixed: item.fixedWay,
               minWidth: item.columnWidth,
               ...props.isEdit ? {
@@ -317,18 +324,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             [vShow, element.id != "0001"]
                           ])
                         ]),
-                        createCommentVNode(" \u6392\u5E8F "),
-                        createElementVNode("span", _hoisted_22, [
-                          withDirectives(createVNode(unref(NCheckbox), {
-                            checked: element.sort,
-                            "onUpdate:checked": ($event) => element.sort = $event,
-                            disabled: element.notParticipatingSort == 1
-                          }, null, 8, ["checked", "onUpdate:checked", "disabled"]), [
-                            [vShow, element.id != "0001"]
-                          ])
-                        ]),
                         createCommentVNode(" \u662F\u5426\u53EF\u7F16\u8F91 "),
-                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_23, [
+                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_22, [
                           withDirectives(createVNode(unref(NCheckbox), {
                             checked: element.editable,
                             "onUpdate:checked": ($event) => element.editable = $event
@@ -337,7 +334,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           ])
                         ])) : createCommentVNode("v-if", true),
                         createCommentVNode(" \u662F\u5426\u5FC5\u586B "),
-                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_24, [
+                        __props.isEdit ? (openBlock(), createElementBlock("span", _hoisted_23, [
                           withDirectives(createVNode(unref(NCheckbox), {
                             checked: element.required,
                             "onUpdate:checked": ($event) => element.required = $event
@@ -345,6 +342,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                             [vShow, element.id != "0001"]
                           ])
                         ])) : createCommentVNode("v-if", true),
+                        createCommentVNode(" \u6392\u5E8F "),
+                        createElementVNode("span", _hoisted_24, [
+                          withDirectives(createVNode(unref(NCheckbox), {
+                            checked: element.sort,
+                            "onUpdate:checked": ($event) => element.sort = $event,
+                            disabled: element.notParticipatingSort == 1
+                          }, null, 8, ["checked", "onUpdate:checked", "disabled"]), [
+                            [vShow, element.id != "0001"]
+                          ])
+                        ]),
                         createCommentVNode(" \u56FA\u5B9A "),
                         createElementVNode("span", _hoisted_25, [
                           createVNode(unref(NSelect), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.18-beta.3",
+  "version": "3.1.18-beta.4",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -65,5 +65,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "13b68795262713182c56b95ae0b446825b5fbfdb"
+  "gitHead": "74f97589ab3118a2398496092cc07d6a47e2aa6e"
 }