nuxt-hs-ui 2.12.1 → 2.12.2

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.15.0"
   },
-  "version": "2.12.1",
+  "version": "2.12.2",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/runtime/components/form/radio.vue

@@ -220,12 +220,15 @@ interface SelectItemShow extends DisplaySelectItem<IdType> {
 }
 const displayList: Ref<SelectItemShow[]> = ref([]);
 
+const baseList = computed(() => {
+  return ObjectCopy(props.list).map((row) => {
+    return { ...row, text: gt(row.text) };
+  });
+});
+
 const setDisplayList = () => {
-  // console.log("setDisplayList");
   displayList.value = useDisplayList<IdType>({
-    list: ObjectCopy(props.list).map((row) => {
-      return { ...row, text: gt(row.text) };
-    }),
+    list: baseList.value,
     id: props.data,
     order: props.order,
     unKnownData: unKnownData.value,
@@ -242,16 +245,25 @@ const setDisplayList = () => {
     };
   }) as SelectItemShow[];
 };
+watch(
+  () => props.list,
+  () => {
+    nextTick(() => {
+      setDisplayList();
+    });
+  },
+  { deep: true }
+);
 
 watch(
   () => [
-    props.list,
-    props.list.length,
     props.data,
     isShowHidden.value,
     props.require,
     props.nullable,
     props.nullText,
+    unKnownSelected.value,
+    displayData.value,
   ],
   () => {
     nextTick(() => {
@@ -263,7 +275,7 @@ watch(
 // ----------------------------------------------------------------------------
 
 const checkData = (id: IdType | null) => {
-  const ret = displayList.value.find((row) => row.id === id);
+  const ret = baseList.value.find((row) => row.id === id);
   if (ret === undefined) {
     // 選択肢に存在しないコード引当
     unKnownSelected.value = true;
@@ -281,7 +293,7 @@ watch(
     checkData(id);
   }
 );
-watch(displayList, () => {
+watch(baseList, () => {
   // console.log("change list");
   nextTick(() => {
     checkData(props.data);

package/dist/runtime/components/form/select.vue

@@ -208,6 +208,33 @@ const includeHidden = computed(() => {
 // ----------------------------------------------------------------------------
 /** 選択肢 */
 const displayList = ref<DisplaySelectItem<IdType>[]>([]);
+const baseList = computed(() => {
+  return ObjectCopy(props.list).map((row) => {
+    return { ...row, text: gt(row.text) };
+  });
+});
+
+const setDisplayList = () => {
+  displayList.value = useDisplayList<IdType>({
+    list: baseList.value,
+    id: props.data,
+    order: props.order,
+    unKnownData: unKnownData.value,
+    unKnownSelected: unKnownSelected.value,
+    isShowHidden: isShowHidden.value,
+    require: props.require || !props.nullable,
+    nullText: tx(props.nullText).value,
+  });
+};
+watch(
+  () => props.list,
+  () => {
+    nextTick(() => {
+      setDisplayList();
+    });
+  },
+  { deep: true }
+);
 
 watch(
   () => [
@@ -220,41 +247,18 @@ watch(
     props.nullText,
   ],
   () => {
-    displayList.value = useDisplayList<IdType>({
-      list: ObjectCopy(props.list).map((row) => {
-        return { ...row, text: gt(row.text) };
-      }),
-      id: props.data,
-      order: props.order,
-      unKnownData: unKnownData.value,
-      unKnownSelected: unKnownSelected.value,
-      isShowHidden: isShowHidden.value,
-      require: props.require || !props.nullable,
-      nullText: tx(props.nullText).value,
+    nextTick(() => {
+      setDisplayList();
     });
   },
   { immediate: true }
 );
-// const displayList = computed(() => {
-//   console.log("displayList");
-//   return useDisplayList<IdType>({
-//     list: ObjectCopy(props.list).map((row) => {
-//       return { ...row, text: gt(row.text) };
-//     }),
-//     id: props.data,
-//     order: props.order,
-//     unKnownData: unKnownData.value,
-//     unKnownSelected: unKnownSelected.value,
-//     isShowHidden: isShowHidden.value,
-//     require: props.require || !props.nullable,
-//     nullText: tx(props.nullText).value,
-//   });
-// });
+
 // ----------------------------------------------------------------------------
 
 const checkData = (id: IdType | null) => {
   // console.log("checkData");
-  const ret = displayList.value.find((row) => row.id === id);
+  const ret = baseList.value.find((row) => row.id === id);
   if (ret === undefined) {
     // 選択肢に存在しないコード引当
     unKnownSelected.value = true;
@@ -272,7 +276,7 @@ watch(
     checkData(id);
   }
 );
-watch(displayList, () => {
+watch(baseList, () => {
   // console.log("change list");
   nextTick(() => {
     checkData(props.data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-hs-ui",
-  "version": "2.12.1",
+  "version": "2.12.2",
   "description": "My new Nuxt module",
   "repository": "https://github.com/hare-systems-ryo/nuxt-hs-ui",
   "license": "MIT",