inl-ui 0.1.18 → 0.1.21

package/dist/index.cjs

@@ -42,7 +42,7 @@ var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 
-var version = "0.1.17";
+var version = "0.1.20";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -5799,7 +5799,7 @@ const GetDeviceDetailOnce = async (codes, params) => {
       if (instance.thingInstCode === i) {
         for (let n of instance.detailGroupList) {
           for (let m of n.thingPropertyValueVoList) {
-            refhCodes[i] = filterDataByEventEnable(instance);
+            refhCodes[i] = instance;
           }
         }
       }
@@ -5856,12 +5856,10 @@ const InjectDeviceCodeGetDetail = async (codes, params) => {
         if (!item) continue;
         for (let n in item.detailGroupList) {
           for (let m in item.detailGroupList[n].thingPropertyValueVoList) {
-            if (pcs.includes(item.detailGroupList[n].thingPropertyValueVoList[m].thingPropertyCode)) {
-              newResData[i] = {
-                pointCode: item.detailGroupList[n].thingPropertyValueVoList[m].pointCode,
-                value: item.detailGroupList[n].thingPropertyValueVoList[m].value
-              };
-            }
+            newResData[i] = {
+              pointCode: item.detailGroupList[n].thingPropertyValueVoList[m].pointCode,
+              value: item.detailGroupList[n].thingPropertyValueVoList[m].value
+            };
           }
         }
       }
@@ -12013,12 +12011,6 @@ const getMenuDetail = () => vue.defineComponent({
 });
 
 const fonts = [{
-  label: "\u9ED8\u8BA4",
-  value: ""
-}, {
-  label: "Arial",
-  value: "Arial"
-}, {
   label: "\u5FAE\u8F6F\u96C5\u9ED1",
   value: "Microsoft YaHei"
 }, {
@@ -12084,14 +12076,25 @@ const FontSelect = vue.defineComponent({
   emits: ["update:value", "change"],
   props: {
     value: String,
-    selectOptions: Object
+    selectOptions: Object,
+    suffix: {
+      type: Array,
+      default: () => []
+    },
+    prefix: {
+      type: Array,
+      default: () => []
+    }
   },
   setup(props, {
     emit
   }) {
     const modelValue = core.useVModel(props, "value", emit);
+    const options = vue.computed(() => {
+      return _.concat(props.prefix, fonts, props.suffix);
+    });
     return () => vue.createVNode(vue.resolveComponent("a-select"), vue.mergeProps({
-      "options": fonts,
+      "options": options.value,
       "onChange": e => emit("change", e)
     }, props.selectOptions, {
       "value": modelValue.value,

package/dist/index.d.ts

@@ -11,7 +11,7 @@ import { Key } from 'ant-design-vue/lib/table/interface';
 import * as vue_jsx_runtime from 'vue/jsx-runtime';
 import * as _ant_design_icons_vue_lib_components_IconFont from '@ant-design/icons-vue/lib/components/IconFont';
 
-var version = "0.1.17";
+var version = "0.1.20";
 
 declare const _default$o: {
     set(theme: string): void;
@@ -1725,13 +1725,32 @@ declare const getMenuDetail: () => vue.DefineComponent<{
 declare const _default$2: vue.DefineComponent<{
     value: StringConstructor;
     selectOptions: ObjectConstructor;
+    suffix: {
+        type: ArrayConstructor;
+        default: () => never[];
+    };
+    prefix: {
+        type: ArrayConstructor;
+        default: () => never[];
+    };
 }, () => vue_jsx_runtime.JSX.Element, unknown, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, ("change" | "update:value")[], "change" | "update:value", vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<vue.ExtractPropTypes<{
     value: StringConstructor;
     selectOptions: ObjectConstructor;
+    suffix: {
+        type: ArrayConstructor;
+        default: () => never[];
+    };
+    prefix: {
+        type: ArrayConstructor;
+        default: () => never[];
+    };
 }>> & {
     onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-}, {}, {}>;
+}, {
+    prefix: unknown[];
+    suffix: unknown[];
+}, {}>;
 
 declare const _default$1: vue.DefineComponent<{
     zxIp: {

package/dist/index.js

@@ -3,7 +3,7 @@ import renderWithQiankun, { qiankunWindow } from 'vite-plugin-qiankun/dist/helpe
 import { defineComponent, createVNode, createApp, ref, watch, reactive, computed, onBeforeUnmount, inject, watchEffect, onActivated, onDeactivated, resolveComponent, isVNode, nextTick, Fragment, withDirectives, vShow, toRaw, provide, createTextVNode, onMounted, KeepAlive, shallowRef, onBeforeMount, mergeProps, onBeforeUpdate } from 'vue';
 import axios from 'axios';
 import { message, Menu, MenuItem, Input, Badge, Avatar, MenuDivider, Modal, SubMenu, Dropdown, Tooltip, Select, Layout as Layout$1, LayoutHeader, LayoutSider, LayoutContent, Form, Row, Col, FormItem, SelectOption, Switch, InputNumber } from 'ant-design-vue';
-import _, { isPlainObject, omit, cloneDeep, differenceBy, isObject as isObject$1 } from 'lodash';
+import _, { isPlainObject, omit, cloneDeep, differenceBy, isObject as isObject$1, concat } from 'lodash';
 import { useIntervalFn, useEventBus, resolveRef, useEventListener, useMounted, useThrottleFn, useVModel, useMagicKeys, whenever, watchArray, useSessionStorage, useFullscreen, useLocalStorage, useToggle, useElementBounding, useMemory, useWindowSize, useClipboard, useBreakpoints, breakpointsAntDesign } from '@vueuse/core';
 import dayjs from 'dayjs';
 import { useRouter, useRoute } from 'vue-router';
@@ -12,7 +12,7 @@ import { loadMicroApp } from 'qiankun';
 import { XPopup, CommentBlock, setAxiosOption } from '@sszj-temp/mobile';
 import '@sszj-temp/mobile/style.css';
 
-var version = "0.1.17";
+var version = "0.1.20";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -5769,7 +5769,7 @@ const GetDeviceDetailOnce = async (codes, params) => {
       if (instance.thingInstCode === i) {
         for (let n of instance.detailGroupList) {
           for (let m of n.thingPropertyValueVoList) {
-            refhCodes[i] = filterDataByEventEnable(instance);
+            refhCodes[i] = instance;
           }
         }
       }
@@ -5826,12 +5826,10 @@ const InjectDeviceCodeGetDetail = async (codes, params) => {
         if (!item) continue;
         for (let n in item.detailGroupList) {
           for (let m in item.detailGroupList[n].thingPropertyValueVoList) {
-            if (pcs.includes(item.detailGroupList[n].thingPropertyValueVoList[m].thingPropertyCode)) {
-              newResData[i] = {
-                pointCode: item.detailGroupList[n].thingPropertyValueVoList[m].pointCode,
-                value: item.detailGroupList[n].thingPropertyValueVoList[m].value
-              };
-            }
+            newResData[i] = {
+              pointCode: item.detailGroupList[n].thingPropertyValueVoList[m].pointCode,
+              value: item.detailGroupList[n].thingPropertyValueVoList[m].value
+            };
           }
         }
       }
@@ -11983,12 +11981,6 @@ const getMenuDetail = () => defineComponent({
 });
 
 const fonts = [{
-  label: "\u9ED8\u8BA4",
-  value: ""
-}, {
-  label: "Arial",
-  value: "Arial"
-}, {
   label: "\u5FAE\u8F6F\u96C5\u9ED1",
   value: "Microsoft YaHei"
 }, {
@@ -12054,14 +12046,25 @@ const FontSelect = defineComponent({
   emits: ["update:value", "change"],
   props: {
     value: String,
-    selectOptions: Object
+    selectOptions: Object,
+    suffix: {
+      type: Array,
+      default: () => []
+    },
+    prefix: {
+      type: Array,
+      default: () => []
+    }
   },
   setup(props, {
     emit
   }) {
     const modelValue = useVModel(props, "value", emit);
+    const options = computed(() => {
+      return concat(props.prefix, fonts, props.suffix);
+    });
     return () => createVNode(resolveComponent("a-select"), mergeProps({
-      "options": fonts,
+      "options": options.value,
       "onChange": e => emit("change", e)
     }, props.selectOptions, {
       "value": modelValue.value,

package/dist/theme/index.js

@@ -1,70 +1,70 @@
-const less = require("less");
-const defaultVars = require("./scripts/default-vars");
-
-const dark = require("./scripts/dark-vars");
-const light = require("./scripts/light-vars");
-
-const path = require("path");
-const varDark = path.join(__dirname, ".", "style");
-const themeConfig = [
-  {
-    theme: "dark",
-    htmlThemeAttr: "dark",
-    modifyVars: {
-      hack: `true;@import "${require.resolve(
-        varDark + "/color/colorPalette.less"
-      )}";@import "${require.resolve(varDark + "/themes/var-dark.less")}";`,
-      ...defaultVars,
-      ...dark,
-      "root-entry-name": "dark",
-    },
-  },
-  {
-    theme: "light",
-    htmlThemeAttr: "light",
-    modifyVars: {
-      // 引入除了变量外的其他内容
-      hack: `true;@import "${require.resolve(
-        varDark + "/color/colorPalette.less"
-      )}";@import "${require.resolve(varDark + "/themes/var-default.less")}";`,
-      ...defaultVars,
-      ...light,
-      "root-entry-name": "default",
-    },
-  },
-];
-const additionalData = async (content, filename) => {
-  const themePromises = themeConfig.map(async (t) => {
-    const { htmlThemeAttr, modifyVars = {} } = t;
-    const options = {
-      javascriptEnabled: true,
-      modifyVars,
-      relativeUrls: true,
-      filename,
-    };
-    try {
-      const { css } = await less.render(content, options);
-      let res = "";
-      if (htmlThemeAttr && css) {
-        res = `
-        [data-doc-theme=${htmlThemeAttr}] {
-          ${css}
-        }
-        `;
-      }
-      return Promise.resolve(res);
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.log(error);
-      return Promise.reject(content);
-    }
-  });
-  let res = content;
-  for (const themePromise of themePromises) {
-    const theme = await themePromise;
-    res += theme;
-  }
-  return res;
-};
-
-exports.default = additionalData;
+const less = require("less");
+const defaultVars = require("./scripts/default-vars");
+
+const dark = require("./scripts/dark-vars");
+const light = require("./scripts/light-vars");
+
+const path = require("path");
+const varDark = path.join(__dirname, ".", "style");
+const themeConfig = [
+  {
+    theme: "dark",
+    htmlThemeAttr: "dark",
+    modifyVars: {
+      hack: `true;@import "${require.resolve(
+        varDark + "/color/colorPalette.less"
+      )}";@import "${require.resolve(varDark + "/themes/var-dark.less")}";`,
+      ...defaultVars,
+      ...dark,
+      "root-entry-name": "dark",
+    },
+  },
+  {
+    theme: "light",
+    htmlThemeAttr: "light",
+    modifyVars: {
+      // 引入除了变量外的其他内容
+      hack: `true;@import "${require.resolve(
+        varDark + "/color/colorPalette.less"
+      )}";@import "${require.resolve(varDark + "/themes/var-default.less")}";`,
+      ...defaultVars,
+      ...light,
+      "root-entry-name": "default",
+    },
+  },
+];
+const additionalData = async (content, filename) => {
+  const themePromises = themeConfig.map(async (t) => {
+    const { htmlThemeAttr, modifyVars = {} } = t;
+    const options = {
+      javascriptEnabled: true,
+      modifyVars,
+      relativeUrls: true,
+      filename,
+    };
+    try {
+      const { css } = await less.render(content, options);
+      let res = "";
+      if (htmlThemeAttr && css) {
+        res = `
+        [data-doc-theme=${htmlThemeAttr}] {
+          ${css}
+        }
+        `;
+      }
+      return Promise.resolve(res);
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.log(error);
+      return Promise.reject(content);
+    }
+  });
+  let res = content;
+  for (const themePromise of themePromises) {
+    const theme = await themePromise;
+    res += theme;
+  }
+  return res;
+};
+
+exports.default = additionalData;

package/dist/theme/scripts/dark-vars.js

@@ -1,21 +1,21 @@
-/**
- * convert dark.less into js vars
- *
- * const darkVars = require('./dark-vars');
- */
-const fs = require("fs");
-const path = require("path");
-const lessToJs = require("less-vars-to-js");
-
-const stylePath = path.join(__dirname, "..", "style");
-const darkLess = fs.readFileSync(
-  path.join(stylePath, "themes", "var-dark.less"),
-  "utf8"
-);
-
-const darkPaletteLess = lessToJs(darkLess, {
-  stripPrefix: true,
-  resolveVariables: false,
-});
-
-module.exports = darkPaletteLess;
+/**
+ * convert dark.less into js vars
+ *
+ * const darkVars = require('./dark-vars');
+ */
+const fs = require("fs");
+const path = require("path");
+const lessToJs = require("less-vars-to-js");
+
+const stylePath = path.join(__dirname, "..", "style");
+const darkLess = fs.readFileSync(
+  path.join(stylePath, "themes", "var-dark.less"),
+  "utf8"
+);
+
+const darkPaletteLess = lessToJs(darkLess, {
+  stripPrefix: true,
+  resolveVariables: false,
+});
+
+module.exports = darkPaletteLess;

package/dist/theme/scripts/default-vars.js

@@ -1,25 +1,25 @@
-/**
- * convert default.less into js vars
- *
- * const darkVars = require('./default-vars');
- */
-const fs = require("fs");
-const path = require("path");
-const lessToJs = require("less-vars-to-js");
-
-const stylePath = path.join(__dirname, "..", "style");
-const colorLess = fs.readFileSync(
-  path.join(stylePath, "color", "colors.less"),
-  "utf8"
-);
-const defaultLess = fs.readFileSync(
-  path.join(stylePath, "themes", "default.less"),
-  "utf8"
-);
-
-const defaultPaletteLess = lessToJs(`${colorLess}${defaultLess}`, {
-  stripPrefix: true,
-  resolveVariables: false,
-});
-
-module.exports = defaultPaletteLess;
+/**
+ * convert default.less into js vars
+ *
+ * const darkVars = require('./default-vars');
+ */
+const fs = require("fs");
+const path = require("path");
+const lessToJs = require("less-vars-to-js");
+
+const stylePath = path.join(__dirname, "..", "style");
+const colorLess = fs.readFileSync(
+  path.join(stylePath, "color", "colors.less"),
+  "utf8"
+);
+const defaultLess = fs.readFileSync(
+  path.join(stylePath, "themes", "default.less"),
+  "utf8"
+);
+
+const defaultPaletteLess = lessToJs(`${colorLess}${defaultLess}`, {
+  stripPrefix: true,
+  resolveVariables: false,
+});
+
+module.exports = defaultPaletteLess;

package/dist/theme/scripts/light-vars.js

@@ -1,22 +1,22 @@
-/**
- * convert dark.less into js vars
- *
- * const darkVars = require('./dark-vars');
- */
-const fs = require("fs");
-const path = require("path");
-const lessToJs = require("less-vars-to-js");
-
-const stylePath = path.join(__dirname, "..", "style");
-const lightLess = fs.readFileSync(
-  path.join(stylePath, "themes", "var-default.less"),
-  "utf8"
-);
-
-// 注册变量，过滤其他内容
-const lightPaletteLess = lessToJs(lightLess, {
-  stripPrefix: true,
-  resolveVariables: false,
-});
-
-module.exports = lightPaletteLess;
+/**
+ * convert dark.less into js vars
+ *
+ * const darkVars = require('./dark-vars');
+ */
+const fs = require("fs");
+const path = require("path");
+const lessToJs = require("less-vars-to-js");
+
+const stylePath = path.join(__dirname, "..", "style");
+const lightLess = fs.readFileSync(
+  path.join(stylePath, "themes", "var-default.less"),
+  "utf8"
+);
+
+// 注册变量，过滤其他内容
+const lightPaletteLess = lessToJs(lightLess, {
+  stripPrefix: true,
+  resolveVariables: false,
+});
+
+module.exports = lightPaletteLess;