bfg-common 1.4.630 → 1.4.631

package/assets/scss/components/auth.scss

@@ -154,10 +154,31 @@
     margin-bottom: 48px;
   }
   &__input {
-    :deep(.ui-main-input),
-    :deep(.ui-main-input:not(:placeholder-shown) + .ui-input-label) {
+    :deep(.ui-main-input) {
       background-color: #fafafa;
     }
+    :deep(input.ui-main-input:-internal-autofill-selected),
+    :deep(input.ui-main-input:-internal-autofill-selected:hover),
+    :deep(input.ui-main-input:-internal-autofill-selected:active),
+    :deep(input.ui-main-input:-internal-autofill-selected:focus) {
+      appearance: menulist-button;
+      background-image: none !important;
+      background-color: #fafafa !important;
+      color: fieldtext !important;
+      -webkit-background-clip: text;
+    }
+
+    :deep(input.ui-main-input:-internal-autofill-selected:focus) {
+      & + label.ui-input-label {
+        position: absolute;
+        font-size: 14px;
+        top: -8.85px;
+
+        & + .label-background {
+          display: block;
+        }
+      }
+    }
     &.password {
       margin-top: 16px;
     }

package/components/common/pages/home/widgets/services/ServicesNew.vue

@@ -56,7 +56,7 @@ const props = defineProps<{
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const data = computed<UI_I_DataTable>(() => ({
-  id: '0',
+  id: 'services',
   header: resentTaskHeadItems.value,
   body: resentTaskBodyItems.value,
 }))

package/components/common/pages/home/widgets/warnings/WarningsNew.vue

@@ -56,7 +56,7 @@ const props = defineProps<{
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const data = computed<UI_I_DataTable>(() => ({
-  id: '0',
+  id: 'warnings',
   header: resentTaskHeadItems.value,
   body: resentTaskBodyItems.value,
 }))

package/components/common/portlets/customAttributes/Portlet.vue

@@ -352,7 +352,7 @@ watch(
 )
 
 const data = computed<UI_I_DataTable>(() => ({
-  id: '0',
+  id: 'attributes',
   selectedRows: [],
   isAllSelected: false,
   title: '',

package/components/common/portlets/tag/Portlet.vue

@@ -220,7 +220,7 @@ const tagsAssignBodyItems = ref<UI_I_DataTableBody[]>(
 )
 
 const data = computed<UI_I_DataTable>(() => ({
-  id: '0',
+  id: 'tags',
   selectedRows: [],
   isAllSelected: false,
   title: '',
@@ -230,7 +230,7 @@ const data = computed<UI_I_DataTable>(() => ({
 }))
 
 const assignData = computed<UI_I_DataTable>(() => ({
-  id: '1',
+  id: 'tags-assign',
   selectedRows: [],
   isAllSelected: false,
   title: '',

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newNetwork/location/new/table/Table.vue

@@ -43,7 +43,7 @@ const emits = defineEmits<{
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const data = computed<UI_I_DataTable>(() => ({
-  id: '1',
+  id: 'new-network-location',
   header: headItems.value,
   body: bodyItems.value,
 }))

package/components/common/vm/actions/common/select/storage/new/lib/config/table.ts

@@ -5,7 +5,7 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 export const tableDataFunc = (
   localization: UI_I_Localization
 ): UI_I_DataTable => ({
-  id: '0',
+  id: 'select-storage',
   header: [
     {
       col: 0,

package/modules/fixContentBuild/index.ts

@@ -19,7 +19,6 @@ import {
 // }
 
 const npmGenerate = (): void => {
-  console.log('npmGenerate', 222);
   // Правим путь к файлу
   const filePath = path.join(
     __dirname.replace('/bfg-common/modules/fixContentBuild', ''),
@@ -31,19 +30,17 @@ const npmGenerate = (): void => {
     'composables',
     'query.js'
   )
-  console.log(333);
   const searchString = '/query/${hash(params)}'
   const replacementString = 'cache'
   replaceFileContent(filePath, searchString, replacementString)
   // End block
-  console.log(444);
+
   // Переносим весь контент и удаляем все файлы кроме картинок
   const contentPath = path.join(
     __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
     'content',
     'help'
   )
-  console.log(contentPath, 555, !fs.existsSync(contentPath));
   if (!fs.existsSync(contentPath)) return
 
   const publicPath = path.join(
@@ -51,9 +48,7 @@ const npmGenerate = (): void => {
     'public',
     'images'
   )
-  console.log(777,contentPath, publicPath);
   fs.cp(contentPath, publicPath, { recursive: true }, () => {
-    console.log(888);
     // Удаляем все файлы кроме картинок
     removeNonImageFiles(publicPath)
 
@@ -68,7 +63,6 @@ const npmGenerate = (): void => {
 
 // @ts-ignore
 export default defineNuxtModule(() => {
-  console.log(process.env.npm_command, 444);
   switch (process.env.npm_command) {
     case 'run-script':
       // npmDev()

package/modules/fixContentBuild/lib/utils/methods.ts

@@ -1,118 +1,115 @@
-import path from 'path'
-import fs from 'fs'
-
-const isImage = (fileName: string) => {
-  const imageExtensions = ['.png', '.jpeg', '.jpg']
-  return imageExtensions.some(
-    (ext) => path.extname(fileName).toLowerCase() === ext
-  )
-}
-const isMdFile = (fileName: string) => {
-  return path.extname(fileName).toLowerCase() === '.md'
-}
-
-export const removeNonImageFiles = (dirPath: string) => {
-  fs.readdirSync(dirPath).forEach((file: string) => {
-    const filePath = path.join(dirPath, file)
-    const isDir = fs.lstatSync(filePath).isDirectory()
-
-    if (isDir) {
-      removeNonImageFiles(filePath)
-    } else {
-      if (!isImage(file)) {
-        fs.unlinkSync(filePath)
-      }
-    }
-  })
-}
-
-export const removeImagesFromContent = (dirPath: string) => {
-  fs.readdirSync(dirPath).forEach((file: string) => {
-    const filePath = path.join(dirPath, file)
-    const isDir = fs.lstatSync(filePath).isDirectory()
-
-    if (isDir) {
-      removeImagesFromContent(filePath)
-    } else {
-      // if (isImage(file)) { // закоментировал т.к. на проде долго загружалась документация(стр. /help)
-      if (!isMdFile(file)) {
-        fs.unlinkSync(filePath)
-      } else if (isMdFile(file) && filePath.includes('_index.md')) {
-        // Удаляем префикс "_" у индексных файлов
-        const filePathWidthOutPrefix = filePath.replace('_index.md', 'index.md')
-        fs.rename(filePath, filePathWidthOutPrefix, (err: any) => {
-          if (err) {
-            console.error(`Error renaming file: ${err}`)
-          }
-        })
-      }
-    }
-  })
-}
-
-export const updateImagesPathAndCustomComponents = (dirPath: string) => {
-  console.log(dirPath, 111)
-  fs.readdirSync(dirPath).forEach((file: string) => {
-    const filePath = path.join(dirPath, file)
-    const isDir = fs.lstatSync(filePath).isDirectory()
-
-    if (isDir) {
-      updateImagesPathAndCustomComponents(filePath)
-    } else {
-      if (isMdFile(file)) {
-        console.log(file, 222)
-        // @ts-ignore
-        // Правим путь к картинкам
-        const imagePath = filePath
-          .replaceAll('\\', '/')
-          .match(/\/content.+\//)[0]
-          .replace('/content/help', '/images')
-        console.log(imagePath, 333, filePath)
-        replaceFileContent(
-          filePath,
-          /!\[(.*)\]\((.*?)\)/g,
-          `![$1](${imagePath}$2)`
-        ).then(() => {
-          // Заменяем кастомные тэги
-          replaceFileContent(
-            filePath,
-            /\{\{ *< *hint *(info) *> *\}\}|\{\{ *< *\/hint *> *\}\}/g,
-            (_match: any, hintInfo: string) => {
-              return hintInfo ? '\n::hint\n' : '\n::\n'
-            }
-          )
-        })
-      }
-    }
-  })
-}
-
-export const replaceFileContent = async (
-  filePath: string,
-  searchString: string | RegExp,
-  replacementString: any
-): Promise<void> => {
-  return new Promise((resolve, reject) => {
-    fs.readFile(filePath, 'utf8', (err: any, data: string) => {
-      if (err) {
-        reject()
-        return console.log(err)
-      }
-
-      if (data.match(replacementString)) {
-        resolve()
-        return
-      }
-
-      const updatedContent = data.replace(searchString, replacementString)
-
-      fs.writeFile(filePath, updatedContent, 'utf8', (err: any) => {
-        if (err) {
-          reject()
-          return console.log(err)
-        }
-        resolve()
-      })
-    })
-  })
-}
+import path from 'path'
+import fs from 'fs'
+
+const isImage = (fileName: string) => {
+  const imageExtensions = ['.png', '.jpeg', '.jpg']
+  return imageExtensions.some(
+    (ext) => path.extname(fileName).toLowerCase() === ext
+  )
+}
+const isMdFile = (fileName: string) => {
+  return path.extname(fileName).toLowerCase() === '.md'
+}
+
+export const removeNonImageFiles = (dirPath: string) => {
+  fs.readdirSync(dirPath).forEach((file: string) => {
+    const filePath = path.join(dirPath, file)
+    const isDir = fs.lstatSync(filePath).isDirectory()
+
+    if (isDir) {
+      removeNonImageFiles(filePath)
+    } else {
+      if (!isImage(file)) {
+        fs.unlinkSync(filePath)
+      }
+    }
+  })
+}
+
+export const removeImagesFromContent = (dirPath: string) => {
+  fs.readdirSync(dirPath).forEach((file: string) => {
+    const filePath = path.join(dirPath, file)
+    const isDir = fs.lstatSync(filePath).isDirectory()
+
+    if (isDir) {
+      removeImagesFromContent(filePath)
+    } else {
+      // if (isImage(file)) { // закоментировал т.к. на проде долго загружалась документация(стр. /help)
+      if (!isMdFile(file)) {
+        fs.unlinkSync(filePath)
+      } else if (isMdFile(file) && filePath.includes('_index.md')) {
+        // Удаляем префикс "_" у индексных файлов
+        const filePathWidthOutPrefix = filePath.replace('_index.md', 'index.md')
+        fs.rename(filePath, filePathWidthOutPrefix, (err: any) => {
+          if (err) {
+            console.error(`Error renaming file: ${err}`)
+          }
+        })
+      }
+    }
+  })
+}
+
+export const updateImagesPathAndCustomComponents = (dirPath: string) => {
+  fs.readdirSync(dirPath).forEach((file: string) => {
+    const filePath = path.join(dirPath, file)
+    const isDir = fs.lstatSync(filePath).isDirectory()
+
+    if (isDir) {
+      updateImagesPathAndCustomComponents(filePath)
+    } else {
+      if (isMdFile(file)) {
+        // @ts-ignore
+        // Правим путь к картинкам
+        const imagePath = filePath
+          .replaceAll('\\', '/')
+          .match(/\/content.+\//)[0]
+          .replace('/content/help', '/images')
+        replaceFileContent(
+          filePath,
+          /!\[(.*)\]\((.*?)\)/g,
+          `![$1](${imagePath}$2)`
+        ).then(() => {
+          // Заменяем кастомные тэги
+          replaceFileContent(
+            filePath,
+            /\{\{ *< *hint *(info) *> *\}\}|\{\{ *< *\/hint *> *\}\}/g,
+            (_match: any, hintInfo: string) => {
+              return hintInfo ? '\n::hint\n' : '\n::\n'
+            }
+          )
+        })
+      }
+    }
+  })
+}
+
+export const replaceFileContent = async (
+  filePath: string,
+  searchString: string | RegExp,
+  replacementString: any
+): Promise<void> => {
+  return new Promise((resolve, reject) => {
+    fs.readFile(filePath, 'utf8', (err: any, data: string) => {
+      if (err) {
+        reject()
+        return console.log(err)
+      }
+
+      if (data.match(replacementString)) {
+        resolve()
+        return
+      }
+
+      const updatedContent = data.replace(searchString, replacementString)
+
+      fs.writeFile(filePath, updatedContent, 'utf8', (err: any) => {
+        if (err) {
+          reject()
+          return console.log(err)
+        }
+        resolve()
+      })
+    })
+  })
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.630",
+  "version": "1.4.631",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -35,7 +35,7 @@
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "1.0.15",
-    "bfg-uikit": "1.0.272",
+    "bfg-uikit": "1.0.275",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }